From d81e853757cae94301428600288e3324c0939e89 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 18 Feb 2025 10:01:47 +0900
Subject: [PATCH] =?UTF-8?q?CLAP-449=20Fix=20:=20=ED=8C=80=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=20=ED=98=84=ED=99=A9=20=EC=B9=B4=ED=85=8C=EA=B3=A0?=
 =?UTF-8?q?=EB=A6=AC=20=ED=95=84=ED=84=B0=EB=A7=81=EC=8B=9C=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=20=EA=B0=9C=EC=88=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #588
---
 .../mapper/response/TeamTaskResponseMapper.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/clap/server/application/mapper/response/TeamTaskResponseMapper.java b/src/main/java/clap/server/application/mapper/response/TeamTaskResponseMapper.java
index 05aa2ffc..63a3cebe 100644
--- a/src/main/java/clap/server/application/mapper/response/TeamTaskResponseMapper.java
+++ b/src/main/java/clap/server/application/mapper/response/TeamTaskResponseMapper.java
@@ -3,6 +3,7 @@
 import clap.server.adapter.inbound.web.dto.task.response.TeamStatusResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.task.Task;
 
 import java.util.LinkedHashMap;
@@ -10,6 +11,9 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus.IN_PROGRESS;
+import static clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus.IN_REVIEWING;
+
 public class TeamTaskResponseMapper {
 
     public static List<TeamTaskResponse> toTeamTaskResponses(List<Task> tasks) {
@@ -26,16 +30,16 @@ private static TeamTaskResponse toTeamTaskResponse(Map.Entry<Long, List<Task>> e
                 .collect(Collectors.toList());
 
         Task firstTask = entry.getValue().get(0);
-        int inProgressTaskCount = firstTask.getProcessor().getInProgressTaskCount();
-        int inReviewingTaskCount = firstTask.getProcessor().getInReviewingTaskCount();
+        LinkedHashMap<TaskStatus, List<TeamTaskItemResponse>> collect = taskResponses.stream()
+                .collect(Collectors.groupingBy(TeamTaskItemResponse::taskStatus, LinkedHashMap::new, Collectors.toList()));
 
         return new TeamTaskResponse(
                 entry.getKey(),
                 firstTask.getProcessor().getNickname(),
                 firstTask.getProcessor().getImageUrl(),
                 firstTask.getProcessor().getDepartment().getName(),
-                inProgressTaskCount,
-                inReviewingTaskCount,
+                collect.get(IN_PROGRESS) != null ? collect.get(IN_PROGRESS).size() : 0,
+                collect.get(IN_REVIEWING) != null ? collect.get(IN_REVIEWING).size() : 0,
                 entry.getValue().size(),
                 taskResponses
         );