Skip to content

Commit 1665be3

Browse files
committed
CLAP-451 Refactor: findTaskWithProcessorDepartment 도메인 서비스 클래스로 이동
#590
1 parent 227e7e9 commit 1665be3

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/main/java/clap/server/application/port/inbound/domain/TaskService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ public Task upsert(Task task) {
2828
public Task findByIdAndStatus(Long taskId, TaskStatus status) {
2929
return loadTaskPort.findByIdAndStatus(taskId, status).orElseThrow(() -> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
3030
}
31+
32+
public Task findTaskWithProcessorDepartment(Long taskId){
33+
return loadTaskPort.findTaskWithProcessorDepartment(taskId).orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
34+
}
3135
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@
2222
@Transactional
2323
public class TerminateTaskService implements TerminateTaskUsecase {
2424
private final TaskService taskService;
25-
private final LoadTaskPort loadTaskPort;
2625
private final CommandTaskHistoryPort commandTaskHistoryPort;
2726
private final SendNotificationService sendNotificationService;
2827
private final UpdateProcessorTaskCountService updateProcessorTaskCountService;
2928

3029
@Override
3130
public void terminateTask(Long memberId, Long taskId, String reason) {
32-
Task task = loadTaskPort.findTaskWithProcessorDepartment(taskId).orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
31+
Task task = taskService.findTaskWithProcessorDepartment(taskId);
3332

3433
// 작업 종료의 경우. 작업 반려는 count를 업데이트를 하지 않음
3534
if(task.getProcessor()!=null) {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
@Slf4j
3434
public class UpdateTaskService implements UpdateTaskStatusUsecase, UpdateTaskProcessorUsecase {
3535
private final MemberService memberService;
36-
private final LoadTaskPort loadTaskPort;
3736
private final TaskService taskService;
3837
private final SendNotificationService sendNotificationService;
3938
private final UpdateProcessorTaskCountService updateProcessorTaskCountService;
@@ -43,7 +42,7 @@ public class UpdateTaskService implements UpdateTaskStatusUsecase, UpdateTaskPro
4342
@Transactional
4443
public void updateTaskStatus(Long memberId, Long taskId, TaskStatus targetTaskStatus) {
4544
memberService.findActiveMember(memberId);
46-
Task task = loadTaskPort.findTaskWithProcessorDepartment(taskId).orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
45+
Task task = taskService.findTaskWithProcessorDepartment(taskId);
4746

4847
if (!TASK_UPDATABLE_STATUS.contains(targetTaskStatus)) {
4948
throw new ApplicationException(TaskErrorCode.TASK_STATUS_NOT_ALLOWED);
@@ -70,7 +69,7 @@ public void updateTaskStatus(Long memberId, Long taskId, TaskStatus targetTaskSt
7069
public void updateTaskProcessor(Long taskId, Long memberId, UpdateTaskProcessorRequest request) {
7170
memberService.findActiveMember(memberId);
7271

73-
Task task = loadTaskPort.findTaskWithProcessorDepartment(taskId).orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
72+
Task task = taskService.findTaskWithProcessorDepartment(taskId);
7473

7574
Member processor = memberService.findActiveMemberWithDepartment(request.processorId());
7675
if (REMAINING_TASK_STATUS.contains(task.getTaskStatus())) {

0 commit comments

Comments
 (0)