From 7b853002c51023d82b15809b9e99564a73c281ff Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 30 Jan 2025 14:10:35 +0700
Subject: [PATCH] fixing

---
 src/controllers/EvaluateResultController.ts | 33 +++++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/controllers/EvaluateResultController.ts b/src/controllers/EvaluateResultController.ts
index 41b2ac0..12a1423 100644
--- a/src/controllers/EvaluateResultController.ts
+++ b/src/controllers/EvaluateResultController.ts
@@ -139,6 +139,7 @@ export class EvaluateResultController extends Controller {
         "develop_self_learning_score",
         "develop_training_seminar_score",
         "evaluate_result",
+        "no",
       ],
       where: {
         assign_id,
@@ -149,21 +150,27 @@ export class EvaluateResultController extends Controller {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการประเมินผล");
     }
 
-    const result = resultData.map((e) => {
-      const develop_complete =
-        e.develop_orientation_score > 0 &&
-        e.develop_self_learning_score > 0 &&
-        e.develop_training_seminar_score
-          ? 1
-          : 2;
+    const result = await Promise.all(
+      resultData.map(async (e) => {
+        const check = await this.evaluateResultRepository.count({ where: { assign_id, no: e.no } });
 
-      const evaluate_result = e.evaluate_result === 1 ? 1 : 2;
+        const develop_complete =
+          e.develop_orientation_score > 0 &&
+          e.develop_self_learning_score > 0 &&
+          e.develop_training_seminar_score
+            ? 1
+            : 2;
 
-      return {
-        develop_complete,
-        evaluate_result,
-      };
-    });
+        const evaluate_result = e.evaluate_result === 1 ? 1 : 2;
+
+        return {
+          develop_complete,
+          evaluate_result,
+          evaluate_no: Number(e.no),
+          isResult: check > 0 ? true : false,
+        };
+      }),
+    );
 
     // const develop_complete = await (resultData.develop_orientation_score > 0 &&
     // resultData.develop_self_learning_score > 0 &&