Skip to content

Commit 27767da

Browse files
committed
CLAP-408 Refactor: 담당자 조회 시에 member의 정보에서 가져오도록 수정
<footer> - #529
1 parent 9306b03 commit 27767da

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

src/main/java/clap/server/application/service/admin/ManageMemberService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest re
2929
Member member = memberService.findById(memberId);
3030
Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(() ->
3131
new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
32-
33-
//TODO: 인프라팀만 담당자가 될 수 있도록 수정해야함
32+
3433
member.getMemberInfo().updateMemberInfoByAdmin(
3534
request.name(), request.isReviewer(),
3635
department, request.role(), request.departmentRole());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ public class FindManagersService implements FindManagersUsecase {
2424
@Transactional
2525
@Override
2626
public List<FindManagersResponse> findManagers() {
27-
List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING);
27+
// List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING);
2828
List<Member> managers = memberService.findActiveManagers();
2929
return managers.stream()
3030
.map(manager -> {
31-
int remainingTasks = loadTaskPort.findTasksByMemberIdAndStatus(manager.getMemberId(), targetStatuses).size();
31+
int remainingTasks = manager.getInProgressTaskCount() + manager.getInReviewingTaskCount();
3232
return toFindManagersResponse(manager, remainingTasks);
3333
}).toList();
3434
}

0 commit comments

Comments
 (0)