CLAP-119 Fix: 요청 객체로 받을 시 mainCategory는 받지 않도록 제거

Author: parkjaehak

src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java

@@ -5,10 +5,6 @@
 import java.time.LocalDateTime;
 
 public record ApprovalTaskRequest(
-        @NotNull
-        Long taskId,
-        @NotNull
-        Long mainCategoryId,
         @NotNull
         Long categoryId,
         @NotNull

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

@@ -45,10 +45,11 @@ public ResponseEntity<UpdateTaskResponse> updateTask(
 
     @Operation(summary = "작업 승인")
     @Secured({"ROLE_MANAGER"})
-    @PostMapping("/approval")
+    @PostMapping("/approval/{taskId}")
     public ResponseEntity<ApprovalTaskResponse> approvalTask(
             @RequestBody @Valid ApprovalTaskRequest approvalTaskRequest,
+            @PathVariable Long taskId,
             @AuthenticationPrincipal SecurityUserDetails userInfo){
-        return ResponseEntity.ok(approvalTaskUsecase.approvalTaskByReviewer(userInfo.getUserId(), approvalTaskRequest));
+        return ResponseEntity.ok(approvalTaskUsecase.approvalTaskByReviewer(userInfo.getUserId(), taskId, approvalTaskRequest));
     }
 }

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

@@ -32,18 +32,17 @@ public class ApprovalTaskService implements ApprovalTaskUsecase {
 
     @Override
     @Transactional
-    public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, ApprovalTaskRequest approvalTaskRequest) {
+    public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId, ApprovalTaskRequest approvalTaskRequest) {
         Member reviewer = memberService.findActiveMember(reviewerId);
         if (!reviewer.isReviewer()) {
             throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
         }
-        Task task = taskService.findById(approvalTaskRequest.taskId());
+        Task task = taskService.findById(taskId);
         Member processor = memberService.findById(approvalTaskRequest.processorId());
-        Category mainCategory = categoryService.findById(approvalTaskRequest.mainCategoryId());
         Category category = categoryService.findById(approvalTaskRequest.categoryId());
         Label label = labelService.findById(approvalTaskRequest.labelId());
 
-        task.approveTask(reviewer, processor, approvalTaskRequest.dueDate(),mainCategory, category, label);
+        task.approveTask(reviewer, processor, approvalTaskRequest.dueDate(), category, label);
         return TaskMapper.toApprovalTaskResponse(commandTaskPort.save(task));
     }
 }

src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java

@@ -4,5 +4,5 @@
 import clap.server.adapter.inbound.web.dto.task.ApprovalTaskResponse;
 
 public interface ApprovalTaskUsecase {
-    ApprovalTaskResponse approvalTaskByReviewer(Long userId, ApprovalTaskRequest approvalTaskRequest);
+    ApprovalTaskResponse approvalTaskByReviewer(Long userId, Long taskId, ApprovalTaskRequest approvalTaskRequest);
 }

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

@@ -1,6 +1,5 @@
 package clap.server.domain.model.task;
 
-import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
 import clap.server.domain.model.common.BaseTime;
 import clap.server.domain.model.member.Member;

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

@@ -50,11 +50,10 @@ public void updateTask(Category category, String title, String description) {
         this.taskCode = toTaskCode(category);
     }
 
-    public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate, Category mainCategory, Category category, Label label) {
+    public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate, Category category, Label label) {
         this.reviewer = reviewer;
         this.processor = processor;
         this.dueDate = dueDate;
-        this.category.updateMainCategory(mainCategory);
         this.category = category;
         this.label = label;
         this.taskStatus = TaskStatus.IN_PROGRESS;