Merge pull request #263 from TaskFlow-CLAP/CLAP-245

joowojr · web-flow · commit bc382a83bdd9 · 2025-02-03T21:42:37.000+09:00
CLAP-245 작업 거부 / 종료 API 구현
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/history/response/FindTaskHistoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/history/response/FindTaskHistoryResponse.java
@@ -24,7 +24,7 @@ public static record Details(
     ) {}
 
     public static record TaskDetails(
-            String newValue
+            String value
     ) {}
 
     public static record CommentDetails(
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java
@@ -4,15 +4,17 @@
 import clap.server.adapter.inbound.web.dto.task.request.ApprovalTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskLabelRequest;
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskProcessorRequest;
-import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskStatusRequest;
 import clap.server.adapter.inbound.web.dto.task.response.ApprovalTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.port.inbound.task.ApprovalTaskUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskLabelUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskProcessorUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskStatusUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
@@ -41,9 +43,11 @@ public class ChangeTaskController {
     public ResponseEntity<UpdateTaskResponse> updateTaskState(
             @PathVariable @NotNull Long taskId,
             @AuthenticationPrincipal SecurityUserDetails userInfo,
-            @RequestBody UpdateTaskStatusRequest updateTaskStatusRequest) {
+            @Parameter(description = "변경하고 싶은 작업 상태",
+                    schema = @Schema(allowableValues = {"IN_PROGRESS", "PENDING_COMPLETED", "COMPLETED"}))
+            @RequestBody TaskStatus taskStatus) {
 
-        return ResponseEntity.ok(updateTaskStatusUsecase.updateTaskState(userInfo.getUserId(), taskId, updateTaskStatusRequest));
+        return ResponseEntity.ok(updateTaskStatusUsecase.updateTaskStatus(userInfo.getUserId(), taskId, taskStatus));
     }
 
     @Operation(summary = "작업 처리자 변경")
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TerminateTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/TerminateTaskController.java
@@ -0,0 +1,31 @@
+package clap.server.adapter.inbound.web.task;
+
+import clap.server.adapter.inbound.security.SecurityUserDetails;
+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 lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@Tag(name = "02. Task [거부 & 종료]")
+@WebAdapter
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/tasks")
+public class TerminateTaskController {
+    private final TerminateTaskUsecase terminateTaskUsecase;
+
+    @Operation(summary = "작업 거부 및 종료")
+    @Secured({"ROLE_MANAGER"})
+    @PatchMapping("/{taskId}/terminate")
+    public void terminateTask(@AuthenticationPrincipal SecurityUserDetails userInfo,
+                              @PathVariable Long taskId,
+                              @RequestBody @Schema(example = "스웨거에서는 따옴표를 떼고 보내주세요") String reason) {
+        terminateTaskUsecase.terminateTask(userInfo.getUserId(), taskId, reason);
+    }
+
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskHistoryType.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskHistoryType.java
@@ -10,7 +10,8 @@ public enum TaskHistoryType {
     COMMENT_FILE("댓글 첨부파일"),
     STATUS_SWITCHED("상태 전환"),
     PROCESSOR_ASSIGNED("처리자 할당"),
-    PROCESSOR_CHANGED("처리자 변경");
+    PROCESSOR_CHANGED("처리자 변경"),
+    TASK_TERMINATED("작업 종료됨");
 
     private final String description;
 }
diff --git a/src/main/java/clap/server/application/mapper/TaskHistoryResponseMapper.java b/src/main/java/clap/server/application/mapper/TaskHistoryResponseMapper.java
@@ -26,7 +26,7 @@ public static FindTaskHistoryResponse toFindTaskHistoryResponse(List<TaskHistory
                                         null,
                                         null
                                 );
-                                case STATUS_SWITCHED -> new FindTaskHistoryResponse.Details(
+                                case STATUS_SWITCHED, TASK_TERMINATED -> new FindTaskHistoryResponse.Details(
                                         new FindTaskHistoryResponse.TaskDetails(
                                                 taskHistory.getTaskModificationInfo().getModifiedStatus()
                                         ),
diff --git a/src/main/java/clap/server/application/port/inbound/domain/TaskService.java b/src/main/java/clap/server/application/port/inbound/domain/TaskService.java
@@ -1,5 +1,6 @@
 package clap.server.application.port.inbound.domain;
 
+import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.domain.model.task.Task;
 import clap.server.exception.ApplicationException;
@@ -12,9 +13,14 @@
 public class TaskService {
 
     private final LoadTaskPort loadTaskPort;
+    private final CommandTaskPort commandTaskPort;
 
     public Task findById(Long taskId) {
         return loadTaskPort.findById(taskId).orElseThrow(
                 ()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
     }
+    
+    public Task upsert(Task task) {
+        return commandTaskPort.save(task);
+    }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/TerminateTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/TerminateTaskUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.task;
+
+public interface TerminateTaskUsecase {
+    void terminateTask(Long memberId, Long taskId, String reason);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java
@@ -1,8 +1,8 @@
 package clap.server.application.port.inbound.task;
 
 import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse;
-import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskStatusRequest;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
 public interface UpdateTaskStatusUsecase {
-    UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTaskStatusRequest updateTaskStatusRequest);
+    UpdateTaskResponse updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus);
 }
diff --git a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
@@ -57,7 +57,7 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         List<Member> receivers = List.of(reviewer, processor);
         publishNotification(receivers, task);
 
-        return TaskResponseMapper.toApprovalTaskResponse(commandTaskPort.save(task));
+        return TaskResponseMapper.toApprovalTaskResponse(taskService.upsert(task));
     }
 
     @Override
diff --git a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
@@ -9,7 +9,7 @@
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.task.Task;
-import clap.server.domain.policy.task.TaskValuePolicy;
+import clap.server.domain.policy.task.TaskPolicyConstants;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
@@ -18,29 +18,29 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Slf4j
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 class GetTaskBoardService implements GetTaskBoardUsecase, FilterTaskBoardUsecase {
-
     private final MemberService memberService;
     private final LoadTaskPort loadTaskPort;
 
     @Override
     public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
         memberService.findActiveMember(processorId);
         LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
-        Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, TaskValuePolicy.TASK_BOARD_STATUS_FILTER, untilDateTime, pageable);
+        Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, TaskPolicyConstants.TASK_BOARD_STATUS_FILTER, untilDateTime, pageable);
         return TaskResponseMapper.toSliceTaskItemResponse(tasks);
     }
 
     @Override
     public TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate untilDate, FilterTaskBoardRequest request, Pageable pageable) {
         memberService.findActiveMember(processorId);
         LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
-        Slice<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, TaskValuePolicy.TASK_BOARD_STATUS_FILTER, untilDateTime, request, pageable);
+        Slice<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, TaskPolicyConstants.TASK_BOARD_STATUS_FILTER, untilDateTime, request, pageable);
         return TaskResponseMapper.toSliceTaskItemResponse(tasks);
     }
 }
