From 9f21a4d49866b1e921c556ebdb59b15f4c132d85 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 17 Jul 2025 18:21:01 +0700
Subject: [PATCH] #1412

---
 src/controllers/DevelopmentController.ts | 75 ++++++------------------
 1 file changed, 19 insertions(+), 56 deletions(-)

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index 8bc84cf..1bb0417 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -1946,6 +1946,9 @@ export class DevelopmentController extends Controller {
         developmentProjectTechniqueActuals: true,
         developmentEvaluations: true,
         developmentAddresss: true,
+        developmentRisks: true,
+        developmentHistorys: true,
+        developmentOthers: true,
       },
     });
     if (!development) {
@@ -1959,92 +1962,46 @@ export class DevelopmentController extends Controller {
       const plannedGoalPosition = await this.plannedGoalPositionRepository.find({
         where: { plannedGoalId: In(development.developmentPlannedGoals.map((x) => x.id)) },
       });
-      // addLogSequence(request, {
-      //   action: "remove",
-      //   status: "success",
-      //   description: "Remove PlannedGoalPosition.",
-      // });
       await this.plannedGoalPositionRepository.remove(plannedGoalPosition, { data: request });
     }
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove ActualPeople.",
-    // });
     await this.actualPeopleRepository.remove(development.developmentActualPeoples, {
       data: request,
     });
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove PlannedPeople.",
-    // });
     await this.plannedPeopleRepository.remove(development.developmentPlannedPeoples, {
       data: request,
     });
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove ActualGoal.",
-    // });
     await this.actualGoalRepository.remove(development.developmentActualGoals, { data: request });
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove PlannedGoal.",
-    // });
     await this.plannedGoalRepository.remove(development.developmentPlannedGoals, { data: request });
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove DevelopmentProjectType.",
-    // });
     await this.developmentProjectTypeRepository.remove(development.developmentProjectTypes, {
       data: request,
     });
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove DevelopmentProjectTechniquePlanned.",
-    // });
     await this.developmentProjectTechniquePlannedRepository.remove(
       development.developmentProjectTechniquePlanneds,
       {
         data: request,
       },
     );
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove DevelopmentProjectTechniqueActuals.",
-    // });
     await this.developmentProjectTechniqueActualRepository.remove(
       development.developmentProjectTechniqueActuals,
       {
         data: request,
       },
     );
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove DevelopmentEvaluation.",
-    // });
     await this.developmentEvaluationRepository.remove(development.developmentEvaluations, {
       data: request,
     });
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove DevelopmentAddresss.",
-    // });
     await this.developmentAddresssRepository.remove(development.developmentAddresss, {
       data: request,
     });
-    // addLogSequence(request, {
-    //   action: "remove",
-    //   status: "success",
-    //   description: "Remove Development.",
-    // });
+    await this.developmentRiskRepository.remove(development.developmentRisks, {
+      data: request,
+    });
+    await this.developmentHistoryRepository.remove(development.developmentHistorys, {
+      data: request,
+    });
+    await this.developmentOtherRepository.remove(development.developmentOthers, {
+      data: request,
+    });
     await this.developmentRepository.remove(development, { data: request });
     return new HttpSuccess();
   }
@@ -2786,7 +2743,13 @@ export class DevelopmentController extends Controller {
           techniqueActuals.length > 0 && dev20Lists.some((item) => techniqueActuals.includes(item));
         isDevelopment10 =
           techniqueActuals.length > 0 && dev10Lists.some((item) => techniqueActuals.includes(item));
-
+       
+        console.log("x.development?.developmentProjectTechniqueActuals",x.development?.developmentProjectTechniqueActuals);
+        console.log("techniqueActuals",techniqueActuals);
+        console.log("isDevelopment70",isDevelopment70);
+        console.log("isDevelopment20",isDevelopment20);
+        console.log("isDevelopment10",isDevelopment10);
+        
         if (x.type == "OFFICER") {
           await new CallAPI()
             .PostData(request, "/org/profile/development", {