Skip to content

Commit 473387a

Browse files
committed
CLAP-256 Fix : 팀 현황 필터조회 기여도순 정렬 수정
<footer> - 관련: #281
1 parent 614c1f2 commit 473387a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
55
import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
66
import clap.server.adapter.inbound.web.dto.task.request.SortBy;
7-
import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
87
import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
8+
import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
99
import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
1010
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
1111
import com.querydsl.core.BooleanBuilder;
@@ -20,9 +20,9 @@
2020
import org.springframework.stereotype.Repository;
2121

2222
import java.time.LocalDateTime;
23+
import java.util.LinkedHashMap;
2324
import java.util.List;
2425
import java.util.stream.Collectors;
25-
import java.util.Optional;
2626

2727
import static clap.server.adapter.outbound.persistense.entity.task.QTaskEntity.taskEntity;
2828
import static com.querydsl.core.types.Order.ASC;
@@ -118,7 +118,7 @@ public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequ
118118
}
119119

120120
return taskEntities.stream()
121-
.collect(Collectors.groupingBy(t -> t.getProcessor().getMemberId()))
121+
.collect(Collectors.groupingBy(t -> t.getProcessor().getMemberId(), LinkedHashMap::new, Collectors.toList()))
122122
.entrySet().stream()
123123
.map(entry -> {
124124
List<TeamTaskItemResponse> taskResponses = entry.getValue().stream()

src/main/java/clap/server/application/service/task/TeamStatusService.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
import java.util.List;
1313

14+
import static clap.server.adapter.inbound.web.dto.task.request.SortBy.CONTRIBUTE;
15+
1416
@ApplicationService
1517
public class TeamStatusService implements LoadTeamStatusUsecase, FilterTeamStatusUsecase {
1618

@@ -41,6 +43,7 @@ public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
4143
// 전체 팀의 진행 중 & 검토 중 작업 수 계산
4244
int totalInProgressTaskCount = members.stream().mapToInt(TeamTaskResponse::inProgressTaskCount).sum();
4345
int totalInReviewingTaskCount = members.stream().mapToInt(TeamTaskResponse::inReviewingTaskCount).sum();
46+
if (filter.sortBy().equals(CONTRIBUTE)) members.sort((a, b) -> b.totalTaskCount() - a.totalTaskCount());
4447

4548
return new TeamStatusResponse(members, totalInProgressTaskCount, totalInReviewingTaskCount);
4649
}

0 commit comments

Comments
 (0)