diff --git a/src/main/java/clap/server/application/service/task/TerminateTaskService.java b/src/main/java/clap/server/application/service/task/TerminateTaskService.java
@@ -0,0 +1,32 @@
+package clap.server.application.service.task;
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
+import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.inbound.domain.TaskService;
+import clap.server.application.port.inbound.task.TerminateTaskUsecase;
+import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.task.Task;
+import clap.server.domain.model.task.TaskHistory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+@ApplicationService
+@RequiredArgsConstructor
+@Transactional
+public class TerminateTaskService implements TerminateTaskUsecase {
+    private final MemberService memberService;
+    private final TaskService taskService;
+    private final CommandTaskHistoryPort commandTaskHistoryPort;
+
+    @Override
+    public void terminateTask(Long memberId, Long taskId, String reason) {
+        memberService.findReviewer(memberId);
+        Task task = taskService.findById(taskId);
+        task.terminateTask();
+        taskService.upsert(task);
+
+        TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.TASK_TERMINATED, task, reason, null, null);
+        commandTaskHistoryPort.save(taskHistory);
+    }
+}
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -6,14 +6,13 @@
 import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskOrderAndStatusUsecase;
-import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.domain.policy.task.TaskOrderCalculationPolicy;
 import clap.server.domain.policy.task.ProcessorValidationPolicy;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;
-import clap.server.domain.policy.task.TaskValuePolicy;
+import clap.server.domain.policy.task.TaskPolicyConstants;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -27,7 +26,7 @@ class UpdateTaskBoardService implements UpdateTaskBoardUsecase, UpdateTaskOrderA
     private final MemberService memberService;
     private final TaskService taskService;
     private final LoadTaskPort loadTaskPort;
-    private final CommandTaskPort commandTaskPort;
+    
     private final TaskOrderCalculationPolicy taskOrderCalculationPolicy;
     private final ProcessorValidationPolicy processorValidationPolicy;
 
