From 6296088935d85f210ee93f18e70578df8eaf9809 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:45:50 +0700
Subject: [PATCH] refactor: map current task status to user task status instead

---
 src/controllers/07-task-controller.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts
index cf27c43..320dddb 100644
--- a/src/controllers/07-task-controller.ts
+++ b/src/controllers/07-task-controller.ts
@@ -545,6 +545,7 @@ export class UserTaskController extends Controller {
       prisma.taskOrder.findMany({
         where,
         include: {
+          userTask: true,
           institution: true,
           createdBy: true,
         },
@@ -552,6 +553,17 @@ export class UserTaskController extends Controller {
       prisma.taskOrder.count({ where }),
     ]);
 
-    return { result, page, pageSize, total };
+    return {
+      result: result.map((lhs) => ({
+        ...lhs,
+        taskOrderStatus:
+          lhs.userTask.find((rhs) => rhs.taskOrderId === lhs.id)?.userTaskStatus ??
+          lhs.taskOrderStatus,
+        userTask: undefined,
+      })),
+      page,
+      pageSize,
+      total,
+    };
   }
 }