From 35991ab0b20c2967f96d0fc27a805eab5b38a9ab Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 00:05:10 +0900
Subject: [PATCH 1/9] =?UTF-8?q?CLAP-119=20Feat:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dto/task/ApprovalTaskRequest.java     | 22 ++++++++
 .../web/dto/task/ApprovalTaskResponse.java    | 14 +++++
 .../web/dto/task/FilterTaskListRequest.java   |  4 +-
 ...rderRequest.java => OrderTaskRequest.java} |  2 +-
 .../inbound/web/task/FindTaskController.java  |  2 +-
 .../web/task/ManagementTaskController.java    | 17 ++++--
 .../persistense/MemberPersistenceAdapter.java |  1 -
 .../repository/LabelPersistenceAdapter.java   | 26 +++++++++
 .../application/Task/ApprovalTaskService.java | 49 +++++++++++++++++
 .../application/Task/CreateTaskService.java   |  7 ++-
 .../application/Task/UpdateTaskService.java   |  9 ++--
 .../server/application/mapper/TaskMapper.java | 10 ++++
 .../port/inbound/domain/LabelService.java     | 20 +++++++
 .../inbound/task/ApprovalTaskUsecase.java     |  8 +++
 .../port/outbound/task/LoadLabelPort.java     | 10 ++++
 .../server/domain/model/member/Member.java    |  3 ++
 .../server/domain/model/task/Category.java    | 54 ++++++++++---------
 .../clap/server/domain/model/task/Task.java   | 13 ++++-
 .../exception/code/MemberErrorCode.java       |  1 +
 .../server/exception/code/TaskErrorCode.java  |  5 +-
 .../task/FindTaskListServiceTest.java         |  6 +--
 21 files changed, 236 insertions(+), 47 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
 rename src/main/java/clap/server/adapter/inbound/web/dto/task/{OrderRequest.java => OrderTaskRequest.java} (90%)
 create mode 100644 src/main/java/clap/server/adapter/outbound/persistense/repository/LabelPersistenceAdapter.java
 create mode 100644 src/main/java/clap/server/application/Task/ApprovalTaskService.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/domain/LabelService.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java
 create mode 100644 src/main/java/clap/server/application/port/outbound/task/LoadLabelPort.java
 rename src/test/java/clap/server/{ => application/service}/task/FindTaskListServiceTest.java (96%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java
new file mode 100644
index 00000000..123cde62
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java
@@ -0,0 +1,22 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+import jakarta.validation.constraints.NotNull;
+
+import java.time.LocalDateTime;
+
+public record ApprovalTaskRequest(
+        @NotNull
+        Long taskId,
+        @NotNull
+        Long mainCategoryId,
+        @NotNull
+        Long categoryId,
+        @NotNull
+        Long processorId,
+        @NotNull
+        LocalDateTime dueDate,
+        @NotNull
+        Long labelId
+
+) {
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
new file mode 100644
index 00000000..5b1f8b3c
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
@@ -0,0 +1,14 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
+
+import java.time.LocalDateTime;
+
+public record ApprovalTaskResponse(
+        Long taskId,
+        String processorName,
+        String reviewerName,
+        LocalDateTime deadLine,
+        LabelType labelName
+) {
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java
index 6b361be3..afedd25b 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java
@@ -32,8 +32,8 @@ public record FilterTaskListRequest(
         @NotNull
         List<TaskStatus> taskStatus,
 
-        @Schema(description = "정렬 기준", implementation = OrderRequest.class)
+        @Schema(description = "정렬 기준", implementation = OrderTaskRequest.class)
         @NotNull
-        OrderRequest orderRequest
+        OrderTaskRequest orderRequest
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/OrderRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/OrderTaskRequest.java
similarity index 90%
rename from src/main/java/clap/server/adapter/inbound/web/dto/task/OrderRequest.java
rename to src/main/java/clap/server/adapter/inbound/web/dto/task/OrderTaskRequest.java
index c756d06e..fd849bab 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/OrderRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/OrderTaskRequest.java
@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-public record OrderRequest(
+public record OrderTaskRequest(
         @Schema(description = "정렬 기준", example = "REQUESTED_AT")
         String sortBy,
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java
index f58dcdbb..e7618937 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java
@@ -27,7 +27,7 @@ public class FindTaskController {
     private final FindTaskListUsecase taskListUsecase;
 
     @Operation(summary = "사용자 요청 작업 목록 조회")
-    @Secured({"ROLE_USER"})
+    @Secured({"ROLE_USER", "ROLE_MANAGER"})
     @GetMapping("/requests")
     public ResponseEntity<Page<FilterTaskListResponse>> findTasksRequestedByUser(
             @RequestParam(defaultValue = "0") int page,
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
index 5e30f255..40781b8e 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
@@ -1,10 +1,8 @@
 package clap.server.adapter.inbound.web.task;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
-import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest;
-import clap.server.adapter.inbound.web.dto.task.CreateTaskResponse;
-import clap.server.adapter.inbound.web.dto.task.UpdateTaskRequest;
-import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.*;
+import clap.server.application.port.inbound.task.ApprovalTaskUsecase;
 import clap.server.application.port.inbound.task.CreateTaskUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
@@ -15,6 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -31,6 +30,7 @@ public class ManagementTaskController {
 
     private final CreateTaskUsecase createTaskUsecase;
     private final UpdateTaskUsecase updateTaskUsecase;
+    private final ApprovalTaskUsecase approvalTaskUsecase;
 
     @Operation(summary = "작업 요청 생성")
     @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
@@ -51,4 +51,13 @@ public ResponseEntity<UpdateTaskResponse> updateTask(
             @AuthenticationPrincipal SecurityUserDetails userInfo){
         return ResponseEntity.ok(updateTaskUsecase.updateTask(userInfo.getUserId(), taskId, updateTaskRequest, attachments));
     }
+
+    @Operation(summary = "작업 승인")
+    @Secured({"ROLE_MANAGER"})
+    @PostMapping("/approval")
+    public ResponseEntity<ApprovalTaskResponse> approvalTask(
+            @RequestBody @Valid ApprovalTaskRequest approvalTaskRequest,
+            @AuthenticationPrincipal SecurityUserDetails userInfo){
+        return ResponseEntity.ok(approvalTaskUsecase.approvalTaskByReviewer(userInfo.getUserId(), approvalTaskRequest));
+    }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index 6a142f5d..355879d4 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -85,6 +85,5 @@ public List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> t
                 .map(taskPersistenceMapper::toDomain)
                 .collect(Collectors.toList());
     }
-
 }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/LabelPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/LabelPersistenceAdapter.java
new file mode 100644
index 00000000..c64863fb
--- /dev/null
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/LabelPersistenceAdapter.java
@@ -0,0 +1,26 @@
+package clap.server.adapter.outbound.persistense.repository;
+
+import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
+import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
+import clap.server.adapter.outbound.persistense.mapper.LabelPersistenceMapper;
+import clap.server.adapter.outbound.persistense.repository.task.LabelRepository;
+import clap.server.application.port.outbound.task.LoadLabelPort;
+import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.domain.model.task.Label;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Optional;
+
+@PersistenceAdapter
+@RequiredArgsConstructor
+public class LabelPersistenceAdapter implements LoadLabelPort {
+
+    private final LabelRepository labelRepository;
+    private final LabelPersistenceMapper labelPersistenceMapper;
+
+    @Override
+    public Optional<Label> findById(Long id) {
+        Optional<LabelEntity> labelEntity = labelRepository.findById(id);
+        return labelEntity.map(labelPersistenceMapper::toDomain);
+    }
+}
diff --git a/src/main/java/clap/server/application/Task/ApprovalTaskService.java b/src/main/java/clap/server/application/Task/ApprovalTaskService.java
new file mode 100644
index 00000000..0e212746
--- /dev/null
+++ b/src/main/java/clap/server/application/Task/ApprovalTaskService.java
@@ -0,0 +1,49 @@
+package clap.server.application.Task;
+
+import clap.server.adapter.inbound.web.dto.task.ApprovalTaskRequest;
+import clap.server.adapter.inbound.web.dto.task.ApprovalTaskResponse;
+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.ApprovalTaskUsecase;
+import clap.server.application.port.outbound.task.CommandTaskPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.member.Member;
+import clap.server.domain.model.task.Category;
+import clap.server.domain.model.task.Label;
+import clap.server.domain.model.task.Task;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.MemberErrorCode;
+import clap.server.exception.code.TaskErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class ApprovalTaskService implements ApprovalTaskUsecase {
+
+    private final MemberService memberService;
+    private final TaskService taskService;
+    private final CategoryService categoryService;
+    private final LabelService labelService;
+    private final CommandTaskPort commandTaskPort;
+
+    @Override
+    @Transactional
+    public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, ApprovalTaskRequest approvalTaskRequest) {
+        Member reviewer = memberService.findActiveMember(reviewerId);
+        if (!reviewer.isReviewer()) {
+            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
+        }
+        Task task = taskService.findById(approvalTaskRequest.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);
+        return TaskMapper.toApprovalTaskResponse(commandTaskPort.save(task));
+    }
+}
diff --git a/src/main/java/clap/server/application/Task/CreateTaskService.java b/src/main/java/clap/server/application/Task/CreateTaskService.java
index 1ebedf16..44f19d5a 100644
--- a/src/main/java/clap/server/application/Task/CreateTaskService.java
+++ b/src/main/java/clap/server/application/Task/CreateTaskService.java
@@ -2,15 +2,15 @@
 
 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;
 import clap.server.application.port.inbound.task.CreateTaskUsecase;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandTaskPort;
+
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.notification.Notification;
@@ -19,14 +19,13 @@
 import clap.server.domain.model.task.FilePath;
 import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
+
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-import static clap.server.domain.model.notification.Notification.createTaskNotification;
-
 
 @ApplicationService
 @RequiredArgsConstructor
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 4bafb347..14e5fde2 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -2,7 +2,6 @@
 
 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.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
@@ -13,10 +12,12 @@
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
 import clap.server.domain.model.task.FilePath;
 import clap.server.domain.model.task.Task;
+
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -46,8 +47,10 @@ 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(taskId);
-        //TODO: 작업이 요청 상태인 경우만 업데이트 가능
+        Task task = taskService.findById(updateTaskRequest.taskId());
+        if(task.getTaskStatus() != TaskStatus.REQUESTED){
+            throw new ApplicationException(TaskErrorCode.TASK_STATUS_MISMATCH);
+        }
         task.updateTask(category, updateTaskRequest.title(), updateTaskRequest.description());
         Task updatedTask = commandTaskPort.save(task);
 
diff --git a/src/main/java/clap/server/application/mapper/TaskMapper.java b/src/main/java/clap/server/application/mapper/TaskMapper.java
index b491aaf5..b8abae07 100644
--- a/src/main/java/clap/server/application/mapper/TaskMapper.java
+++ b/src/main/java/clap/server/application/mapper/TaskMapper.java
@@ -76,4 +76,14 @@ public static FindTaskDetailsResponse toFindTaskDetailResponse(Task task, List<A
                 attachmentResponses
         );
     }
+
+    public static ApprovalTaskResponse toApprovalTaskResponse(Task approvedTask) {
+        return new ApprovalTaskResponse(
+                approvedTask.getTaskId(),
+                approvedTask.getProcessor().getNickname(),
+                approvedTask.getReviewer().getNickname(),
+                approvedTask.getDueDate(),
+                approvedTask.getLabel().getLabelType()
+        );
+    }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/domain/LabelService.java b/src/main/java/clap/server/application/port/inbound/domain/LabelService.java
new file mode 100644
index 00000000..2f79f87d
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/domain/LabelService.java
@@ -0,0 +1,20 @@
+package clap.server.application.port.inbound.domain;
+
+import clap.server.application.port.outbound.task.LoadLabelPort;
+import clap.server.domain.model.task.Label;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.TaskErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class LabelService {
+
+    private final LoadLabelPort loadLabelPort;
+
+    public Label findById(Long labelId) {
+        return loadLabelPort.findById(labelId).orElseThrow(
+                ()-> new ApplicationException(TaskErrorCode.LABEL_NOT_FOUND));
+    }
+}
diff --git a/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java
new file mode 100644
index 00000000..e636fbef
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java
@@ -0,0 +1,8 @@
+package clap.server.application.port.inbound.task;
+
+import clap.server.adapter.inbound.web.dto.task.ApprovalTaskRequest;
+import clap.server.adapter.inbound.web.dto.task.ApprovalTaskResponse;
+
+public interface ApprovalTaskUsecase {
+    ApprovalTaskResponse approvalTaskByReviewer(Long userId, ApprovalTaskRequest approvalTaskRequest);
+}
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadLabelPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadLabelPort.java
new file mode 100644
index 00000000..7edea35b
--- /dev/null
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadLabelPort.java
@@ -0,0 +1,10 @@
+package clap.server.application.port.outbound.task;
+
+import clap.server.domain.model.task.Label;
+
+import java.util.Optional;
+
+public interface LoadLabelPort {
+
+    Optional<Label> findById(Long id);
+}
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
index a40773eb..09f60afa 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -49,4 +49,7 @@ public String getNickname() {
         return memberInfo != null ? memberInfo.getNickname() : null;
     }
 
+    public boolean isReviewer() {
+        return this.memberInfo != null && this.memberInfo.isReviewer();
+    }
 }
diff --git a/src/main/java/clap/server/domain/model/task/Category.java b/src/main/java/clap/server/domain/model/task/Category.java
index 6cc479de..bd624b17 100644
--- a/src/main/java/clap/server/domain/model/task/Category.java
+++ b/src/main/java/clap/server/domain/model/task/Category.java
@@ -13,31 +13,35 @@
 @SuperBuilder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Category extends BaseTime {
-   private Long categoryId;
-   private Member admin;
-   private Category mainCategory;
-   private String code; 
-   private String name; 
-   private boolean isDeleted;
-   private String descriptionExample;
-   private LocalDateTime createdAt; 
-   private LocalDateTime updatedAt;
+    private Long categoryId;
+    private Member admin;
+    private Category mainCategory;
+    private String code;
+    private String name;
+    private boolean isDeleted;
+    private String descriptionExample;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
 
-   public static Category createMainCategory(Member admin, String code, String name) {
-      return Category.builder()
-              .admin(admin)
-              .code(code)
-              .name(name)
-              .build();
-   }
+    public static Category createMainCategory(Member admin, String code, String name) {
+        return Category.builder()
+                .admin(admin)
+                .code(code)
+                .name(name)
+                .build();
+    }
 
-   public static Category createSubCategory(Member admin, Category mainCategory, String code, String name) {
-      return Category.builder()
-              .mainCategory(mainCategory)
-              .admin(admin)
-              .code(code)
-              .name(name)
-              .build();
-   }
- }
+    public static Category createSubCategory(Member admin, Category mainCategory, String code, String name) {
+        return Category.builder()
+                .mainCategory(mainCategory)
+                .admin(admin)
+                .code(code)
+                .name(name)
+                .build();
+    }
+
+    public void updateMainCategory(Category mainCategory){
+        this.mainCategory = mainCategory;
+    }
+}
 
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index d6be02bc..fcfaed57 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -3,6 +3,8 @@
 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.code.MemberErrorCode;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -41,13 +43,22 @@ public static Task createTask(Member member, Category category, String title, St
                 .build();
     }
 
-    public  void updateTask(Category category, String title, String description) {
+    public void updateTask(Category category, String title, String description) {
         this.category = category;
         this.title = title;
         this.description = description;
         this.taskCode = toTaskCode(category);
     }
 
+    public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate, Category mainCategory, Category category, Label label) {
+        this.reviewer = reviewer;
+        this.processor = processor;
+        this.dueDate = dueDate;
+        this.category.updateMainCategory(mainCategory);
+        this.category = category;
+        this.label = label;
+    }
+
     private static String toTaskCode(Category category){
         return category.getMainCategory().getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
     }
diff --git a/src/main/java/clap/server/exception/code/MemberErrorCode.java b/src/main/java/clap/server/exception/code/MemberErrorCode.java
index d09423b8..477c5f27 100644
--- a/src/main/java/clap/server/exception/code/MemberErrorCode.java
+++ b/src/main/java/clap/server/exception/code/MemberErrorCode.java
@@ -9,6 +9,7 @@
 public enum MemberErrorCode implements BaseErrorCode {
     MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER_001", "회원을 찾을 수 없습니다."),
     ACTIVE_MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER_002", "활성화 회원을 찾을 수 없습니다."),
+    NOT_A_REVIEWER(HttpStatus.FORBIDDEN, "MEMBER_003", "리뷰어 권한이 없습니다.")
     ;
 
     private final HttpStatus httpStatus;
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index 4f6c8c64..6d6ff5c7 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -10,8 +10,9 @@ public enum TaskErrorCode implements BaseErrorCode {
     TASK_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_001", "작업을 찾을 수 없습니다."),
     CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_002", "카테고리를 찾을 수 없습니다."),
     TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다."),
-    TASK_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_004", "첨부파일을 찾을 수 없습니다.");
-
+    TASK_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_004", "첨부파일을 찾을 수 없습니다."),
+    LABEL_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_005", "작업구분을 찾을 수 없습니다.")
+    ;
 
     private final HttpStatus httpStatus;
     private final String customCode;
diff --git a/src/test/java/clap/server/task/FindTaskListServiceTest.java b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java
similarity index 96%
rename from src/test/java/clap/server/task/FindTaskListServiceTest.java
rename to src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java
index 695cf439..f533b230 100644
--- a/src/test/java/clap/server/task/FindTaskListServiceTest.java
+++ b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java
@@ -1,8 +1,8 @@
-package clap.server.task;
+package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
-import clap.server.adapter.inbound.web.dto.task.OrderRequest;
+import clap.server.adapter.inbound.web.dto.task.OrderTaskRequest;
 
 import clap.server.application.Task.FindTaskListService;
 import clap.server.application.port.inbound.domain.MemberService;
@@ -42,7 +42,7 @@ class FindTaskListServiceTest {
     void setUp() {
         pageable = PageRequest.of(0, 20);
         filterTaskListRequest = new FilterTaskListRequest(
-                null, List.of(2L), List.of(1L), "작업 제목", "", List.of(), new OrderRequest("REQUESTED_AT", "DESC")
+                null, List.of(2L), List.of(1L), "작업 제목", "", List.of(), new OrderTaskRequest("REQUESTED_AT", "DESC")
         );
 
         FilterPendingApprovalResponse response = new FilterPendingApprovalResponse(

From a459914c141328db23c0f3feccec2e252526fae2 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 11:02:52 +0900
Subject: [PATCH 2/9] =?UTF-8?q?CLAP-119=20Fix:=20approveTask=EC=8B=9C=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=20=EC=A7=84=ED=96=89=EC=A4=91=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/clap/server/domain/model/task/Task.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index fcfaed57..2edbc990 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -57,6 +57,7 @@ public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate
         this.category.updateMainCategory(mainCategory);
         this.category = category;
         this.label = label;
+        this.taskStatus = TaskStatus.IN_PROGRESS;
     }
 
     private static String toTaskCode(Category category){

From e86172cab8d5e18b4dd0f159ae4bc1ef67a0bb1d Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 11:04:01 +0900
Subject: [PATCH 3/9] =?UTF-8?q?CLAP-119=20Add:=20ApprovalTaskResponse=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=9E=91=EC=97=85=20=EC=83=81=ED=83=9C=20=EB=B0=98?=
 =?UTF-8?q?=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/inbound/web/dto/task/ApprovalTaskResponse.java    | 4 +++-
 src/main/java/clap/server/application/mapper/TaskMapper.java  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
index 5b1f8b3c..f4b128c1 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
@@ -1,6 +1,7 @@
 package clap.server.adapter.inbound.web.dto.task;
 
 import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
 import java.time.LocalDateTime;
 
@@ -9,6 +10,7 @@ public record ApprovalTaskResponse(
         String processorName,
         String reviewerName,
         LocalDateTime deadLine,
-        LabelType labelName
+        LabelType labelName,
+        TaskStatus taskStatus
 ) {
 }
diff --git a/src/main/java/clap/server/application/mapper/TaskMapper.java b/src/main/java/clap/server/application/mapper/TaskMapper.java
index b8abae07..32429a0c 100644
--- a/src/main/java/clap/server/application/mapper/TaskMapper.java
+++ b/src/main/java/clap/server/application/mapper/TaskMapper.java
@@ -83,7 +83,8 @@ public static ApprovalTaskResponse toApprovalTaskResponse(Task approvedTask) {
                 approvedTask.getProcessor().getNickname(),
                 approvedTask.getReviewer().getNickname(),
                 approvedTask.getDueDate(),
-                approvedTask.getLabel().getLabelType()
+                approvedTask.getLabel().getLabelType(),
+                approvedTask.getTaskStatus()
         );
     }
 }

From d5b157b97cd2762c27415146904e9ec59ceacf65 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 14:01:36 +0900
Subject: [PATCH 4/9] =?UTF-8?q?CLAP-119=20Fix:=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EA=B0=9D=EC=B2=B4=EB=A1=9C=20=EB=B0=9B=EC=9D=84=20=EC=8B=9C=20?=
 =?UTF-8?q?mainCategory=EB=8A=94=20=EB=B0=9B=EC=A7=80=20=EC=95=8A=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/inbound/web/dto/task/ApprovalTaskRequest.java  | 4 ----
 .../adapter/inbound/web/task/ManagementTaskController.java | 5 +++--
 .../clap/server/application/Task/ApprovalTaskService.java  | 7 +++----
 .../application/port/inbound/task/ApprovalTaskUsecase.java | 2 +-
 src/main/java/clap/server/domain/model/task/Label.java     | 1 -
 src/main/java/clap/server/domain/model/task/Task.java      | 3 +--
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java
index 123cde62..9e84f3ce 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java
+++ b/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
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
index 40781b8e..e9771eb9 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
@@ -54,10 +54,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));
     }
 }
diff --git a/src/main/java/clap/server/application/Task/ApprovalTaskService.java b/src/main/java/clap/server/application/Task/ApprovalTaskService.java
index 0e212746..848e7714 100644
--- a/src/main/java/clap/server/application/Task/ApprovalTaskService.java
+++ b/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));
     }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java