@@ -81,7 +80,7 @@ else if (request.nextTaskId() == 0) {
      */
     private void updateNewTaskOrder(Task targetTask, Long newOrder) {
         targetTask.updateProcessorOrder(newOrder);
-        commandTaskPort.save(targetTask);
+        taskService.upsert(targetTask);
     }
 
     /**
@@ -125,7 +124,7 @@ public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest re
     private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, long newOrder) {
         targetTask.updateProcessorOrder(newOrder);
         targetTask.updateTaskStatus(targetStatus);
-        commandTaskPort.save(targetTask);
+        taskService.upsert(targetTask);
     }
 
     /**
@@ -138,7 +137,7 @@ public void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetSta
         }
 
         // 타겟 상태가 유효한지 검증
-        if (targetStatus != null && !TaskValuePolicy.TASK_BOARD_STATUS_FILTER.contains(targetStatus)) {
+        if (targetStatus != null && !TaskPolicyConstants.TASK_BOARD_STATUS_FILTER.contains(targetStatus)) {
             throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
         }
     }
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -3,9 +3,9 @@
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskLabelRequest;
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskProcessorRequest;
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskRequest;
-import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskStatusRequest;
 import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskResponseMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
@@ -18,7 +18,6 @@
 import clap.server.application.port.inbound.task.UpdateTaskUsecase;
 import clap.server.application.port.outbound.s3.S3UploadPort;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
-import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
 import clap.server.application.service.webhook.SendNotificationService;
 import clap.server.common.annotation.architecture.ApplicationService;
@@ -28,6 +27,7 @@
 import clap.server.domain.model.task.Category;
 import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
+import clap.server.domain.policy.task.TaskPolicyConstants;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -48,7 +48,6 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
     private final TaskService taskService;
     private final SendNotificationService sendNotificationService;
 
-    private final CommandTaskPort commandTaskPort;
     private final LoadAttachmentPort loadAttachmentPort;
     private final LabelService labelService;
     private final CommandAttachmentPort commandAttachmentPort;
@@ -62,7 +61,7 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
         Task task = taskService.findById(taskId);
 
         task.updateTask(requesterId, category, updateTaskRequest.title(), updateTaskRequest.description());
-        Task updatedTask = commandTaskPort.save(task);
+        Task updatedTask = taskService.upsert(task);
 
         if (!updateTaskRequest.attachmentsToDelete().isEmpty()) {
             updateAttachments(updateTaskRequest.attachmentsToDelete(), files, task);
@@ -72,11 +71,14 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
 
     @Override
     @Transactional
-    public UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTaskStatusRequest updateTaskStatusRequest) {
+    public UpdateTaskResponse updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus) {
         memberService.findActiveMember(memberId);
+        if(!TaskPolicyConstants.TASK_UPDATABLE_STATUS.contains(taskStatus)){
+            throw new ApplicationException(TaskErrorCode.TASK_STATUS_NOT_ALLOWED);
+        }
         Task task = taskService.findById(taskId);
-        task.updateTaskStatus(updateTaskStatusRequest.taskStatus());
-        Task updateTask = commandTaskPort.save(task);
+        task.updateTaskStatus(taskStatus);
+        Task updateTask = taskService.upsert(task);
 
         publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
         return TaskResponseMapper.toUpdateTaskResponse(updateTask);
@@ -90,7 +92,7 @@ public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTa
 
         Task task = taskService.findById(taskId);
         task.updateProcessor(processor);
-        Task updateTask = commandTaskPort.save(task);
+        Task updateTask = taskService.upsert(task);
 
         publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname());
         return TaskResponseMapper.toUpdateTaskResponse(updateTask);
@@ -104,7 +106,7 @@ public UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLa
         Label label = labelService.findById(request.labelId());
 
         task.updateLabel(label);
-        Task updatetask = commandTaskPort.save(task);
+        Task updatetask = taskService.upsert(task);
         return TaskResponseMapper.toUpdateTaskResponse(updatetask);
     }
 
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
diff --git a/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java b/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
diff --git a/src/main/java/clap/server/domain/policy/task/TaskPolicyConstants.java b/src/main/java/clap/server/domain/policy/task/TaskPolicyConstants.java
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
diff --git a/src/main/resources/db/migration/dev/V20250203245__Modify_Type_From_Task_History.sql b/src/main/resources/db/migration/dev/V20250203245__Modify_Type_From_Task_History.sql

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ public enum TaskHistoryType {`
`10`	`10`	`COMMENT_FILE("댓글 첨부파일"),`
`11`	`11`	`STATUS_SWITCHED("상태 전환"),`
`12`	`12`	`PROCESSOR_ASSIGNED("처리자 할당"),`
`13`		`- PROCESSOR_CHANGED("처리자 변경");`
	`13`	`+ PROCESSOR_CHANGED("처리자 변경"),`
	`14`	`+ TASK_TERMINATED("작업 종료됨");`
`14`	`15`
`15`	`16`	`private final String description;`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package clap.server.application.port.inbound.task;`
`2`	`2`
`3`	`3`	`import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse;`
`4`		`-import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskStatusRequest;`
	`4`	`+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;`
`5`	`5`
`6`	`6`	`public interface UpdateTaskStatusUsecase {`
`7`		`- UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTaskStatusRequest updateTaskStatusRequest);`
	`7`	`+ UpdateTaskResponse updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus);`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,`
`57`	`57`	`List<Member> receivers = List.of(reviewer, processor);`
`58`	`58`	`publishNotification(receivers, task);`
`59`	`59`
`60`		`- return TaskResponseMapper.toApprovalTaskResponse(commandTaskPort.save(task));`
	`60`	`+ return TaskResponseMapper.toApprovalTaskResponse(taskService.upsert(task));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Override`