CLAP-299 사용자 작업 취소

hyoseong-Choi · web-flow · commit d408c6587d75 · 2025-02-06T14:18:59.000+09:00
* CLAP-110 Feature : 담당자별 작업 처리량 조회 API 구현 <footer> - 관련: #73 * CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정 <footer> - 관련: #74 * 내 작업한 내용에 대한 설명 * 담당자 조회 API 구현 * CLAP-111 Refactor : 통계 조회 API 주소 통합, 리팩토링, 예외처리 <footer> - 관련: #74 * Bug : 프로퍼티파일 수정 * CLAP-104 CI/CD : CI에서 s3.yml 파일 생성하도록 수정 * CLAP-146 Feature : 카테고리 목록 조회 API 구현 <footer> - 관련: #118 * CLAP-147 Feature : 카테고리 수정 API 구현 <footer> - 관련: #119 * CLAP-147 Feature : 카테고리 추가, 수정 API 리뷰반영 수정 <footer> - 관련: #119 * CLAP-148 Feature : 카테고리 삭제 API 구현 <footer> - 관련: #120 * CLAP-148 Feature : 카테고리 삭제 API 수정 <footer> - 관련: #120 * CLAP-148 Docs : 카테고리 API 스웨거 수정 <footer> - 관련: #120 * CLAP-107 Bug : CI test yml파일 key 중복 수정 <footer> - 관련: #60 * CLAP-148 Feature : 카테고리 CUD 리뷰 반영 수정, 조회 반환 양식 수정 <footer> - 관련: #120 * CLAP-214 Cleanup : 통계, 카테고리 미흡한부분 리팩토링 <footer> - 관련: #216 * CLAP-214 Fix : 통계조회 API 파라미터 바인딩 오류 수정 <footer> - 관련: #216 * CLAP-214 Fix : addConverter 수정 <footer> - 관련: #216 * CLAP-214 Hotfix : 추가한 파일들 제거 <footer> - 관련: #216 * CLAP-214 Hotfix : FindStatisticsController 스위치문 수정 <footer> - 관련: #216 * CLAP-214 Hotfix : AddCategoryService 지연로딩 오류 수정 <footer> - 관련: #216 * CLAP-214 Hotfix : DeleteCategoryService 카테고리 삭제 로직 수정 <footer> - 관련: #216 * CLAP-249 Refactor : 통계 조회 서비스 리팩토링 <footer> - 관련: #265 * CLAP-250 Test : 통계 조회 테스트코드 작성 <footer> - 관련: #266 * CLAP-214 Hotifx : 카테고리 수정 로직 수정 <footer> - 관련: #216 * CLAP-214 Hotifx : 카테고리 수정 로직 수정 <footer> - 관련: #216 * CLAP-256 fix: 스웨거 명세 추가 * CLAP-214 Hotifx : 카테고리 저장 트랜잭션 추가 <footer> - 관련: #216 * CLAP-214 Hotifx : 카테고리 저장 시간 수정 <footer> - 관련: #216 * CLAP-285 Hotifx : 모든 카테고리 조회 <footer> - 관련: #331 * CLAP-214 Hotifx : 카테고리 조회 Secured 설정 <footer> - 관련: #216 * CLAP-256 fix: convert 동작 mapper 추가 * CLAP-256 fix: 충돌해결 * CLAP-256 fix: 불필요한 테스트 파일 제거 * CLAP-256 fix: mapper statuslabel 수정 * CLAP-256 Fix : 팀 작업 현황 필터링 조회 수정 <footer> - 관련: #281 * CLAP-299 Feature : 사용자 작업 취소 <footer> - 관련: #352
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java
@@ -1,6 +1,7 @@
 package clap.server.adapter.inbound.web.dto.task.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
