From c3769bebb909da041c229636ec86ca42b29ef605 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 17 Jul 2024 15:33:05 +0700
Subject: [PATCH] fixing kpi put develop

---
 .../KpiUserDevelopmentController.ts           | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/controllers/KpiUserDevelopmentController.ts b/src/controllers/KpiUserDevelopmentController.ts
index 41958b4..c44162d 100644
--- a/src/controllers/KpiUserDevelopmentController.ts
+++ b/src/controllers/KpiUserDevelopmentController.ts
@@ -144,7 +144,7 @@ export class KpiUserDevelopmentController extends Controller {
           data.lastUpdateUserId = request.user.sub;
           data.lastUpdateFullName = request.user.name;
           data.kpiUserDevelopmentId = kpiUserDevelopment.id;
-          await this.developmentProjectRepository.save(data);
+          this.developmentProjectRepository.save(data);
         }),
       );
     }
@@ -415,32 +415,40 @@ export class KpiUserDevelopmentController extends Controller {
       relations: [
         "kpiUserEvaluation",
         "kpiUserEvaluation.kpiPeriod",
-        "kpiUserEvaluation.kpiUserCapacitys",
-        "kpiUserEvaluation.kpiUserCapacitys.kpiCapacity",
+        "developmentProjects",
+        // "kpiUserEvaluation.kpiUserCapacitys",
+        // "kpiUserEvaluation.kpiUserCapacitys.kpiCapacity",
       ],
       where: {
         id: id,
       },
     });
 
+    if (!kpiUserDevelopment) {
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลพัฒนาตนเองนี้");
+    }
+
     const formattedData = {
-      id: kpiUserDevelopment?.id ?? null,
-      evaluationId: kpiUserDevelopment?.kpiUserEvaluation.id ?? null,
-      target: kpiUserDevelopment?.target ?? null,
-      summary: kpiUserDevelopment?.summary ?? null,
-      point: kpiUserDevelopment?.point ?? null,
-      name: kpiUserDevelopment?.name ?? null,
-      achievement10: kpiUserDevelopment?.achievement10 ?? null,
-      achievement5: kpiUserDevelopment?.achievement5 ?? null,
-      achievement0: kpiUserDevelopment?.achievement0 ?? null,
-      isDevelopment70: kpiUserDevelopment?.isDevelopment70 ?? null,
-      isDevelopment20: kpiUserDevelopment?.isDevelopment20 ?? null,
-      isDevelopment10: kpiUserDevelopment?.isDevelopment10 ?? null,
-      capacity:
-        kpiUserDevelopment?.kpiUserEvaluation.kpiUserCapacitys.map((kpiUserCapacity) => ({
-          capacityPoint: kpiUserCapacity.point,
-          capacityName: kpiUserCapacity.kpiCapacity.name,
-        })) ?? [],
+      id: kpiUserDevelopment.id,
+      evaluationId: kpiUserDevelopment.kpiUserEvaluation.id,
+      target: kpiUserDevelopment.target,
+      summary: kpiUserDevelopment.summary,
+      point: kpiUserDevelopment.point,
+      name: kpiUserDevelopment.name,
+      achievement10: kpiUserDevelopment.achievement10,
+      achievement5: kpiUserDevelopment.achievement5,
+      achievement0: kpiUserDevelopment.achievement0,
+      isDevelopment70: kpiUserDevelopment.isDevelopment70,
+      isDevelopment20: kpiUserDevelopment.isDevelopment20,
+      isDevelopment10: kpiUserDevelopment.isDevelopment10,
+      // capacity:
+      //   kpiUserDevelopment?.kpiUserEvaluation.kpiUserCapacitys.map((kpiUserCapacity) => ({
+      //     capacityPoint: kpiUserCapacity.point,
+      //     capacityName: kpiUserCapacity.kpiCapacity.name,
+      //   })) ?? [],
+      developmentProjectTechniqueActuals: kpiUserDevelopment.developmentProjects
+        .map((x) => x.name)
+        .sort(),
     };
     return new HttpSuccess(formattedData);
   }