Merge pull request #571 from TaskFlow-CLAP/CLAP-437

CLAP-437 요청 취소 및 상태 변경시에 일어나는 오류 수정

Author: joowojr

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

@@ -20,7 +20,7 @@ public class CancelTaskController {
     private final CancelTaskUsecase cancelTaskUsecase;
 
     @Operation(summary = "작업 취소")
-    @Secured("ROLE_USER")
+    @Secured({"ROLE_USER","ROLE_MANAGER"})
     @PatchMapping("/{taskId}/cancel")
     public void cancelTask(@PathVariable Long taskId, @AuthenticationPrincipal SecurityUserDetails userDetails) {
         cancelTaskUsecase.cancleTask(taskId, userDetails.getUserId());

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

@@ -48,7 +48,10 @@ public void updateTaskStatus(Long memberId, Long taskId, TaskStatus targetTaskSt
         }
 
         if (!task.getTaskStatus().equals(targetTaskStatus)) {
-            updateProcessorTaskCountService.handleTaskStatusChange(task.getProcessor(), task.getTaskStatus(), targetTaskStatus);
+            // 작업 종료에서의 상태 전환은 count를 업데이트를 하지 않음
+            if(task.getProcessor()!=null) {
+                updateProcessorTaskCountService.handleTaskStatusChange(task.getProcessor(), task.getTaskStatus(), TaskStatus.TERMINATED);
+            }
             task.updateTaskStatus(targetTaskStatus);
             Task updatedTask = taskService.upsert(task);