index e636fbef..550826c9 100644
--- a/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java
+++ b/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);
 }
diff --git a/src/main/java/clap/server/domain/model/task/Label.java b/src/main/java/clap/server/domain/model/task/Label.java
index a701640c..ab52849b 100644
--- a/src/main/java/clap/server/domain/model/task/Label.java
+++ b/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;
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 2edbc990..1142fba0 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/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;

From 303b1d2b0eefaa94a46ee7e0399e44234af7ec1d Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 14:10:51 +0900
Subject: [PATCH 5/9] =?UTF-8?q?CLAP-119=20Fix:=20LabelEntity=20Enum=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/inbound/web/dto/task/ApprovalTaskResponse.java     | 2 +-
 .../adapter/outbound/persistense/entity/task/LabelEntity.java  | 3 +--
 src/main/java/clap/server/application/mapper/TaskMapper.java   | 2 +-
 src/main/java/clap/server/domain/model/task/Label.java         | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
index f4b128c1..e0836e5a 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
@@ -10,7 +10,7 @@ public record ApprovalTaskResponse(
         String processorName,
         String reviewerName,
         LocalDateTime deadLine,
-        LabelType labelName,
+        String labelName,
         TaskStatus taskStatus
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java
index ead2c5ab..2787c76d 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java
@@ -25,8 +25,7 @@ public class LabelEntity extends BaseTimeEntity {
     private MemberEntity admin;
 
     @Column(nullable = false)
-    @Enumerated(EnumType.STRING)
-    private LabelType labelType;
+    private String labelName;
 
     @Column(nullable = false)
     private boolean isDeleted;
diff --git a/src/main/java/clap/server/application/mapper/TaskMapper.java b/src/main/java/clap/server/application/mapper/TaskMapper.java
index 32429a0c..542df775 100644
--- a/src/main/java/clap/server/application/mapper/TaskMapper.java
+++ b/src/main/java/clap/server/application/mapper/TaskMapper.java
@@ -83,7 +83,7 @@ public static ApprovalTaskResponse toApprovalTaskResponse(Task approvedTask) {
                 approvedTask.getProcessor().getNickname(),
                 approvedTask.getReviewer().getNickname(),
                 approvedTask.getDueDate(),
-                approvedTask.getLabel().getLabelType(),
+                approvedTask.getLabel().getLabelName(),
                 approvedTask.getTaskStatus()
         );
     }
diff --git a/src/main/java/clap/server/domain/model/task/Label.java b/src/main/java/clap/server/domain/model/task/Label.java
index ab52849b..c4088e69 100644
--- a/src/main/java/clap/server/domain/model/task/Label.java
+++ b/src/main/java/clap/server/domain/model/task/Label.java
@@ -14,6 +14,6 @@
 public class Label extends BaseTime {
     private Long labelId;
     private Member admin;
-    private LabelType labelType;
+    private String labelName;
     private boolean isDeleted;
 }

From f54e6f8b6a360476e12822fe8058d313b5dc9fda Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 14:22:57 +0900
Subject: [PATCH 6/9] =?UTF-8?q?CLAP-119=20Add:=20LabelColor=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inbound/web/dto/task/ApprovalTaskResponse.java  |  1 -
 .../persistense/entity/task/LabelEntity.java        |  6 +++++-
 .../constant/{LabelType.java => LabelColor.java}    | 13 ++++++++-----
 .../java/clap/server/domain/model/task/Label.java   |  3 ++-
 .../inbound/web/admin/MemberControllerTest.java     |  2 --
 5 files changed, 15 insertions(+), 10 deletions(-)
 rename src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/{LabelType.java => LabelColor.java} (54%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
index e0836e5a..ebc46883 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java
@@ -1,6 +1,5 @@
 package clap.server.adapter.inbound.web.dto.task;
 
-import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
 import java.time.LocalDateTime;
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java
index 2787c76d..ef8f6ad7 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java
@@ -2,7 +2,7 @@
 
 import clap.server.adapter.outbound.persistense.entity.common.BaseTimeEntity;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
-import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -27,6 +27,10 @@ public class LabelEntity extends BaseTimeEntity {
     @Column(nullable = false)
     private String labelName;
 
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private LabelColor labelColor;
+
     @Column(nullable = false)
     private boolean isDeleted;
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelType.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelColor.java
similarity index 54%
rename from src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelType.java
rename to src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelColor.java
index 0706e8f5..79ccb338 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelType.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelColor.java
@@ -5,11 +5,14 @@
 
 @Getter
 @RequiredArgsConstructor
-public enum LabelType {
-    EMERGENCY("긴급"),
-    NORMAL("일반"),
-    REGULAR("정기");
+public enum LabelColor {
+    RED("빨강"),
+    ORANGE("주황"),
+    YELLOW("노랑"),
+    GREEN("초록"),
+    BLUE("파랑"),
+    PURPLE("보라"),
+    GREY("회색");
 
     private final String description;
 }
-
diff --git a/src/main/java/clap/server/domain/model/task/Label.java b/src/main/java/clap/server/domain/model/task/Label.java
index c4088e69..bcbcc9b7 100644
--- a/src/main/java/clap/server/domain/model/task/Label.java
+++ b/src/main/java/clap/server/domain/model/task/Label.java
@@ -1,6 +1,6 @@
 package clap.server.domain.model.task;
 
-import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
 import clap.server.domain.model.common.BaseTime;
 import clap.server.domain.model.member.Member;
 import lombok.AccessLevel;
@@ -15,5 +15,6 @@ public class Label extends BaseTime {
     private Long labelId;
     private Member admin;
     private String labelName;
+    private LabelColor labelColor;
     private boolean isDeleted;
 }
diff --git a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
index 67804658..f0f6f67d 100644
--- a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
+++ b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
@@ -8,7 +8,6 @@
 import clap.server.adapter.outbound.persistense.entity.task.CategoryEntity;
 import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
-import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.config.elastic.ElasticsearchConfig;
 import jakarta.persistence.EntityManager;
@@ -100,7 +99,6 @@ public void setupTestData() {
 
         // 라벨 추가
         LabelEntity label = LabelEntity.builder()
-                .labelType(LabelType.EMERGENCY)
                 .admin(admin)
                 .isDeleted(false)
                 .build();

From e9d2fced617772d28588bfdf94d6f7b7c06e15c7 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 14:39:25 +0900
Subject: [PATCH 7/9] =?UTF-8?q?CLAP-119=20Fix:=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=8B=9C=20LabelEntity=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=ED=99=94=20=EA=B0=92=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/adapter/inbound/web/admin/MemberControllerTest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
index f0f6f67d..c4cec9c6 100644
--- a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
+++ b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
@@ -8,6 +8,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.CategoryEntity;
 import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.config.elastic.ElasticsearchConfig;
 import jakarta.persistence.EntityManager;
@@ -100,6 +101,8 @@ public void setupTestData() {
         // 라벨 추가
         LabelEntity label = LabelEntity.builder()
                 .admin(admin)
+                .labelName("일반")
+                .labelColor(LabelColor.GREY)
                 .isDeleted(false)
                 .build();
         entityManager.persist(label);

From 58a5885f7b047e2ec09d88981628aa44d4c8b166 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 15:23:55 +0900
Subject: [PATCH 8/9] =?UTF-8?q?CLAP-119=20Fix:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=88=98=EC=A0=95=20API?=
 =?UTF-8?q?=EC=A0=91=EA=B7=BC=20=EA=B6=8C=ED=95=9C=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/inbound/web/task/ManagementTaskController.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
index e9771eb9..3119334c 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
@@ -34,6 +34,8 @@ 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,
@@ -44,6 +46,8 @@ 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,

From 56cbd5956be11fd84ffa7bf3ccb662dc7c179c0b Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 26 Jan 2025 16:19:38 +0900
Subject: [PATCH 9/9] =?UTF-8?q?CLAP-119=20Fix:=20rebase=EC=8B=9C=20confict?=
 =?UTF-8?q?=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/inbound/web/task/ManagementTaskController.java    | 2 --
 .../java/clap/server/application/Task/CreateTaskService.java  | 4 ++++
 .../java/clap/server/application/Task/UpdateTaskService.java  | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
index 3119334c..3b20d9ee 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
+++ b/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,
diff --git a/src/main/java/clap/server/application/Task/CreateTaskService.java b/src/main/java/clap/server/application/Task/CreateTaskService.java
index 44f19d5a..e529fc4e 100644
--- a/src/main/java/clap/server/application/Task/CreateTaskService.java
+++ b/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
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 14e5fde2..e25938ac 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/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);
         }