@@ -0,0 +1,26 @@
+package clap.server.adapter.inbound.web.task;
+
+import clap.server.application.port.inbound.task.CancelTaskUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "02. Task [거부 & 종료]")
+@RequestMapping("/api/tasks")
+@RequiredArgsConstructor
+@WebAdapter
+public class CancelTaskController {
+    private final CancelTaskUsecase cancelTaskUsecase;
+
+    @Operation(summary = "작업 취소")
+    @Secured("ROLE_USER")
+    @PatchMapping("/{taskId}/cancle")
+    public void cancelTask(@PathVariable Long taskId) {
+        cancelTaskUsecase.cancleTask(taskId);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java
@@ -3,18 +3,24 @@
 import clap.server.application.port.inbound.task.FindManagersUsecase;
 import clap.server.adapter.inbound.web.dto.task.response.FindManagersResponse;
 import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
+
+@Tag(name = "02. Task [조회]")
 @WebAdapter
 @RequestMapping("/api/managers")
 @RequiredArgsConstructor
 public class ManagerController {
     private final FindManagersUsecase findManagersUsecase;
 
+    @Operation(summary = "담당자 조회 API")
     @GetMapping
     public ResponseEntity<List<FindManagersResponse>> findManagers() {
         return ResponseEntity.ok(findManagersUsecase.findManagers());
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
@@ -9,23 +9,24 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-
 @Tag(name = "02. Task [담당자]")
-@WebAdapter
 @RestController
-@RequiredArgsConstructor
 @RequestMapping("/api/team-status")
-    public class TeamStatusController {
-    
+@RequiredArgsConstructor
+@WebAdapter
+public class TeamStatusController {
+
     private final TeamStatusService teamStatusService;
     @Operation(summary = "팀 현황 필터링 조회 API")
     @GetMapping("/filter")
     public ResponseEntity<TeamStatusResponse> filterTeamStatus(@ModelAttribute FilterTeamStatusRequest filter) {
         TeamStatusResponse response = teamStatusService.filterTeamStatus(filter);
         return ResponseEntity.ok(response != null ? response : new TeamStatusResponse(List.of(), 0, 0, 0));
     }
-}
+
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -1,7 +1,7 @@
 package clap.server.adapter.outbound.persistense;
 
-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.FilterTaskBoardRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
@@ -23,7 +23,6 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.SliceImpl;
-import org.springframework.http.ResponseEntity;
 
 import java.time.LocalDateTime;
 import java.util.List;
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java
@@ -8,7 +8,7 @@
 public enum TaskStatus {
     REQUESTED("요청"),
     IN_PROGRESS("진행 중"),
-    IN_REVIEWING("완료 대기"),
+    IN_REVIEWING("검토중"),
     COMPLETED("완료"),
     TERMINATED("종료");
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -21,6 +21,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.Optional;
 
 import static clap.server.adapter.outbound.persistense.entity.task.QTaskEntity.taskEntity;
 import static com.querydsl.core.types.Order.ASC;
@@ -102,6 +103,11 @@ public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequ
                 .orderBy(orderBy)
                 .fetch();
 
+        // null 또는 빈 리스트 처리
+        if (taskEntities == null || taskEntities.isEmpty()) {
+            return List.of(); // 빈 리스트 반환
+        }
+
         return taskEntities.stream()
                 .collect(Collectors.groupingBy(t -> t.getProcessor().getMemberId()))
                 .entrySet().stream()
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
@@ -6,15 +6,12 @@
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import io.lettuce.core.dynamic.annotation.Param;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
 import java.util.Collection;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -52,7 +49,7 @@ List<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderAsc(
             Long processorId, TaskStatus taskStatus, Long processorOrder);
 
-    @Query("SELECT t FROM TaskEntity t JOIN FETCH t.processor p WHERE (:memberId IS NULL OR p.memberId = :memberId) ")
+//    @Query("SELECT t FROM TaskEntity t JOIN FETCH t.processor p WHERE (:memberId IS NULL OR p.memberId = :memberId) ")
     List<TeamTaskResponse> findTeamStatus(@Param("memberId") Long memberId, FilterTeamStatusRequest filter);
 
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndTaskIdLessThanOrderByTaskIdDesc(Long processorId, TaskStatus taskStatus, Long taskId);
diff --git a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
@@ -2,6 +2,8 @@
 
 
 import clap.server.adapter.inbound.web.dto.task.response.*;
+import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
+import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
@@ -193,4 +195,61 @@ public static FindManagersResponse toFindManagersResponse(Member manager, int re
                 remainingTasks
         );
     }
+
+    public static TeamStatusResponse toTeamStatusResponse(List<TaskEntity> taskEntities) {
+        // 담당자별로 그룹화
+        Map<Long, List<TaskEntity>> tasksByProcessor = taskEntities.stream()
+                .collect(Collectors.groupingBy(taskEntity -> taskEntity.getProcessor().getMemberId()));
+
+        List<TeamTaskResponse> memberResponses = tasksByProcessor.entrySet().stream()
+                .map(entry -> {
+                    List<TeamTaskItemResponse> teamtaskItemResponses = entry.getValue().stream()
+                            .map(TaskResponseMapper::toTeamTaskItemResponse)
+                            .collect(Collectors.toList());
+
+                    return new TeamTaskResponse(
+                            entry.getKey(),
+                            entry.getValue().get(0).getProcessor().getNickname(),
+                            entry.getValue().get(0).getProcessor().getImageUrl(),
+                            entry.getValue().get(0).getProcessor().getDepartment().getName(),
+                            (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS).count(),
+                            (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_REVIEWING).count(),
+                            entry.getValue().size(),
+                            teamtaskItemResponses
+                    );
+                })
+                .collect(Collectors.toList());
+
+        return new TeamStatusResponse(memberResponses);
+    }
+
+    public static TeamTaskItemResponse toTeamTaskItemResponse(TaskEntity taskEntity) {
+        return new TeamTaskItemResponse(
+                taskEntity.getTaskId(),
+                taskEntity.getTaskCode(),
+                taskEntity.getTitle(),
+                taskEntity.getCategory().getMainCategory().getName(),
+                taskEntity.getCategory().getName(),
+                taskEntity.getLabel() != null ? toLabelInfo(taskEntity.getLabel()) : null,
+                taskEntity.getRequester().getNickname(),
+                taskEntity.getRequester().getImageUrl(),
+                taskEntity.getRequester().getDepartment().getName(),
+                taskEntity.getProcessorOrder(),
+                taskEntity.getTaskStatus(),
+                taskEntity.getCreatedAt()
+        );
+    }
+
+    public static TeamTaskItemResponse.LabelInfo toLabelInfo(LabelEntity label) { // Label → LabelEntity로 변경
+        return new TeamTaskItemResponse.LabelInfo(
+                label.getLabelName(),
+                label.getLabelColor()
+        );
+    }
+
+
+
+
+
+
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/CancelTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/CancelTaskUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.task;
+
+public interface CancelTaskUsecase {
+    void cancleTask(Long taskId);
+}
diff --git a/src/main/java/clap/server/application/service/task/CancelTaskService.java b/src/main/java/clap/server/application/service/task/CancelTaskService.java
@@ -0,0 +1,21 @@
+package clap.server.application.service.task;
+
+import clap.server.application.port.inbound.domain.TaskService;
+import clap.server.application.port.inbound.task.CancelTaskUsecase;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.task.Task;
+import lombok.RequiredArgsConstructor;
+
+
+@ApplicationService
+@RequiredArgsConstructor
+public class CancelTaskService implements CancelTaskUsecase {
+    private final TaskService taskService;
+
+    @Override
+    public void cancleTask(Long taskId) {
+        Task task = taskService.findById(taskId);
+        task.cancelTask();
+        taskService.upsert(task);
+    }
+}
diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -1,12 +1,13 @@
 package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamStatusResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.application.port.inbound.task.FilterTeamStatusUsecase;
 import clap.server.application.port.inbound.task.LoadTeamStatusUsecase;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -22,12 +23,19 @@ public TeamStatusService(LoadTaskPort loadTaskPort) {
     @Override
     public TeamStatusResponse getTeamStatus(Long memberId, FilterTeamStatusRequest filter) {
         List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(memberId, filter);
+        if (members == null) {
+            members = List.of();
+        }
         return new TeamStatusResponse(members);
     }
 
     @Override
+    @Transactional(readOnly = true)
     public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
         List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(null, filter);
+        if (members == null) {
+            members = List.of();
+        }
         return new TeamStatusResponse(members);
     }
 
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
@@ -102,4 +102,9 @@ private static String toTaskCode(Category category) {
     public void updateProcessorOrder(long newProcessorOrder) {
         this.processorOrder = newProcessorOrder;
     }
+
+    public void cancelTask() {
+        this.taskStatus = TaskStatus.TERMINATED;
+        this.finishedAt = LocalDateTime.now();
+    }
 }
