Skip to content

CLAP-449 팀 작업 현황 카테고리 필터링시 작업 개수 오류 수정 #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2025
Merged

CLAP-449 팀 작업 현황 카테고리 필터링시 작업 개수 오류 수정 #589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main/java/clap/server/application/mapper/response/TeamTaskResponseMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
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;
import java.util.List;
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) {
Expand All @@ -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
);
Expand Down