Merge pull request #560 from TaskFlow-CLAP/CLAP-408

CLAP-408 진행중, 검토중인 작업 수 조회 시 member 테이블의 컬럼을 참조하도록 리팩토링

Author: joowojr

src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java

@@ -8,18 +8,4 @@ public record TeamStatusResponse(
         int totalInReviewingTaskCount,
         int totalTaskCount
 ) {
-    // 기존 생성자 (3개 파라미터)
-    public TeamStatusResponse(List<TeamTaskResponse> members, int totalInProgressTaskCount, int totalInReviewingTaskCount) {
-        this(
-                (members == null) ? List.of() : members,
-                totalInProgressTaskCount,
-                totalInReviewingTaskCount,
-                totalInProgressTaskCount + totalInReviewingTaskCount
-        );
-    }
-
-    // 추가된 생성자 (List만 받음)
-    public TeamStatusResponse(List<TeamTaskResponse> members) {
-        this(members, 0, 0); // 기본값을 사용하여 생성
-    }
 }

src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java

@@ -12,15 +12,15 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@Tag(name = "02. Task [거부 & 종료]")
+@Tag(name = "02. Task [종료]")
 @RequestMapping("/api/tasks")
 @RequiredArgsConstructor
 @WebAdapter
 public class CancelTaskController {
     private final CancelTaskUsecase cancelTaskUsecase;
 
     @Operation(summary = "작업 취소")
-    @Secured({"ROLE_USER","ROLE_MANAGER"})
+    @Secured("ROLE_USER")
     @PatchMapping("/{taskId}/cancel")
     public void cancelTask(@PathVariable Long taskId, @AuthenticationPrincipal SecurityUserDetails userDetails) {
         cancelTaskUsecase.cancleTask(taskId, userDetails.getUserId());

src/main/java/clap/server/adapter/inbound/web/task/TerminateTaskController.java

@@ -5,22 +5,23 @@
 import clap.server.application.port.inbound.task.TerminateTaskUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
-@Tag(name = "02. Task [거부 & 종료]")
+@Tag(name = "02. Task [종료]")
 @WebAdapter
 @RequiredArgsConstructor
 @RequestMapping("/api/tasks")
 public class TerminateTaskController {
     private final TerminateTaskUsecase terminateTaskUsecase;
 
-    @Operation(summary = "작업 거부 및 종료")
+    @Operation(summary = "작업 반려 및 종료")
     @Secured({"ROLE_MANAGER"})
     @PatchMapping("/{taskId}/terminate")
     public void terminateTask(@AuthenticationPrincipal SecurityUserDetails userInfo,

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

@@ -3,12 +3,8 @@
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.request.SortBy;
-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.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
-import clap.server.domain.model.task.Task;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.dsl.DateTimePath;
@@ -20,12 +16,8 @@
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import static clap.server.adapter.inbound.web.dto.task.request.SortBy.CONTRIBUTE;
 import static clap.server.adapter.outbound.persistense.entity.task.QTaskEntity.taskEntity;
 import static com.querydsl.core.types.Order.ASC;
 import static com.querydsl.core.types.Order.DESC;

src/main/java/clap/server/application/mapper/response/TeamTaskResponseMapper.java

@@ -1,8 +1,8 @@
 package clap.server.application.mapper.response;
 
+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;
@@ -25,10 +25,10 @@ private static TeamTaskResponse toTeamTaskResponse(Map.Entry<Long, List<Task>> e
                 .map(TeamTaskResponseMapper::toTeamTaskItemResponse)
                 .collect(Collectors.toList());
 
-        int inProgressTaskCount = (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS).count();
-        int inReviewingTaskCount = (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_REVIEWING).count();
-
         Task firstTask = entry.getValue().get(0);
+        int inProgressTaskCount = firstTask.getProcessor().getInProgressTaskCount();
+        int inReviewingTaskCount = firstTask.getProcessor().getInReviewingTaskCount();
+
         return new TeamTaskResponse(
                 entry.getKey(),
                 firstTask.getProcessor().getNickname(),
@@ -65,4 +65,13 @@ private static TeamTaskItemResponse.LabelInfo toLabelInfo(Task task) {
                         task.getLabel().getLabelColor()
                 ) : null;
     }
+
+    public static TeamStatusResponse toTeamStatusResponse(List<TeamTaskResponse> members, int totalInProgressTaskCount, int totalInReviewingTaskCount) {
+        return new TeamStatusResponse(
+                (members == null) ? List.of() : members,
+                totalInProgressTaskCount,
+                totalInReviewingTaskCount,
+                totalInProgressTaskCount + totalInReviewingTaskCount
+        );
+    }
 }

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

@@ -29,8 +29,7 @@ public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest re
         Member member = memberService.findById(memberId);
         Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(() ->
                 new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
-
-        //TODO: 인프라팀만 담당자가 될 수 있도록 수정해야함
+        
         member.getMemberInfo().updateMemberInfoByAdmin(
                 request.name(), request.isReviewer(),
                 department, request.role(), request.departmentRole());

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

@@ -6,6 +6,7 @@
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.mapper.response.TaskResponseMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
 import clap.server.application.port.inbound.domain.LabelService;
@@ -28,16 +29,16 @@
 
 @ApplicationService
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
 public class ApprovalTaskService implements ApprovalTaskUsecase {
-
     private final MemberService memberService;
     private final TaskService taskService;
     private final CategoryService categoryService;
     private final LabelService labelService;
+
     private final RequestedTaskUpdatePolicy requestedTaskUpdatePolicy;
     private final CommandTaskHistoryPort commandTaskHistoryPort;
     private final SendNotificationService sendNotificationService;
+    private final UpdateProcessorTaskCountService updateProcessorTaskCountService;
 
     @Override
     @Transactional
@@ -52,8 +53,10 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         }
 
         requestedTaskUpdatePolicy.validateTaskRequested(task);
+        updateProcessorTaskCountService.handleTaskStatusChange(processor, TaskStatus.REQUESTED, TaskStatus.IN_PROGRESS);
         task.approveTask(reviewer, processor, approvalTaskRequest.dueDate(), category, label);
-        TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.PROCESSOR_ASSIGNED, task, null, processor,null);
+
+        TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.PROCESSOR_ASSIGNED, task, null, processor, null);
         commandTaskHistoryPort.save(taskHistory);
 
         List<Member> receivers = List.of(task.getRequester(), processor);
@@ -71,7 +74,7 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
         return TaskResponseMapper.toFindApprovalFormResponse(task);
     }
 
-    private void publishNotification(List<Member> receivers, Task task, String processorName){
+    private void publishNotification(List<Member> receivers, Task task, String processorName) {
         receivers.forEach(receiver -> {
             boolean isManager = receiver.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER;
             sendNotificationService.sendPushNotification(receiver, NotificationType.PROCESSOR_ASSIGNED,

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

@@ -1,10 +1,8 @@
 package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.response.FindManagersResponse;
-import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.task.FindManagersUsecase;
-import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import jakarta.transaction.Transactional;
@@ -19,16 +17,14 @@
 public class FindManagersService implements FindManagersUsecase {
 
     private final MemberService memberService;
-    private final LoadTaskPort loadTaskPort;
 
     @Transactional
     @Override
     public List<FindManagersResponse> findManagers() {
-        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING);
         List<Member> managers = memberService.findActiveManagers();
         return managers.stream()
                 .map(manager -> {
-                    int remainingTasks = loadTaskPort.findTasksByMemberIdAndStatus(manager.getMemberId(), targetStatuses).size();
+                    int remainingTasks = manager.getInProgressTaskCount() + manager.getInReviewingTaskCount();
                     return toFindManagersResponse(manager, remainingTasks);
                 }).toList();
     }

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

@@ -35,7 +35,7 @@ public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
             taskItemResponses.sort((a, b) -> b.totalTaskCount() - a.totalTaskCount());
         else taskItemResponses.sort(Comparator.comparing(TeamTaskResponse::nickname));
 
-        return new TeamStatusResponse(taskItemResponses, totalInProgressTaskCount, totalInReviewingTaskCount);
+        return TeamTaskResponseMapper.toTeamStatusResponse(taskItemResponses, totalInProgressTaskCount, totalInReviewingTaskCount);
     }
 
 

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

@@ -1,9 +1,8 @@
 package clap.server.application.service.task;
 
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
-import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.inbound.task.TerminateTaskUsecase;
 import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
@@ -15,20 +14,20 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional
 public class TerminateTaskService implements TerminateTaskUsecase {
-    private final MemberService memberService;
     private final TaskService taskService;
     private final CommandTaskHistoryPort commandTaskHistoryPort;
     private final SendNotificationService sendNotificationService;
+    private final UpdateProcessorTaskCountService updateProcessorTaskCountService;
 
     @Override
     public void terminateTask(Long memberId, Long taskId, String reason) {
         Task task = taskService.findById(taskId);
+
+        updateProcessorTaskCountService.handleTaskStatusChange(task.getProcessor(), task.getTaskStatus(), TaskStatus.TERMINATED);
         task.terminateTask();
         taskService.upsert(task);