Merge branch 'nice' into develop

# Conflicts:
#	src/controllers/KpiUserCapacityController.ts
#	src/controllers/KpiUserEvaluationController.ts

src/controllers/KpiGroupController.ts

@@ -23,6 +23,8 @@ import HttpStatusCode from "../interfaces/http-status";
 import { KpiGroup, createKpiGroup, updateKpiGroup } from "../entities/kpiGroup";
 import permission from "../interfaces/permission";
 import { RequestWithUser } from "../middlewares/user";
+import { addLogSequence, setLogDataDiff } from "../interfaces/utils";
+
 @Route("api/v1/kpi/group")
 @Tags("kpiGroup")
 @Security("bearerAuth")
@@ -54,11 +56,15 @@ export class kpiGroupController extends Controller {
     if (chkkpinameGroup) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ชื่อกลุ่มงานนี้มีอยู่ในระบบแล้ว");
     }
+    const before = null;
+
     kpiGroup.createdUserId = request.user.sub;
     kpiGroup.createdFullName = request.user.name;
     kpiGroup.lastUpdateUserId = request.user.sub;
     kpiGroup.lastUpdateFullName = request.user.name;
-    await this.kpiGroupRepository.save(kpiGroup);
+    await this.kpiGroupRepository.save(kpiGroup, { data: request });
+    setLogDataDiff(request, { before, after: kpiGroup });
+
     return new HttpSuccess(kpiGroup.id);
   }
 
@@ -89,10 +95,14 @@ export class kpiGroupController extends Controller {
     if (chkkpinameGroup) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ชื่อกลุ่มงานนี้มีอยู่ในระบบแล้ว");
     }
+    const before = structuredClone(kpiGroup);
+
     this.kpiGroupRepository.merge(kpiGroup, requestBody);
     kpiGroup.lastUpdateUserId = request.user.sub;
     kpiGroup.lastUpdateFullName = request.user.name;
-    await this.kpiGroupRepository.save(kpiGroup);
+    await this.kpiGroupRepository.save(kpiGroup, { data: request });
+    setLogDataDiff(request, { before, after: kpiGroup });
+
     return new HttpSuccess(id);
   }
 
@@ -130,7 +140,7 @@ export class kpiGroupController extends Controller {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลกลุ่มงานนี้");
     }
 
-    await this.kpiGroupRepository.remove(kpiGroup);
+    await this.kpiGroupRepository.remove(kpiGroup, { data: request });
     return new HttpSuccess();
   }