Skip to content

Commit 3f18e47

Browse files
committed
CLAP-437 Fix: 오류 수정
1 parent 4f14e17 commit 3f18e47

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class CancelTaskController {
2020
private final CancelTaskUsecase cancelTaskUsecase;
2121

2222
@Operation(summary = "작업 취소")
23-
@Secured("ROLE_USER")
23+
@Secured({"ROLE_USER","ROLE_MANAGER"})
2424
@PatchMapping("/{taskId}/cancel")
2525
public void cancelTask(@PathVariable Long taskId, @AuthenticationPrincipal SecurityUserDetails userDetails) {
2626
cancelTaskUsecase.cancleTask(taskId, userDetails.getUserId());

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ public void updateTaskStatus(Long memberId, Long taskId, TaskStatus targetTaskSt
4848
}
4949

5050
if (!task.getTaskStatus().equals(targetTaskStatus)) {
51-
updateProcessorTaskCountService.handleTaskStatusChange(task.getProcessor(), task.getTaskStatus(), targetTaskStatus);
51+
// 작업 종료에서의 상태 전환은 count를 업데이트를 하지 않음
52+
if(task.getProcessor()!=null) {
53+
updateProcessorTaskCountService.handleTaskStatusChange(task.getProcessor(), task.getTaskStatus(), TaskStatus.TERMINATED);
54+
}
5255
task.updateTaskStatus(targetTaskStatus);
5356
Task updatedTask = taskService.upsert(task);
5457

0 commit comments

Comments
 (0)