From b3c35e6441fd47626187ed1542aac46d2ee429e0 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang
 <153157069+AdisakKanthawilang@users.noreply.github.com>
Date: Tue, 14 Oct 2025 17:59:46 +0700
Subject: [PATCH] update "place" insert (#21)

---
 src/controllers/DevelopmentController.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index c88ed1d..334c9f2 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -2629,6 +2629,18 @@ export class DevelopmentController extends Controller {
       where: { developmentId: id, isDone: false },
       relations: ["development"],
     });
+
+    const developmentAddresss = await this.developmentAddresssRepository.find({
+      where: { developmentId: id}
+    })
+   
+    const places = developmentAddresss
+      .map(addr => 
+        `- ${addr.address}, ${addr.addressType === "IN_COUNTRY" ? addr.provinceName : addr.country} (${addr.addressType === "IN_COUNTRY" ? "ภายในประเทศ" : "ภายนอกประเทศ"})`
+      )
+      .filter(Boolean)
+      .join("\n");
+
     await Promise.all(
       getDevelopment.map(async (x) => {
         const _data = Object.assign(new DevelopmentHistory(), x);
@@ -2639,7 +2651,7 @@ export class DevelopmentController extends Controller {
               name: x.development == null ? null : x.development.projectName,
               topic: x.development == null ? null : x.development.topicAcademic,
               yearly: x.development == null ? null : x.development.year,
-              place: x.development == null ? null : x.development.addressAcademic,
+              place: places == null ? null : places,
               duration: x.trainingDays,
               department: x.development == null ? null : x.development.root,
               numberOrder: x.order,
@@ -2662,7 +2674,7 @@ export class DevelopmentController extends Controller {
               name: x.development == null ? null : x.development.projectName,
               topic: x.development == null ? null : x.development.topicAcademic,
               yearly: x.development == null ? null : x.development.year,
-              place: x.development == null ? null : x.development.addressAcademic,
+              place: places == null ? null : places,
               duration: x.trainingDays,
               department: x.development == null ? null : x.development.root,
               numberOrder: x.order,