From 3badc39ac2c02bdb3d31d0fca31ae050b9a42f43 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 8 Aug 2024 15:28:29 +0700
Subject: [PATCH] fix

---
 src/controllers/DevelopmentController.ts | 23 ++++++++++-------------
 src/entities/DevelopmentAddress.ts       |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index cf5d3b1..843b5a2 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -1189,12 +1189,14 @@ export class DevelopmentController extends Controller {
             data.provinceId = _null;
           }
         }
-        data.developmentId = development.id;
-        data.createdUserId = request.user.sub;
-        data.createdFullName = request.user.name;
-        data.lastUpdateUserId = request.user.sub;
-        data.lastUpdateFullName = request.user.name;
-        await this.developmentAddresssRepository.save(data, { data: request });
+        if (x.address) {
+          data.developmentId = development.id;
+          data.createdUserId = request.user.sub;
+          data.createdFullName = request.user.name;
+          data.lastUpdateUserId = request.user.sub;
+          data.lastUpdateFullName = request.user.name;
+          await this.developmentAddresssRepository.save(data, { data: request });
+        }
         // setLogDataDiff(request, { before, after: development });
       }),
     );
@@ -1509,7 +1511,7 @@ export class DevelopmentController extends Controller {
         getDevelopment.developmentRisks == null
           ? null
           : getDevelopment.developmentRisks.sort((a, b) =>
-              (a.id == null ? "" : a.id).localeCompare(b.id == null ? "" : b.id),
+              (a.createdAt.toString() == null ? "" : a.createdAt.toString()).localeCompare(b.createdAt.toString() == null ? "" : b.createdAt.toString()),
             ),
       expect: getDevelopment.expect,
     };
@@ -2131,11 +2133,6 @@ export class DevelopmentController extends Controller {
         getDevelopment.developmentAddresss == null
           ? null
           : getDevelopment.developmentAddresss
-              .sort((a, b) =>
-                (a.id == null ? "" : a.id).localeCompare(
-                  b.id == null ? "" : b.id,
-                ),
-              )
     };
     return new HttpSuccess(_getDevelopment);
   }
@@ -2235,7 +2232,7 @@ export class DevelopmentController extends Controller {
         getDevelopment.developmentOthers == null
           ? null
           : getDevelopment.developmentOthers.sort((a, b) =>
-              (a.id == null ? "" : a.id).localeCompare(b.id == null ? "" : b.id),
+              (a.createdAt.toString() == null ? "" : a.createdAt.toString()).localeCompare(b.createdAt.toString() == null ? "" : b.createdAt.toString()),
             ),
       obstacle: getDevelopment.obstacle,
       suggestion: getDevelopment.suggestion,
diff --git a/src/entities/DevelopmentAddress.ts b/src/entities/DevelopmentAddress.ts
index e1490c8..37be847 100644
--- a/src/entities/DevelopmentAddress.ts
+++ b/src/entities/DevelopmentAddress.ts
@@ -38,5 +38,5 @@ export class CreateDevelopmentAddress {
   @Column()
   address: string | null;
   @Column()
-  provinceId: string;
+  provinceId: string | null;
 }