From 33206465218e4e11a598ff8b1c80ae05eec1f7da Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 8 Aug 2024 13:27:23 +0700
Subject: [PATCH] tab 3

---
 src/controllers/DevelopmentController.ts | 18 +++++++++++++++---
 src/entities/Development.ts              |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index bc92d58..04954e8 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -885,6 +885,7 @@ export class DevelopmentController extends Controller {
         developmentProjectTypes: true,
         developmentProjectTechniquePlanneds: true,
         developmentProjectTechniqueActuals: true,
+        developmentAddresss: true
       },
     });
     if (!development) {
@@ -895,6 +896,7 @@ export class DevelopmentController extends Controller {
       developmentProjectTypes: [],
       developmentProjectTechniquePlanneds: [],
       developmentProjectTechniqueActuals: [],
+      developmentAddresss: []
     });
     development.lastUpdateUserId = request.user.sub;
     development.lastUpdateFullName = request.user.name;
@@ -1171,7 +1173,7 @@ export class DevelopmentController extends Controller {
     await this.developmentAddresssRepository.remove(development.developmentAddresss, {
       data: request,
     });
-    const before = structuredClone(development);
+    // const before = structuredClone(development);
     await Promise.all(
       requestBody.developmentAddresss.map(async (x) => {
         const data = Object.assign(new DevelopmentAddress(), x);
@@ -1187,10 +1189,10 @@ export class DevelopmentController extends Controller {
         data.lastUpdateUserId = request.user.sub;
         data.lastUpdateFullName = request.user.name;
         await this.developmentAddresssRepository.save(data, { data: request });
-        setLogDataDiff(request, { before, after: development });
+        // setLogDataDiff(request, { before, after: development });
       }),
     );
-    Object.assign(development, { ...requestBody, developmentAddresss: [] });
+   
     //End
     return new HttpSuccess(development.id);
   }
@@ -2070,6 +2072,7 @@ export class DevelopmentController extends Controller {
         "developmentProjectTypes",
         "developmentProjectTechniquePlanneds",
         "developmentProjectTechniqueActuals",
+        "developmentAddresss",
       ],
     });
     if (!getDevelopment) {
@@ -2111,6 +2114,15 @@ export class DevelopmentController extends Controller {
       strategyChild3Actual: getDevelopment.strategyChild3ActualId,
       strategyChild4Actual: getDevelopment.strategyChild4ActualId,
       strategyChild5Actual: getDevelopment.strategyChild5ActualId,
+      developmentAddresss:
+        getDevelopment.developmentAddresss == null
+          ? null
+          : getDevelopment.developmentAddresss
+              .sort((a, b) =>
+                (a.id == null ? "" : a.id).localeCompare(
+                  b.id == null ? "" : b.id,
+                ),
+              )
     };
     return new HttpSuccess(_getDevelopment);
   }
diff --git a/src/entities/Development.ts b/src/entities/Development.ts
index 58ebd11..0a6fecd 100644
--- a/src/entities/Development.ts
+++ b/src/entities/Development.ts
@@ -747,9 +747,9 @@ export class UpdateDevelopment3 {
   dateEnd: Date | null;
   @Column()
   totalDate: number | null;
-  //end
   @Column()
   developmentAddresss: CreateDevelopmentAddress[];
+  //end
   @Column()
   developmentProjectTypes?: string[];
   @Column()