CLAP-155 Refactor: 요청자인이 검증하는 로직을 도메인 레벨로 이동

<footer>
- 관련: #133

Author: joowojr

src/main/java/clap/server/application/Task/UpdateTaskService.java

@@ -5,6 +5,7 @@
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
+import clap.server.application.port.inbound.domain.LabelService;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.inbound.task.UpdateTaskLabelUsecase;
@@ -14,27 +15,21 @@
 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.port.outbound.task.LoadLabelPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.common.constants.FilePathConstants;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
-import clap.server.common.constants.FilePathConstants;
+import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
-
 import clap.server.exception.ApplicationException;
-import clap.server.exception.code.LabelErrorCode;
-import clap.server.exception.code.MemberErrorCode;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-import java.util.Objects;
-
-import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
 
 
 @ApplicationService
@@ -45,9 +40,10 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
     private final MemberService memberService;
     private final CategoryService categoryService;
     private final TaskService taskService;
+
     private final CommandTaskPort commandTaskPort;
     private final LoadAttachmentPort loadAttachmentPort;
-    private final LoadLabelPort loadLabelPort;
+    private final LabelService labelService;
     private final CommandAttachmentPort commandAttachmentPort;
     private final S3UploadAdapter s3UploadAdapter;
 
@@ -58,14 +54,10 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
         Category category = categoryService.findById(updateTaskRequest.categoryId());
         Task task = taskService.findById(taskId);
 
-        if(!Objects.equals(requester.getMemberId(), task.getRequester().getMemberId())) {
-            throw new ApplicationException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
-
-        task.updateTask(task.getTaskStatus(), category, updateTaskRequest.title(), updateTaskRequest.description());
+        task.updateTask(requesterId, category, updateTaskRequest.title(), updateTaskRequest.description());
         Task updatedTask = commandTaskPort.save(task);
 
-        if (!updateTaskRequest.attachmentsToDelete().isEmpty()){
+        if (!updateTaskRequest.attachmentsToDelete().isEmpty()) {
             updateAttachments(updateTaskRequest.attachmentsToDelete(), files, task);
         }
         return TaskMapper.toUpdateTaskResponse(updatedTask);
@@ -86,11 +78,9 @@ public UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTask
     @Transactional
     @Override
     public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorRequest request) {
-        Member reviewer = memberService.findActiveMember(userId);
+        Member reviewer = memberService.findReviewer(userId);
         Member processor = memberService.findById(request.processorId());
-        if (!reviewer.isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+
         Task task = taskService.findById(taskId);
         task.updateProcessor(processor);
         Task updateTask = commandTaskPort.save(task);
@@ -102,12 +92,9 @@ public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTa
     @Transactional
     @Override
     public UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest request) {
-        Member reviewer = memberService.findActiveMember(userId);
-        if (!reviewer.isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+        Member reviewer = memberService.findReviewer(userId);
         Task task = taskService.findById(taskId);
-        Label label = loadLabelPort.findById(request.labelId()).orElseThrow(() -> new ApplicationException(LabelErrorCode.LABEL_NOT_FOUND));
+        Label label = labelService.findById(request.labelId());
 
         task.updateLabel(label);
         Task updatetask = commandTaskPort.save(task);
@@ -125,7 +112,7 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
 
     private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDelete, Task task) {
         List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndCommentIsNullAndAttachmentId(task.getTaskId(), attachmentIdsToDelete);
-        if(attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
+        if (attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
             throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
         }
         return attachmentsOfTask;

src/main/java/clap/server/domain/model/member/Member.java

@@ -1,6 +1,5 @@
 package clap.server.domain.model.member;
 
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.domain.model.common.BaseTime;
 import lombok.*;

src/main/java/clap/server/domain/model/task/Task.java

@@ -3,6 +3,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.common.BaseTime;
 import clap.server.domain.model.member.Member;
+import clap.server.exception.ApplicationException;
 import clap.server.exception.DomainException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.AccessLevel;
@@ -45,8 +46,11 @@ public static Task createTask(Member member, Category category, String title, St
                 .build();
     }
 
-    public void updateTask(TaskStatus status, Category category, String title, String description) {
-        if (status != TaskStatus.REQUESTED) {
+    public void updateTask(Long requesterId, Category category, String title, String description) {
+        if(!Objects.equals(requesterId, this.requester.getMemberId() )) {
+            throw new ApplicationException(TaskErrorCode.NOT_A_REQUESTER);
+        }
+        if (this.taskStatus != TaskStatus.REQUESTED) {
             throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
         }
         this.category = category;

src/main/java/clap/server/exception/code/TaskErrorCode.java

@@ -12,9 +12,11 @@ public enum TaskErrorCode implements BaseErrorCode {
     TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다."),
     TASK_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_004", "첨부파일을 찾을 수 없습니다."),
     LABEL_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_005", "작업구분을 찾을 수 없습니다."),
-    NOT_A_PROCESSOR(HttpStatus.FORBIDDEN, "TASK_006", "작업 수정 권한이 없습니다."),
+    NOT_A_PROCESSOR(HttpStatus.FORBIDDEN, "TASK_006", "작업 처리 및 수정 권한이 없습니다."),
     INVALID_TASK_ORDER(HttpStatus.INTERNAL_SERVER_ERROR, "TASK_007", "유효하지 않은 task order입니다."),
     INVALID_TASK_STATUS_TRANSITION(HttpStatus.BAD_REQUEST, "TASK_008", "유효하지 않은 작업 상태 전환입니다."),
+    NOT_A_REVIEWER(HttpStatus.FORBIDDEN, "TASK_009", "작업 승인 및 수정 권한이 없습니다."),
+    NOT_A_REQUESTER(HttpStatus.FORBIDDEN, "TASK_009", "작업 수정 권한이 없습니다."),
     ;
 
     private final HttpStatus httpStatus;