Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joowojr merged 1 commit into from
Feb 15, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/clap/server/application/service/task/UpdateTaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down