hrms-bangkok/hrms-api-kpi
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
Details

Browse source
This commit is contained in:
Adisak 2025-10-29 09:56:14 +07:00
commit 3351e4800f
3 changed files with 56 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/controllers/KpiUserEvaluationController.ts
View file

@ -1328,23 +1328,23 @@ export class KpiUserEvaluationController extends Controller {
"ไม่พบข้อมูลรายการประเมินผลการปฏิบัติราชการระดับบุคคลนี้",
);
}
// await new CallAPI()
// .PostData(request, "/placement/noti/profiles", {
// subject: `${kpiUserEvaluation.prefix}${kpiUserEvaluation.firstName} ${kpiUserEvaluation.lastName} มีความเห็นต่างเนื่องจาก: ${requestBody.reason}`,
// body: `${kpiUserEvaluation.prefix}${kpiUserEvaluation.firstName} ${kpiUserEvaluation.lastName} มีความเห็นต่างเนื่องจาก: ${requestBody.reason}`,
// receiverUserIds: [
// {
// receiverUserId: kpiUserEvaluation.evaluatorId,
// notiLink: `${process.env.VITE_URL_USER}/KPI-evaluator/${kpiUserEvaluation.id}`,
// },
// ],
// payload: "",
// isSendMail: true,
// isSendInbox: true,
// isSendNotification: true,
// })
// .then(() => {})
// .catch(() => {});
await new CallAPI()
.PostData(request, "/placement/noti/profiles", {
subject: `${kpiUserEvaluation.prefix}${kpiUserEvaluation.firstName} ${kpiUserEvaluation.lastName} มีความเห็นต่างเนื่องจาก: ${requestBody.reason}`,
body: `${kpiUserEvaluation.prefix}${kpiUserEvaluation.firstName} ${kpiUserEvaluation.lastName} มีความเห็นต่างเนื่องจาก: ${requestBody.reason}`,
receiverUserIds: [
{
receiverUserId: kpiUserEvaluation.evaluatorId,
notiLink: `${process.env.VITE_URL_USER}/KPI-evaluator/${kpiUserEvaluation.id}`,
},
],
payload: "",
isSendMail: true,
isSendInbox: true,
isSendNotification: true,
})
.then(() => {})
.catch(() => {});
const before = structuredClone(kpiUserEvaluation);
let _null: any = null;
kpiUserEvaluation.evaluationStatus = "EVALUATING_EVALUATOR";

14
src/interfaces/call-api.ts
View file

@ -12,7 +12,7 @@ import {
Path,
} from "tsoa";
import axios from "axios";
import { addLogSequence } from "./utils";
import { addLogSequence, safeStringify } from "./utils";
class CallAPI {
//Get
@ -34,7 +34,7 @@ class CallAPI {
request: {
method: "GET",
url: url,
response: JSON.stringify(response.data.result),
response: safeStringify(response.data.result),
},
});
return response.data.result;
@ -46,7 +46,7 @@ class CallAPI {
request: {
method: "GET",
url: url,
response: JSON.stringify(error),
response: safeStringify(error),
},
});
throw error;
@ -71,8 +71,8 @@ class CallAPI {
request: {
method: "POST",
url: url,
payload: JSON.stringify(sendData),
response: JSON.stringify(response.data.result),
payload: safeStringify(sendData),
response: safeStringify(response.data.result),
},
});
return response.data.result;
@ -84,8 +84,8 @@ class CallAPI {
request: {
method: "POST",
url: url,
payload: JSON.stringify(sendData),
response: JSON.stringify(error),
payload: safeStringify(sendData),
response: safeStringify(error),
},
});
throw error;

34
src/interfaces/utils.ts
View file

@ -27,8 +27,8 @@ export function setLogDataDiff(req: RequestWithUser, data: DataDiff) {
typeof data.after === "object"
) {
req.app.locals.logData.dataDiff = {
before: JSON.stringify(data.before),
after: JSON.stringify(data.after),
before: safeStringify(data.before),
after: safeStringify(data.after),
};
} else {
console.error("Invalid data provided: both before and after must be valid objects.");
@ -45,3 +45,33 @@ export function addLogSequence(req: RequestWithUser, data: LogSequence) {
export function editLogSequence(req: RequestWithUser, index: number, data: LogSequence) {
req.app.locals.logData.sequence[index] = data;
}
/**
* ปลอดภัยกว่า JSON.stringify()
* - กัน circular reference
* - จำกัดความลึก
* - return string แน่นอนเสมอ
*/
export function safeStringify(obj: any, space?: number): string {
const cache = new WeakSet();
try {
return JSON.stringify(
obj,
(key, value) => {
// ป้องกัน circular reference
if (typeof value === "object" && value !== null) {
if (cache.has(value)) {
return "[Circular]";
}
cache.add(value);
}
return value;
},
space,
);
} catch (err) {
console.error("⚠️ safeStringify error:", err);
return "[Unserializable object]";
}
}