From eb1264b8851196576749ba48caea7ef49d9f7d23 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 19 Dec 2024 10:31:21 +0700
Subject: [PATCH] #857 (4),(5)

---
 .../DevelopmentEmployeeHistoryController.ts   | 35 +++++++++++++------
 .../DevelopmentHistoryController.ts           | 16 ++++++---
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts
index 45a4970..65dadc1 100644
--- a/src/controllers/DevelopmentEmployeeHistoryController.ts
+++ b/src/controllers/DevelopmentEmployeeHistoryController.ts
@@ -327,15 +327,17 @@ export class DevelopmentEmployeeHistoryController extends Controller {
     const formattedData = development.map((item) => ({
       id: item.id,
       citizenId: item.citizenId,
-      fullName: item.prefix != null && item.firstName != null && item.lastName != null
-        ? `${item?.prefix}${item?.firstName} ${item?.lastName}`
-        : "",
+      fullName:
+        item.prefix != null && item.firstName != null && item.lastName != null
+          ? `${item?.prefix}${item?.firstName} ${item?.lastName}`
+          : "",
       position: item.position,
       year: item.development.year,
       posType: item.employeePosType ? item.employeePosType.posTypeName : null,
-      posLevel: item.employeePosType && item.employeePosLevel
-        ? `${item.employeePosType.posTypeShortName} ${item.employeePosLevel.posLevelName}` 
-        : null,
+      posLevel:
+        item.employeePosType && item.employeePosLevel
+          ? `${item.employeePosType.posTypeShortName} ${item.employeePosLevel.posLevelName}`
+          : null,
       projectName: item.development.projectName,
     }));
 
@@ -355,7 +357,12 @@ export class DevelopmentEmployeeHistoryController extends Controller {
     if (_workflow == false) await new permission().PermissionGet(request, "SYS_DEV_HISTORY_EMP");
     const type = "EMPLOYEE";
     const getDevelopment = await this.developmentHistoryRepository.findOne({
-      relations: ["development", "employeePosLevel", "employeePosType"],
+      relations: [
+        "development",
+        "development.developmentOthers",
+        "employeePosLevel",
+        "employeePosType",
+      ],
       where: { id: id, type: type },
     });
     if (!getDevelopment) {
@@ -389,14 +396,20 @@ export class DevelopmentEmployeeHistoryController extends Controller {
       dateStart: getDevelopment.development != null ? getDevelopment.development.dateStart : null,
       dateEnd: getDevelopment.development != null ? getDevelopment.development.dateEnd : null,
       totalDate: getDevelopment.development != null ? getDevelopment.development.totalDate : null,
-      addressAcademic:
-        getDevelopment.development != null ? getDevelopment.development.addressAcademic : null,
-      topicAcademic:
-        getDevelopment.development != null ? getDevelopment.development.topicAcademic : null,
+      // addressAcademic:
+      //   getDevelopment.development != null ? getDevelopment.development.addressAcademic : null,
+      // topicAcademic:
+      //   getDevelopment.development != null ? getDevelopment.development.topicAcademic : null,
       dateStudyStart:
         getDevelopment.development != null ? getDevelopment.development.dateStudyStart : null,
       dateStudyEnd:
         getDevelopment.development != null ? getDevelopment.development.dateStudyEnd : null,
+      academic: getDevelopment.development?.developmentOthers
+        ? getDevelopment.development.developmentOthers.map((dev) => ({
+            topicAcademic: dev.topicAcademic,
+            addressAcademic: dev.addressAcademic,
+          }))
+        : [],
     };
 
     return new HttpSuccess(formattedData);
diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts
index c8928c9..368858f 100644
--- a/src/controllers/DevelopmentHistoryController.ts
+++ b/src/controllers/DevelopmentHistoryController.ts
@@ -350,7 +350,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
       await new permission().PermissionGet(request, "SYS_DEV_HISTORY_OFFICER");
     const type = "OFFICER";
     const getDevelopment = await this.developmentHistoryRepository.findOne({
-      relations: ["development", "posLevel", "posType"],
+      relations: ["development", "development.developmentOthers","posLevel", "posType"],
       where: { id: id, type: type },
     });
     if (!getDevelopment) {
@@ -381,14 +381,20 @@ export class DevelopmentOfficerHistoryController extends Controller {
       dateStart: getDevelopment.development != null ? getDevelopment.development.dateStart : null,
       dateEnd: getDevelopment.development != null ? getDevelopment.development.dateEnd : null,
       totalDate: getDevelopment.development != null ? getDevelopment.development.totalDate : null,
-      addressAcademic:
-        getDevelopment.development != null ? getDevelopment.development.addressAcademic : null,
-      topicAcademic:
-        getDevelopment.development != null ? getDevelopment.development.topicAcademic : null,
+      // addressAcademic:
+      //   getDevelopment.development != null ? getDevelopment.development.addressAcademic : null,
+      // topicAcademic:
+      //   getDevelopment.development != null ? getDevelopment.development.topicAcademic : null,
       dateStudyStart:
         getDevelopment.development != null ? getDevelopment.development.dateStudyStart : null,
       dateStudyEnd:
         getDevelopment.development != null ? getDevelopment.development.dateStudyEnd : null,
+        academic: getDevelopment.development?.developmentOthers 
+        ? getDevelopment.development.developmentOthers.map(dev => ({
+            topicAcademic: dev.topicAcademic,
+            addressAcademic: dev.addressAcademic
+        }))
+        : []
     };
 
     return new HttpSuccess(formattedData);