CLAP-119 Fix: rebase시 confict 해결

Author: parkjaehak

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

@@ -35,7 +35,6 @@ public class ManagementTaskController {
     @Operation(summary = "작업 요청 생성")
     @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
     @Secured({"ROLE_MANAGER, ROLE_USER"})
-    @PostMapping
     public ResponseEntity<CreateTaskResponse> createTask(
             @RequestPart(name = "taskInfo") @Valid CreateTaskRequest createTaskRequest,
             @RequestPart(name = "attachment") @NotNull  List<MultipartFile> attachments,
@@ -47,7 +46,6 @@ public ResponseEntity<CreateTaskResponse> createTask(
     @Operation(summary = "작업 수정")
     @PatchMapping(value = "/{taskId}", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
     @Secured({"ROLE_MANAGER, ROLE_USER"})
-    @PatchMapping
     public ResponseEntity<UpdateTaskResponse> updateTask(
             @PathVariable @NotNull Long taskId,
             @RequestPart(name = "taskInfo") @Valid UpdateTaskRequest updateTaskRequest,

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

@@ -3,7 +3,9 @@
 import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.CreateTaskResponse;
 
+import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
+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.MemberService;
@@ -26,6 +28,8 @@
 
 import java.util.List;
 
+import static clap.server.domain.model.notification.Notification.createTaskNotification;
+
 
 @ApplicationService
 @RequiredArgsConstructor

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

@@ -2,6 +2,8 @@
 
 import clap.server.adapter.inbound.web.dto.task.UpdateTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse;
+import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
@@ -47,7 +49,7 @@ public class UpdateTaskService implements UpdateTaskUsecase {
     public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRequest updateTaskRequest, List<MultipartFile> files) {
         memberService.findActiveMember(requesterId);
         Category category = categoryService.findById(updateTaskRequest.categoryId());
-        Task task = taskService.findById(updateTaskRequest.taskId());
+        Task task = taskService.findById(taskId);
         if(task.getTaskStatus() != TaskStatus.REQUESTED){
             throw new ApplicationException(TaskErrorCode.TASK_STATUS_MISMATCH);
         }