From 7580ec7374370b8fea578e61384297a7dc22a204 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:17:56 +0900
Subject: [PATCH 01/14] =?UTF-8?q?CLAP-211=20Feat:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20use?=
 =?UTF-8?q?case=20=EC=84=B8=EB=B6=84=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../adapter/inbound/web/task/TaskBoardController.java     | 4 +++-
 .../port/inbound/task/UpdateTaskBoardUsecase.java         | 2 --
 .../inbound/task/UpdateTaskOrderAndStatusUsecase.java     | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/clap/server/application/port/inbound/task/UpdateTaskOrderAndStatusUsecase.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
index b45e9264..404d5c4c 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
@@ -8,6 +8,7 @@
 import clap.server.application.port.inbound.task.FilterTaskBoardUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
 import clap.server.application.port.inbound.task.GetTaskBoardUsecase;
+import clap.server.application.port.inbound.task.UpdateTaskOrderAndStatusUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -35,6 +36,7 @@ public class TaskBoardController {
     private final GetTaskBoardUsecase getTaskBoardUsecase;
     private final FilterTaskBoardUsecase filterTaskBoardUsecase;
     private final UpdateTaskBoardUsecase updateTaskBoardUsecase;
+    private final UpdateTaskOrderAndStatusUsecase updateTaskOrderAndStatus;
 
     @Operation(summary = "작업 보드 조회 API")
     @Secured({"ROLE_MANAGER"})
@@ -62,7 +64,7 @@ public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태
         if (status == null) {
             updateTaskBoardUsecase.updateTaskOrder(userInfo.getUserId(), request);
         } else {
-            updateTaskBoardUsecase.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
+            updateTaskOrderAndStatus.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
         }
     }
 
diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
index 3a7ebf9a..467f6d0b 100644
--- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
@@ -1,9 +1,7 @@
 package clap.server.application.port.inbound.task;
 
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
-import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
 public interface UpdateTaskBoardUsecase {
     void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request);
-    void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus status);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskOrderAndStatusUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskOrderAndStatusUsecase.java
new file mode 100644
index 00000000..a5a8c132
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskOrderAndStatusUsecase.java
@@ -0,0 +1,8 @@
+package clap.server.application.port.inbound.task;
+
+import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+
+public interface UpdateTaskOrderAndStatusUsecase {
+    void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus status);
+}

From 839602d672e880f823ffa153fb05eccc1e430f60 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:19:35 +0900
Subject: [PATCH 02/14] =?UTF-8?q?CLAP-211=20Feat:=20=EB=B9=84=EC=A6=88?=
 =?UTF-8?q?=EB=8B=88=EC=8A=A4=20=EC=A0=95=EC=B1=85=EC=9D=84=20=EB=AA=85?=
 =?UTF-8?q?=EC=8B=9C=ED=95=98=EB=8A=94=20Policy=20=EC=95=A0=EB=84=88?=
 =?UTF-8?q?=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../common/annotation/architecture/Policy.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/main/java/clap/server/common/annotation/architecture/Policy.java

diff --git a/src/main/java/clap/server/common/annotation/architecture/Policy.java b/src/main/java/clap/server/common/annotation/architecture/Policy.java
new file mode 100644
index 00000000..28ddfa87
--- /dev/null
+++ b/src/main/java/clap/server/common/annotation/architecture/Policy.java
@@ -0,0 +1,15 @@
+package clap.server.common.annotation.architecture;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Component
+public @interface Policy {
+    @AliasFor(annotation = Component.class)
+    String value() default "";
+}
\ No newline at end of file

From 840f2fc46a64e505bc1778e6bb2e6886134f1786 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:37:45 +0900
Subject: [PATCH 03/14] =?UTF-8?q?CLAP-211=20Feat:=20Task=20=EB=8F=84?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=ED=81=B4=EB=9E=98=EC=8A=A4=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EB=B9=84=EC=A6=88=EB=8B=88=EC=8A=A4=20=EC=A0=95?=
 =?UTF-8?q?=EC=B1=85=EC=9D=84=20=EC=BA=A1=EC=8A=90=ED=99=94=ED=95=98?=
 =?UTF-8?q?=EC=97=AC=20policy=20=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../clap/server/domain/model/task/Task.java   | 27 +----------
 .../policy/TaskOrderCalculationPolicy.java    | 45 +++++++++++++++++++
 .../task/policy/TaskOrderRequestPolicy.java   | 18 ++++++++
 3 files changed, 64 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java
 create mode 100644 src/main/java/clap/server/domain/model/task/policy/TaskOrderRequestPolicy.java

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 fd076ac7..0c0acd28 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -98,32 +98,7 @@ private static String toTaskCode(Category category) {
         return category.getMainCategory().getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
     }
 
-    public void updateProcessorOrder(Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
-        if (!Objects.equals(processorId, this.processor.getMemberId())) {
-            throw new DomainException(TaskErrorCode.NOT_A_PROCESSOR);
-        }
-        long newProcessorOrder;
-
-        // 최상위 이동: 가장 작은 processorOrder보다 더 작은 값 설정
-        if (prevTaskOrder == null && nextTaskOrder != null) {
-            newProcessorOrder = nextTaskOrder - DEFAULT_PROCESSOR_ORDER_GAP;
-        }
-        // 최하위 이동: 가장 큰 processorOrder보다 더 큰 값 설정
-        else if (prevTaskOrder != null && nextTaskOrder == null) {
-            newProcessorOrder = prevTaskOrder + DEFAULT_PROCESSOR_ORDER_GAP;
-        }
-        // 중간 위치로 이동: prevTask와 nextTask의 processorOrder 평균값 사용
-        else if (prevTaskOrder != null && nextTaskOrder != null) {
-            if (nextTaskOrder - prevTaskOrder < 2) {
-                throw new DomainException(TaskErrorCode.INVALID_TASK_ORDER);
-            }
-            newProcessorOrder = (prevTaskOrder + nextTaskOrder) / 2;
-        }
-        // 기본값 (예외적인 상황 방지)
-        else {
-            newProcessorOrder = DEFAULT_PROCESSOR_ORDER_GAP;
-        }
+    public void updateProcessorOrder(long newProcessorOrder) {
         this.processorOrder = newProcessorOrder;
     }
-
 }
diff --git a/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java b/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java
new file mode 100644
index 00000000..f55d11e6
--- /dev/null
+++ b/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java
@@ -0,0 +1,45 @@
+package clap.server.domain.model.task.policy;
+
+import clap.server.common.annotation.architecture.Policy;
+import clap.server.domain.model.task.Task;
+import clap.server.exception.DomainException;
+import clap.server.exception.code.TaskErrorCode;
+import lombok.RequiredArgsConstructor;
+
+import static clap.server.domain.model.task.constants.TaskProcessorOrderPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+
+@RequiredArgsConstructor
+@Policy
+public class TaskOrderCalculationPolicy {
+
+    public long calculateOrderForTop(Task prevTask, Task nextTask) {
+        Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
+        if (prevTaskOrder == null){
+            return nextTask.getProcessorOrder() - DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+        return calculateNewProcessorOrder(prevTaskOrder, nextTask.getProcessorOrder());
+    }
+
+    public long calculateOrderForBottom(Task prevTask, Task nextTask) {
+        Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
+        if (nextTaskOrder == null){
+            return prevTask.getProcessorOrder() + DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+        return calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTaskOrder);
+    }
+
+    public long calculateNewProcessorOrder(Long prevTaskOrder, Long nextTaskOrder) {
+        if (prevTaskOrder != null && nextTaskOrder != null) {
+            if (nextTaskOrder - prevTaskOrder < 2) {
+                throw new DomainException(TaskErrorCode.INVALID_TASK_ORDER);
+            }
+            return (prevTaskOrder + nextTaskOrder) / 2;
+        }
+        // 기본값 (예외적인 상황 방지)
+        else {
+            return DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+    }
+
+}
+
diff --git a/src/main/java/clap/server/domain/model/task/policy/TaskOrderRequestPolicy.java b/src/main/java/clap/server/domain/model/task/policy/TaskOrderRequestPolicy.java
new file mode 100644
index 00000000..b5a6df0a
--- /dev/null
+++ b/src/main/java/clap/server/domain/model/task/policy/TaskOrderRequestPolicy.java
@@ -0,0 +1,18 @@
+package clap.server.domain.model.task.policy;
+
+import clap.server.common.annotation.architecture.Policy;
+import clap.server.domain.model.task.Task;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.TaskErrorCode;
+
+import java.util.Objects;
+
+@Policy
+public class TaskOrderRequestPolicy {
+
+    public void validateProcessor(Long processorId, Task targetTask) {
+        if (!Objects.equals(processorId, targetTask.getProcessor().getMemberId())) {
+            throw new ApplicationException(TaskErrorCode.NOT_A_PROCESSOR);
+        }
+    }
+}

From 703149310e6a0e2c78ca3c33170e7e00659920ca Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:38:11 +0900
Subject: [PATCH 04/14] =?UTF-8?q?CLAP-211=20Feat:=20=EB=B9=84=EC=A6=88?=
 =?UTF-8?q?=EB=8B=88=EC=8A=A4=20=EC=A0=95=EC=B1=85=EC=9D=84=20=EB=8B=B4?=
 =?UTF-8?q?=EC=9D=80=20policy=20=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A5=BC=20?=
 =?UTF-8?q?=EC=A3=BC=EC=9E=85=EB=B0=9B=EC=95=84=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../service/task/UpdateTaskBoardService.java  | 143 ++++++------------
 1 file changed, 50 insertions(+), 93 deletions(-)

diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
index 25a45a6e..efb1f5da 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -5,8 +5,11 @@
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
+import clap.server.application.port.inbound.task.UpdateTaskOrderAndStatusUsecase;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
+import clap.server.domain.model.task.policy.TaskOrderCalculationPolicy;
+import clap.server.domain.model.task.policy.TaskOrderRequestPolicy;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;
@@ -19,21 +22,23 @@
 @Slf4j
 @ApplicationService
 @RequiredArgsConstructor
-class UpdateTaskBoardService implements UpdateTaskBoardUsecase {
+class UpdateTaskBoardService implements UpdateTaskBoardUsecase, UpdateTaskOrderAndStatusUsecase {
     private final MemberService memberService;
     private final TaskService taskService;
     private final LoadTaskPort loadTaskPort;
     private final CommandTaskPort commandTaskPort;
+    private final TaskOrderCalculationPolicy taskOrderCalculationPolicy;
+    private final TaskOrderRequestPolicy taskOrderRequestPolicy;
 
     private Task findByIdAndStatus(Long taskId, TaskStatus status) {
-        return loadTaskPort.findByIdAndStatus(taskId, status).orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
+        return loadTaskPort.findByIdAndStatus(taskId, status).orElseThrow(() -> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
     }
 
     /**
      * 작업(Task)의 순서를 업데이트하는 메서드
      *
      * @param processorId 작업을 수행하는 멤버 ID
-     * @param request 순서 변경 요청 객체
+     * @param request     순서 변경 요청 객체
      */
     @Override
     @Transactional
@@ -42,148 +47,100 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
         validateRequest(request, null);
         Member processor = memberService.findActiveMember(processorId);
         Task targetTask = taskService.findById(request.targetTaskId());
+        taskOrderRequestPolicy.validateProcessor(processorId, targetTask);
 
         // 가장 상위로 이동
         if (request.prevTaskId() == 0) {
-            moveToTop(processorId, targetTask, request.nextTaskId());
+            Task nextTask = findByIdAndStatus(request.targetTaskId(), targetTask.getTaskStatus());
+            // 해당 상태에서 바로 앞에 있는 작업 찾기
+            Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
+            long newOrder = taskOrderCalculationPolicy.calculateOrderForTop(targetTask, nextTask);
+            updateNewTaskOrder(targetTask, newOrder);
         }
         // 가장 하위로 이동
         else if (request.nextTaskId() == 0) {
-            moveToBottom(processorId, targetTask, request.prevTaskId());
+            Task prevTask = findByIdAndStatus(request.targetTaskId(), targetTask.getTaskStatus());
+            // 해당 상태에서 바로 뒤에 있는 작업 찾기
+            Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
+            long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, nextTask);
+            updateNewTaskOrder(targetTask, newOrder);
         } else {
             Task prevTask = findByIdAndStatus(request.prevTaskId(), targetTask.getTaskStatus());
             Task nextTask = findByIdAndStatus(request.nextTaskId(), targetTask.getTaskStatus());
-
-            // 새로운 작업 순서 업데이트
-            updateNewTaskOrder(processor.getMemberId(), targetTask, prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
+            long newOrder = taskOrderCalculationPolicy.calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
+            updateNewTaskOrder(targetTask, newOrder);
         }
     }
 
-    /**
-     * 순서 변경 요청의 유효성을 검증하는 메서드
-     */
-    private static void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetStatus) {
-        // 이전 및 다음 작업 ID가 모두 0인 경우 예외 발생
-        if (request.prevTaskId() == 0 && request.nextTaskId() == 0) {
-            throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
-        }
-
-        // 타겟 상태가 유효한지 검증
-        if (targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)) {
-            throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
-        }
-    }
 
     /**
      * 새로운 processorOrder를 계산하고 저장하는 메서드
      *
-     * @param processorId 작업을 수행하는 멤버 ID
      * @param targetTask 순서를 변경할 대상 작업
-     * @param prevTaskOrder 이전 작업의 processorOrder 값
-     * @param nextTaskOrder 다음 작업의 processorOrder 값
      */
-    private void updateNewTaskOrder(Long processorId, Task targetTask, Long prevTaskOrder, Long nextTaskOrder) {
-        targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
+    private void updateNewTaskOrder(Task targetTask, Long newOrder) {
+        targetTask.updateProcessorOrder(newOrder);
         commandTaskPort.save(targetTask);
     }
 
-    /**
-     * 작업을 가장 상위로 이동시키는 메서드
-     *
-     * @param processorId 작업을 수행하는 멤버 ID
-     * @param targetTask 순서를 변경할 대상 작업
-     * @param nextTaskId 다음 작업의 ID
-     */
-    private void moveToTop(Long processorId, Task targetTask, Long nextTaskId) {
-        // 다음 작업 찾기
-        Task nextTask = findByIdAndStatus(nextTaskId, targetTask.getTaskStatus());
-
-        // 해당 상태에서 바로 앞에 있는 작업 찾기
-        Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
-
-        Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
-
-        updateNewTaskOrder(processorId, targetTask, prevTaskOrder, nextTask.getProcessorOrder());
-    }
-
-    /**
-     * 작업을 가장 하위로 이동시키는 메서드
-     *
-     * @param processorId 작업을 수행하는 멤버 ID
-     * @param targetTask 순서를 변경할 대상 작업
-     * @param prevTaskId 이전 작업의 ID
-     */
-    private void moveToBottom(Long processorId, Task targetTask, Long prevTaskId) {
-        // 이전 작업 찾기
-        Task prevTask = findByIdAndStatus(prevTaskId, targetTask.getTaskStatus());
-
-        // 해당 상태에서 바로 뒤에 있는 작업 찾기
-        Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
-
-        Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
-
-        updateNewTaskOrder(processorId, targetTask, prevTask.getProcessorOrder(), nextTaskOrder);
-    }
-
     /**
      * 작업의 상태와 순서를 동시에 변경하는 메서드
      *
-     * @param processorId 작업을 수행하는 멤버 ID
-     * @param request 순서 변경 요청 객체
+     * @param processorId  작업을 수행하는 멤버 ID
+     * @param request      순서 변경 요청 객체
      * @param targetStatus 변경할 작업 상태
      */
     @Override
     @Transactional
     public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus targetStatus) {
         validateRequest(request, targetStatus);
-
         Member processor = memberService.findActiveMember(processorId);
-
         Task targetTask = taskService.findById(request.targetTaskId());
+        taskOrderRequestPolicy.validateProcessor(processorId, targetTask);
 
         if (request.prevTaskId() == 0) {
-            moveToTopWithStatusChange(processorId, targetTask, request.nextTaskId(), targetStatus);
+            Task nextTask = findByIdAndStatus(request.targetTaskId(), targetStatus);
+            // 해당 상태에서 바로 앞 있는 작업 찾기
+            Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
+            long newOrder = taskOrderCalculationPolicy.calculateOrderForTop(prevTask,nextTask);
+            updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
         } else if (request.nextTaskId() == 0) {
-            moveToBottomWithStatusChange(processorId, targetTask, request.prevTaskId(), targetStatus);
+            Task prevTask = findByIdAndStatus(request.targetTaskId(), targetStatus);
+            // 해당 상태에서 바로 뒤에 있는 작업 찾기
+            Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
+            long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, nextTask);
+            updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
         } else {
             Task prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
             Task nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
-
-            updateNewTaskOrderAndStatus(targetStatus, targetTask, processor.getMemberId(), prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
+            long newOrder = taskOrderCalculationPolicy.calculateNewProcessorOrder(nextTask.getProcessorOrder(), prevTask.getProcessorOrder());
+            updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
         }
     }
 
     /**
      * 작업의 상태와 순서를 업데이트하는 메서드
      */
-    private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
-        targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
+    private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, long newOrder) {
+        targetTask.updateProcessorOrder(newOrder);
         targetTask.updateTaskStatus(targetStatus);
         commandTaskPort.save(targetTask);
     }
 
     /**
-     * 상태 변경을 포함하여 작업을 가장 상위로 이동하는 메서드
+     * 순서 변경 요청의 유효성을 검증하는 메서드
      */
-    private void moveToTopWithStatusChange(Long processorId, Task targetTask, Long nextTaskId, TaskStatus targetStatus) {
-        Task nextTask = findByIdAndStatus(nextTaskId, targetStatus);
-        Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
-
-        Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
+    public void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetStatus) {
+        // 이전 및 다음 작업 ID가 모두 0인 경우 예외 발생
+        if (request.prevTaskId() == 0 && request.nextTaskId() == 0) {
+            throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
 
-        updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTaskOrder, nextTask.getProcessorOrder());
+        // 타겟 상태가 유효한지 검증
+        if (targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)) {
+            throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
     }
 
-    /**
-     * 상태 변경을 포함하여 작업을 가장 하위로 이동하는 메서드
-     */
-    private void moveToBottomWithStatusChange(Long processorId, Task targetTask, Long prevTaskId, TaskStatus targetStatus) {
-        Task prevTask = findByIdAndStatus(prevTaskId, targetStatus);
-        Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
-
-        Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
-
-        updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTask.getProcessorOrder(), nextTaskOrder);
-    }
 }
 

From d2534b0fbf3423373811459b92d869776552fc7c Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:59:11 +0900
Subject: [PATCH 05/14] =?UTF-8?q?CLAP-211=20Rename:=20=EB=94=94=EB=A0=89?=
 =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 src/main/java/clap/server/domain/model/task/Task.java         | 2 +-
 .../domain/model/task/policy/TaskOrderCalculationPolicy.java  | 2 +-
 .../TaskOrderGapPolicy.java}                                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/main/java/clap/server/domain/model/task/{constants/TaskProcessorOrderPolicy.java => policy/TaskOrderGapPolicy.java} (56%)

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 0c0acd28..f050e396 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -15,7 +15,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 
-import static clap.server.domain.model.task.constants.TaskProcessorOrderPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+import static clap.server.domain.model.task.policy.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
 
 @Getter
 @SuperBuilder
diff --git a/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java b/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java
index f55d11e6..739e3c3f 100644
--- a/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java
+++ b/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java
@@ -6,7 +6,7 @@
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 
-import static clap.server.domain.model.task.constants.TaskProcessorOrderPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+import static clap.server.domain.model.task.policy.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
 
 @RequiredArgsConstructor
 @Policy
diff --git a/src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java b/src/main/java/clap/server/domain/model/task/policy/TaskOrderGapPolicy.java
similarity index 56%
rename from src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java
rename to src/main/java/clap/server/domain/model/task/policy/TaskOrderGapPolicy.java
index 78bc9cfc..7ba607fe 100644
--- a/src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java
+++ b/src/main/java/clap/server/domain/model/task/policy/TaskOrderGapPolicy.java
@@ -1,8 +1,8 @@
-package clap.server.domain.model.task.constants;
+package clap.server.domain.model.task.policy;
 
 import lombok.Getter;
 
 @Getter
-public class TaskProcessorOrderPolicy {
+public class TaskOrderGapPolicy {
     public static final long DEFAULT_PROCESSOR_ORDER_GAP = (long) Math.pow(2,6);
 }
\ No newline at end of file

From 0469bf6af4fc3d4609d4cc03da6c0633600b9459 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:22:06 +0900
Subject: [PATCH 06/14] =?UTF-8?q?CLAP-211=20Rename:=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../application/service/task/UpdateTaskBoardService.java  | 8 ++++----
 ...rRequestPolicy.java => ProcessorValidationPolicy.java} | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename src/main/java/clap/server/domain/model/task/policy/{TaskOrderRequestPolicy.java => ProcessorValidationPolicy.java} (92%)

diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
index efb1f5da..9cf9f468 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -9,7 +9,7 @@
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.domain.model.task.policy.TaskOrderCalculationPolicy;
-import clap.server.domain.model.task.policy.TaskOrderRequestPolicy;
+import clap.server.domain.model.task.policy.ProcessorValidationPolicy;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;
@@ -28,7 +28,7 @@ class UpdateTaskBoardService implements UpdateTaskBoardUsecase, UpdateTaskOrderA
     private final LoadTaskPort loadTaskPort;
     private final CommandTaskPort commandTaskPort;
     private final TaskOrderCalculationPolicy taskOrderCalculationPolicy;
-    private final TaskOrderRequestPolicy taskOrderRequestPolicy;
+    private final ProcessorValidationPolicy processorValidationPolicy;
 
     private Task findByIdAndStatus(Long taskId, TaskStatus status) {
         return loadTaskPort.findByIdAndStatus(taskId, status).orElseThrow(() -> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
@@ -47,7 +47,7 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
         validateRequest(request, null);
         Member processor = memberService.findActiveMember(processorId);
         Task targetTask = taskService.findById(request.targetTaskId());
-        taskOrderRequestPolicy.validateProcessor(processorId, targetTask);
+        processorValidationPolicy.validateProcessor(processorId, targetTask);
 
         // 가장 상위로 이동
         if (request.prevTaskId() == 0) {
@@ -96,7 +96,7 @@ public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest re
         validateRequest(request, targetStatus);
         Member processor = memberService.findActiveMember(processorId);
         Task targetTask = taskService.findById(request.targetTaskId());
-        taskOrderRequestPolicy.validateProcessor(processorId, targetTask);
+        processorValidationPolicy.validateProcessor(processorId, targetTask);
 
         if (request.prevTaskId() == 0) {
             Task nextTask = findByIdAndStatus(request.targetTaskId(), targetStatus);
diff --git a/src/main/java/clap/server/domain/model/task/policy/TaskOrderRequestPolicy.java b/src/main/java/clap/server/domain/model/task/policy/ProcessorValidationPolicy.java
similarity index 92%
rename from src/main/java/clap/server/domain/model/task/policy/TaskOrderRequestPolicy.java
rename to src/main/java/clap/server/domain/model/task/policy/ProcessorValidationPolicy.java
index b5a6df0a..409b2c42 100644
--- a/src/main/java/clap/server/domain/model/task/policy/TaskOrderRequestPolicy.java
+++ b/src/main/java/clap/server/domain/model/task/policy/ProcessorValidationPolicy.java
@@ -8,8 +8,7 @@
 import java.util.Objects;
 
 @Policy
-public class TaskOrderRequestPolicy {
-
+public class ProcessorValidationPolicy {
     public void validateProcessor(Long processorId, Task targetTask) {
         if (!Objects.equals(processorId, targetTask.getProcessor().getMemberId())) {
             throw new ApplicationException(TaskErrorCode.NOT_A_PROCESSOR);

From 8adad2649eacbac54b812fa2d51034390272b1e4 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:23:17 +0900
Subject: [PATCH 07/14] =?UTF-8?q?CLAP-211=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EC=9D=98=20=EC=83=81=ED=83=9C=EA=B0=80=20REQUESTED=EC=9D=BC=20?=
 =?UTF-8?q?=EB=95=8C=EB=A7=8C=20=EC=88=98=EC=A0=95=ED=95=A0=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=EA=B2=80=EC=A6=9D=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EC=A0=95=EC=B1=85=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../service/task/ApprovalTaskService.java        |  5 ++++-
 .../java/clap/server/domain/model/task/Task.java |  8 --------
 .../task/policy/RequestedTaskUpdatePolicy.java   | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/clap/server/domain/model/task/policy/RequestedTaskUpdatePolicy.java

diff --git a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
index 972b6cb4..57a41f41 100644
--- a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
+++ b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
@@ -22,6 +22,7 @@
 import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
 import clap.server.domain.model.task.TaskHistory;
+import clap.server.domain.model.task.policy.RequestedTaskUpdatePolicy;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,6 +45,7 @@ public class ApprovalTaskService implements ApprovalTaskUsecase {
     private final CommandTaskHistoryPort commandTaskHistoryPort;
     private final ApplicationEventPublisher applicationEventPublisher;
     private final SendWebhookService sendWebhookService;
+    private final RequestedTaskUpdatePolicy requestedTaskUpdatePolicy;
 
     @Override
     @Transactional
@@ -54,6 +56,7 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         Category category = categoryService.findById(approvalTaskRequest.categoryId());
         Label label = labelService.findById(approvalTaskRequest.labelId());
 
+        requestedTaskUpdatePolicy.validateTaskRequested(task);
         task.approveTask(reviewer, processor, approvalTaskRequest.dueDate(), category, label);
         TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.PROCESSOR_ASSIGNED, task, null, processor,null);
         commandTaskHistoryPort.save(taskHistory);
@@ -70,7 +73,7 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
     public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
         memberService.findActiveMember(managerId);
         Task task = taskService.findById(taskId);
-        task.validateTaskRequested();
+        requestedTaskUpdatePolicy.validateTaskRequested(task);
         return TaskMapper.toFindApprovalFormResponse(task);
     }
 
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 f050e396..70c15bed 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -50,19 +50,12 @@ public void updateTask(Long requesterId, Category category, String title, String
         if(!Objects.equals(requesterId, this.requester.getMemberId() )) {
             throw new ApplicationException(TaskErrorCode.NOT_A_REQUESTER);
         }
-        validateTaskRequested();
         this.category = category;
         this.title = title;
         this.description = description;
         this.taskCode = toTaskCode(category);
     }
 
-    public void validateTaskRequested() {
-        if (this.taskStatus != TaskStatus.REQUESTED) {
-            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
-    }
-
     public void setInitialProcessorOrder() {
         if (this.processor == null) {
             this.processorOrder = this.taskId * DEFAULT_PROCESSOR_ORDER_GAP;
@@ -85,7 +78,6 @@ public void updateLabel(Label label) {
     }
 
     public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate, Category category, Label label) {
-        validateTaskRequested();
         this.reviewer = reviewer;
         this.processor = processor;
         this.dueDate = dueDate;
diff --git a/src/main/java/clap/server/domain/model/task/policy/RequestedTaskUpdatePolicy.java b/src/main/java/clap/server/domain/model/task/policy/RequestedTaskUpdatePolicy.java
new file mode 100644
index 00000000..45898723
--- /dev/null
+++ b/src/main/java/clap/server/domain/model/task/policy/RequestedTaskUpdatePolicy.java
@@ -0,0 +1,16 @@
+package clap.server.domain.model.task.policy;
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.common.annotation.architecture.Policy;
+import clap.server.domain.model.task.Task;
+import clap.server.exception.DomainException;
+import clap.server.exception.code.TaskErrorCode;
+
+@Policy
+public class RequestedTaskUpdatePolicy {
+    public void validateTaskRequested(Task task) {
+        if (task.getTaskStatus() != TaskStatus.REQUESTED) {
+            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
+        }
+    }
+}

From f759200711dd552e2b89dc0a2633027d74478c7d Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:24:39 +0900
Subject: [PATCH 08/14] =?UTF-8?q?CLAP-211=20Rename:=20domain/policy=20?=
 =?UTF-8?q?=ED=95=98=EC=9C=84=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../server/application/service/task/ApprovalTaskService.java  | 2 +-
 .../application/service/task/UpdateTaskBoardService.java      | 4 ++--
 src/main/java/clap/server/domain/model/task/Task.java         | 2 +-
 .../policy => policy/task}/ProcessorValidationPolicy.java     | 2 +-
 .../policy => policy/task}/RequestedTaskUpdatePolicy.java     | 2 +-
 .../policy => policy/task}/TaskOrderCalculationPolicy.java    | 4 ++--
 .../task/policy => policy/task}/TaskOrderGapPolicy.java       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename src/main/java/clap/server/domain/{model/task/policy => policy/task}/ProcessorValidationPolicy.java (91%)
 rename src/main/java/clap/server/domain/{model/task/policy => policy/task}/RequestedTaskUpdatePolicy.java (92%)
 rename src/main/java/clap/server/domain/{model/task/policy => policy/task}/TaskOrderCalculationPolicy.java (91%)
 rename src/main/java/clap/server/domain/{model/task/policy => policy/task}/TaskOrderGapPolicy.java (76%)

diff --git a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
index 57a41f41..fea8cc7e 100644
--- a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
+++ b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
@@ -22,7 +22,7 @@
 import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
 import clap.server.domain.model.task.TaskHistory;
-import clap.server.domain.model.task.policy.RequestedTaskUpdatePolicy;
+import clap.server.domain.policy.task.RequestedTaskUpdatePolicy;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
index 9cf9f468..f7af4cf7 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -8,8 +8,8 @@
 import clap.server.application.port.inbound.task.UpdateTaskOrderAndStatusUsecase;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
-import clap.server.domain.model.task.policy.TaskOrderCalculationPolicy;
-import clap.server.domain.model.task.policy.ProcessorValidationPolicy;
+import clap.server.domain.policy.task.TaskOrderCalculationPolicy;
+import clap.server.domain.policy.task.ProcessorValidationPolicy;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;
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 70c15bed..50362b30 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -15,7 +15,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 
-import static clap.server.domain.model.task.policy.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+import static clap.server.domain.policy.task.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
 
 @Getter
 @SuperBuilder
diff --git a/src/main/java/clap/server/domain/model/task/policy/ProcessorValidationPolicy.java b/src/main/java/clap/server/domain/policy/task/ProcessorValidationPolicy.java
similarity index 91%
rename from src/main/java/clap/server/domain/model/task/policy/ProcessorValidationPolicy.java
rename to src/main/java/clap/server/domain/policy/task/ProcessorValidationPolicy.java
index 409b2c42..16f7bd73 100644
--- a/src/main/java/clap/server/domain/model/task/policy/ProcessorValidationPolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/ProcessorValidationPolicy.java
@@ -1,4 +1,4 @@
-package clap.server.domain.model.task.policy;
+package clap.server.domain.policy.task;
 
 import clap.server.common.annotation.architecture.Policy;
 import clap.server.domain.model.task.Task;
diff --git a/src/main/java/clap/server/domain/model/task/policy/RequestedTaskUpdatePolicy.java b/src/main/java/clap/server/domain/policy/task/RequestedTaskUpdatePolicy.java
similarity index 92%
rename from src/main/java/clap/server/domain/model/task/policy/RequestedTaskUpdatePolicy.java
rename to src/main/java/clap/server/domain/policy/task/RequestedTaskUpdatePolicy.java
index 45898723..ce1eb38a 100644
--- a/src/main/java/clap/server/domain/model/task/policy/RequestedTaskUpdatePolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/RequestedTaskUpdatePolicy.java
@@ -1,4 +1,4 @@
-package clap.server.domain.model.task.policy;
+package clap.server.domain.policy.task;
 
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.common.annotation.architecture.Policy;
diff --git a/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java b/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
similarity index 91%
rename from src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java
rename to src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
index 739e3c3f..0cf0a7fe 100644
--- a/src/main/java/clap/server/domain/model/task/policy/TaskOrderCalculationPolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
@@ -1,4 +1,4 @@
-package clap.server.domain.model.task.policy;
+package clap.server.domain.policy.task;
 
 import clap.server.common.annotation.architecture.Policy;
 import clap.server.domain.model.task.Task;
@@ -6,7 +6,7 @@
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 
-import static clap.server.domain.model.task.policy.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+import static clap.server.domain.policy.task.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
 
 @RequiredArgsConstructor
 @Policy
diff --git a/src/main/java/clap/server/domain/model/task/policy/TaskOrderGapPolicy.java b/src/main/java/clap/server/domain/policy/task/TaskOrderGapPolicy.java
similarity index 76%
rename from src/main/java/clap/server/domain/model/task/policy/TaskOrderGapPolicy.java
rename to src/main/java/clap/server/domain/policy/task/TaskOrderGapPolicy.java
index 7ba607fe..bca343ea 100644
--- a/src/main/java/clap/server/domain/model/task/policy/TaskOrderGapPolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/TaskOrderGapPolicy.java
@@ -1,4 +1,4 @@
-package clap.server.domain.model.task.policy;
+package clap.server.domain.policy.task;
 
 import lombok.Getter;
 

From 9ddf2a0579e28621739675c16071c4d55900b094 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:44:56 +0900
Subject: [PATCH 09/14] =?UTF-8?q?CLAP-211=20Refactor:=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EC=95=8C=EB=A6=BC=20=EC=A0=84=EC=86=A1=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=A1=9C=EC=A7=81=EC=9D=84=20PublishNotif?=
 =?UTF-8?q?icationService=EB=A1=9C=20=EC=BA=A1=EC=8A=90=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../service/auth/ManageTokenService.java      |  4 +-
 .../service/comment/PostCommentService.java   | 35 ++--------
 .../service/task/ApprovalTaskService.java     | 37 ++---------
 .../service/task/CreateTaskService.java       | 41 ++----------
 .../task/PublishNotificationService.java      | 66 +++++++++++++++++++
 .../service/task/UpdateTaskService.java       | 43 ++----------
 6 files changed, 87 insertions(+), 139 deletions(-)
 create mode 100644 src/main/java/clap/server/application/service/task/PublishNotificationService.java

diff --git a/src/main/java/clap/server/application/service/auth/ManageTokenService.java b/src/main/java/clap/server/application/service/auth/ManageTokenService.java
index fecfdc5a..5a029d2d 100644
--- a/src/main/java/clap/server/application/service/auth/ManageTokenService.java
+++ b/src/main/java/clap/server/application/service/auth/ManageTokenService.java
@@ -11,14 +11,14 @@
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.function.Function;
 
 @RequiredArgsConstructor
-@Component
+@Service
 @Slf4j
 class ManageTokenService {
     private final JwtProvider accessTokenProvider;
diff --git a/src/main/java/clap/server/application/service/comment/PostCommentService.java b/src/main/java/clap/server/application/service/comment/PostCommentService.java
index c87c2ce2..18ab514e 100644
--- a/src/main/java/clap/server/application/service/comment/PostCommentService.java
+++ b/src/main/java/clap/server/application/service/comment/PostCommentService.java
@@ -1,10 +1,8 @@
 package clap.server.application.service.comment;
 
-import clap.server.adapter.inbound.web.dto.notification.SseRequest;
 import clap.server.adapter.inbound.web.dto.task.PostAndEditCommentRequest;
 import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
-import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.port.inbound.comment.PostCommentUsecase;
@@ -13,24 +11,20 @@
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandCommentPort;
 import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
-import clap.server.application.service.notification.SendWebhookService;
+import clap.server.application.service.task.PublishNotificationService;
 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.notification.Notification;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Comment;
 import clap.server.domain.model.task.Task;
 import clap.server.domain.model.task.TaskHistory;
 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
 public class PostCommentService implements PostCommentUsecase {
@@ -41,8 +35,7 @@ public class PostCommentService implements PostCommentUsecase {
     private final S3UploadAdapter s3UploadAdapter;
     private final CommandAttachmentPort commandAttachmentPort;
     private final CommandTaskHistoryPort commandTaskHistoryPort;
-    private final ApplicationEventPublisher applicationEventPublisher;
-    private final SendWebhookService sendWebhookService;
+    private final PublishNotificationService publishNotificationService;
 
     @Transactional
     @Override
@@ -60,10 +53,10 @@ public void save(Long userId, Long taskId, PostAndEditCommentRequest request) {
             commandTaskHistoryPort.save(taskHistory);
 
             if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {
-                publishNotification(task.getProcessor(), task, comment.getContent(), member.getNickname());
+                publishNotificationService.publishCommentNotification(task.getProcessor(), task, comment.getContent(), member.getNickname());
             }
             else {
-                publishNotification(task.getRequester(), task, comment.getContent(), task.getProcessor().getNickname());
+                publishNotificationService.publishCommentNotification(task.getRequester(), task, comment.getContent(), task.getProcessor().getNickname());
             }
         }
     }
@@ -83,10 +76,10 @@ public void saveCommentAttachment(Long userId, Long taskId, List<MultipartFile>
             commandTaskHistoryPort.save(taskHistory);
 
             if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {
-                publishNotification(task.getProcessor(), task, "첨부파일", member.getNickname());
+                publishNotificationService.publishCommentNotification(task.getProcessor(), task, "첨부파일", member.getNickname());
             }
             else {
-                publishNotification(task.getRequester(), task, "첨부파일", task.getProcessor().getNickname());
+                publishNotificationService.publishCommentNotification(task.getRequester(), task, "첨부파일", task.getProcessor().getNickname());
             }
         }
     }
@@ -97,20 +90,4 @@ private void saveAttachment(List<MultipartFile> files, Task task, Comment commen
         commandAttachmentPort.saveAll(attachments);
     }
 
-    private void publishNotification(Member receiver, Task task, String message, String commenterName){
-            // 알림 저장
-        Notification notification = createTaskNotification(task, receiver, NotificationType.COMMENT);
-        applicationEventPublisher.publishEvent(notification);
-
-            // SSE 실시간 알림 전송
-        SseRequest sseRequest = new SseRequest(
-                notification.getTask().getTitle(),
-                notification.getType(),
-                receiver.getMemberId(),
-                message
-        );
-        applicationEventPublisher.publishEvent(sseRequest);
-
-        sendWebhookService.sendWebhookNotification(receiver, NotificationType.COMMENT, task, message, commenterName);
-    }
 }
diff --git a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
index fea8cc7e..92515518 100644
--- a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
+++ b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
@@ -1,6 +1,5 @@
 package clap.server.application.service.task;
 
-import clap.server.adapter.inbound.web.dto.notification.SseRequest;
 import clap.server.adapter.inbound.web.dto.task.ApprovalTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.ApprovalTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.FindApprovalFormResponse;
@@ -14,24 +13,18 @@
 import clap.server.application.port.inbound.task.ApprovalTaskUsecase;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
-import clap.server.application.service.notification.SendWebhookService;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
-import clap.server.domain.model.notification.Notification;
 import clap.server.domain.model.task.Category;
 import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
 import clap.server.domain.model.task.TaskHistory;
 import clap.server.domain.policy.task.RequestedTaskUpdatePolicy;
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import static clap.server.domain.model.notification.Notification.createTaskNotification;
-
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -42,10 +35,9 @@ public class ApprovalTaskService implements ApprovalTaskUsecase {
     private final CategoryService categoryService;
     private final LabelService labelService;
     private final CommandTaskPort commandTaskPort;
-    private final CommandTaskHistoryPort commandTaskHistoryPort;
-    private final ApplicationEventPublisher applicationEventPublisher;
-    private final SendWebhookService sendWebhookService;
     private final RequestedTaskUpdatePolicy requestedTaskUpdatePolicy;
+    private final PublishNotificationService publishNotificationService;
+    private final CommandTaskHistoryPort commandTaskHistoryPort;
 
     @Override
     @Transactional
@@ -61,11 +53,9 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.PROCESSOR_ASSIGNED, task, null, processor,null);
         commandTaskHistoryPort.save(taskHistory);
 
-        List<Member> receivers = new ArrayList<>();
-        receivers.add(task.getRequester());
-        receivers.add(task.getProcessor());
+        List<Member> receivers = List.of(reviewer, processor);
+        publishNotificationService.publishNotification(receivers, task, NotificationType.PROCESSOR_ASSIGNED);
 
-        publishNotification(receivers, task);
         return TaskMapper.toApprovalTaskResponse(commandTaskPort.save(task));
     }
 
@@ -77,23 +67,4 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
         return TaskMapper.toFindApprovalFormResponse(task);
     }
 
-    private void publishNotification(List<Member> receivers, Task task){
-        for (Member receiver : receivers) {
-            // 알림 저장
-            Notification notification = createTaskNotification(task, receiver, NotificationType.PROCESSOR_ASSIGNED);
-            applicationEventPublisher.publishEvent(notification);
-
-            // SSE 실시간 알림 전송
-            SseRequest sseRequest = new SseRequest(
-                    notification.getTask().getTitle(),
-                    notification.getType(),
-                    receiver.getMemberId(),
-                    task.getProcessor().getNickname()
-            );
-            applicationEventPublisher.publishEvent(sseRequest);
-
-            sendWebhookService.sendWebhookNotification(receiver, NotificationType.PROCESSOR_ASSIGNED,
-                    task, task.getProcessor().getNickname(), null);
-        }
-    }
 }
diff --git a/src/main/java/clap/server/application/service/task/CreateTaskService.java b/src/main/java/clap/server/application/service/task/CreateTaskService.java
index 7c77a0dd..49a34cc5 100644
--- a/src/main/java/clap/server/application/service/task/CreateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/CreateTaskService.java
@@ -1,9 +1,7 @@
 package clap.server.application.service.task;
 
-import clap.server.adapter.inbound.web.dto.notification.SseRequest;
 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;
@@ -13,25 +11,18 @@
 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.application.service.notification.SendWebhookService;
 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.notification.Notification;
 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.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
@@ -42,8 +33,7 @@ public class CreateTaskService implements CreateTaskUsecase {
     private final CommandTaskPort commandTaskPort;
     private final CommandAttachmentPort commandAttachmentPort;
     private final S3UploadAdapter s3UploadAdapter;
-    private final SendWebhookService sendWebhookService;
-    private final ApplicationEventPublisher applicationEventPublisher;
+    private final PublishNotificationService publishNotificationService;
 
     @Override
     @Transactional
@@ -59,7 +49,8 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT
             saveAttachments(files, savedTask);
         }
 
-        publishNotification(savedTask);
+        List<Member> reviewers = memberService.findReviewers();
+        publishNotificationService.publishNotification(reviewers, savedTask, NotificationType.TASK_REQUESTED);
         return TaskMapper.toCreateTaskResponse(savedTask);
     }
 
@@ -69,28 +60,4 @@ private void saveAttachments(List<MultipartFile> files, Task task) {
         commandAttachmentPort.saveAll(attachments);
     }
 
-    private void publishNotification(Task task) {
-        List<Member> reviewers = memberService.findReviewers();
-
-        // 검토자들 각각에 대한 알림 생성 후 event 발행
-        for (Member reviewer : reviewers) {
-            // 알림 저장
-            Notification notification = createTaskNotification(task, reviewer, NotificationType.TASK_REQUESTED);
-            applicationEventPublisher.publishEvent(notification);
-
-            // SSE 실시간 알림 전송
-            SseRequest sseRequest = new SseRequest(
-                    notification.getTask().getTitle(),
-                    notification.getType(),
-                    reviewer.getMemberId(),
-                    null
-            );
-            applicationEventPublisher.publishEvent(sseRequest);
-
-            sendWebhookService.sendWebhookNotification(reviewer, NotificationType.TASK_REQUESTED,
-                    task, null, null);
-        }
-    }
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/task/PublishNotificationService.java b/src/main/java/clap/server/application/service/task/PublishNotificationService.java
new file mode 100644
index 00000000..68b81dc2
--- /dev/null
+++ b/src/main/java/clap/server/application/service/task/PublishNotificationService.java
@@ -0,0 +1,66 @@
+package clap.server.application.service.task;
+
+import clap.server.adapter.inbound.web.dto.notification.SseRequest;
+import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
+import clap.server.application.service.notification.SendWebhookService;
+import clap.server.domain.model.member.Member;
+import clap.server.domain.model.notification.Notification;
+import clap.server.domain.model.task.Task;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+import static clap.server.domain.model.notification.Notification.createTaskNotification;
+
+@Service
+@RequiredArgsConstructor
+public class PublishNotificationService {
+    private final ApplicationEventPublisher applicationEventPublisher;
+    private final SendWebhookService sendWebhookService;
+
+    public void publishNotification(List<Member> receivers, Task task, NotificationType type) {
+        receivers.forEach(receiver -> {
+            Notification notification = createTaskNotification(task, receiver, type);
+            applicationEventPublisher.publishEvent(notification);
+
+            publishSSENotification(task.getProcessor().getNickname(), receiver, notification);
+
+            sendWebhookService.sendWebhookNotification(receiver, type,
+                    task, task.getProcessor().getNickname(), null);
+        });
+
+    }
+
+    public void publishCommentNotification(Member receiver, Task task, String message, String commenterName) {
+        Notification notification = createTaskNotification(task, receiver, NotificationType.COMMENT);
+        applicationEventPublisher.publishEvent(notification);
+
+        publishSSENotification(message, receiver, notification);
+
+        sendWebhookService.sendWebhookNotification(receiver, NotificationType.COMMENT, task, message, commenterName);
+    }
+
+    public void publishTaskUpdatedNotification(List<Member> receivers, Task task, NotificationType notificationType, String message) {
+        receivers.forEach(receiver -> {
+            Notification notification = createTaskNotification(task, receiver, notificationType);
+            applicationEventPublisher.publishEvent(notification);
+
+            publishSSENotification(message, receiver, notification);
+
+            sendWebhookService.sendWebhookNotification(receiver, notificationType,
+                    task, message, null);
+        });
+    }
+
+    private void publishSSENotification(String message, Member receiver, Notification notification) {
+        SseRequest sseRequest = new SseRequest(
+                notification.getTask().getTitle(),
+                notification.getType(),
+                receiver.getMemberId(),
+                message
+        );
+        applicationEventPublisher.publishEvent(sseRequest);
+    }
+}
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
index e3aceb36..50226e2a 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -1,6 +1,5 @@
 package clap.server.application.service.task;
 
-import clap.server.adapter.inbound.web.dto.notification.SseRequest;
 import clap.server.adapter.inbound.web.dto.task.*;
 import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
@@ -17,11 +16,9 @@
 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.service.notification.SendWebhookService;
 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.notification.Notification;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
 import clap.server.domain.model.task.Label;
@@ -30,15 +27,11 @@
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import static clap.server.domain.model.notification.Notification.createTaskNotification;
-
 
 @ApplicationService
 @RequiredArgsConstructor
@@ -48,8 +41,7 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
     private final MemberService memberService;
     private final CategoryService categoryService;
     private final TaskService taskService;
-    private final ApplicationEventPublisher applicationEventPublisher;
-    private final SendWebhookService sendWebhookService;
+    private final PublishNotificationService publishNotificationService;
 
     private final CommandTaskPort commandTaskPort;
     private final LoadAttachmentPort loadAttachmentPort;
@@ -80,9 +72,8 @@ public UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTask
         Task task = taskService.findById(taskId);
         task.updateTaskStatus(updateTaskStatusRequest.taskStatus());
         Task updateTask = commandTaskPort.save(task);
-        List<Member> receiver = new ArrayList<>();
-        receiver.add(task.getRequester());
-        publishNotification(receiver, updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
+
+        publishNotificationService.publishTaskUpdatedNotification(List.of(task.getRequester()), updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
         return TaskMapper.toUpdateTaskResponse(updateTask);
     }
 
@@ -96,11 +87,9 @@ public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTa
         task.updateProcessor(processor);
         Task updateTask = commandTaskPort.save(task);
 
-        List<Member> receivers = new ArrayList<>();
-        receivers.add(updateTask.getRequester());
-        receivers.add(updateTask.getProcessor());
+        List<Member> receivers = List.of(processor, task.getRequester());
 
-        publishNotification(receivers, updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname());
+        publishNotificationService.publishTaskUpdatedNotification(receivers, updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname());
         return TaskMapper.toUpdateTaskResponse(updateTask);
     }
 
@@ -116,8 +105,6 @@ public UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLa
         return TaskMapper.toUpdateTaskResponse(updatetask);
     }
 
-
-
     private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartFile> files, Task task) {
         List<Attachment> attachmentsToDelete = validateAndGetAttachments(attachmentIdsToDelete, task);
         attachmentsToDelete.forEach(Attachment::softDelete);
@@ -136,24 +123,4 @@ private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDel
         }
         return attachmentsOfTask;
     }
-
-    private void publishNotification(List<Member> receivers, Task task, NotificationType notificationType, String message){
-        for (Member receiver : receivers) {
-            // 알림 저장
-            Notification notification = createTaskNotification(task, receiver, notificationType);
-            applicationEventPublisher.publishEvent(notification);
-
-            // SSE 실시간 알림 전송
-            SseRequest sseRequest = new SseRequest(
-                    notification.getTask().getTitle(),
-                    notification.getType(),
-                    receiver.getMemberId(),
-                    message
-            );
-            applicationEventPublisher.publishEvent(sseRequest);
-
-            sendWebhookService.sendWebhookNotification(receiver, notificationType,
-                    task, message, null);
-        }
-    }
 }

From b64e58c26bba78bbf2a453e4b5a68cfab03fd45d Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:46:10 +0900
Subject: [PATCH 10/14] =?UTF-8?q?CLAP-211=20Docs:=20todo=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../application/service/task/PublishNotificationService.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/clap/server/application/service/task/PublishNotificationService.java b/src/main/java/clap/server/application/service/task/PublishNotificationService.java
index 68b81dc2..de1a20ea 100644
--- a/src/main/java/clap/server/application/service/task/PublishNotificationService.java
+++ b/src/main/java/clap/server/application/service/task/PublishNotificationService.java
@@ -20,6 +20,8 @@ public class PublishNotificationService {
     private final ApplicationEventPublisher applicationEventPublisher;
     private final SendWebhookService sendWebhookService;
 
+    //TODO: NotificationType에 따라 메세지 템플릿을 생성하는 로직 추가 필요
+
     public void publishNotification(List<Member> receivers, Task task, NotificationType type) {
         receivers.forEach(receiver -> {
             Notification notification = createTaskNotification(task, receiver, type);

From 0a2b325a260760ab0f00cbfb49cdfbaa099806fe Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 21:30:20 +0900
Subject: [PATCH 11/14] CLAP-211 Refactor: merge conflict solve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #214
---
 .../service/task/ApprovalTaskService.java     | 12 +++-
 .../service/task/CreateTaskService.java       | 21 +++---
 .../task/PublishNotificationService.java      | 68 -------------------
 .../service/task/UpdateTaskService.java       | 25 ++++---
 ...vice.java => SendNotificationService.java} |  2 +-
 5 files changed, 40 insertions(+), 88 deletions(-)
 delete mode 100644 src/main/java/clap/server/application/service/task/PublishNotificationService.java
 rename src/main/java/clap/server/application/service/webhook/{SendPushNotificationService.java => SendNotificationService.java} (98%)

diff --git a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
index 92515518..b8e2ff3b 100644
--- a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
+++ b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
@@ -13,6 +13,7 @@
 import clap.server.application.port.inbound.task.ApprovalTaskUsecase;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
+import clap.server.application.service.webhook.SendNotificationService;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Category;
@@ -36,8 +37,8 @@ public class ApprovalTaskService implements ApprovalTaskUsecase {
     private final LabelService labelService;
     private final CommandTaskPort commandTaskPort;
     private final RequestedTaskUpdatePolicy requestedTaskUpdatePolicy;
-    private final PublishNotificationService publishNotificationService;
     private final CommandTaskHistoryPort commandTaskHistoryPort;
+    private final SendNotificationService sendNotificationService;
 
     @Override
     @Transactional
@@ -54,7 +55,7 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         commandTaskHistoryPort.save(taskHistory);
 
         List<Member> receivers = List.of(reviewer, processor);
-        publishNotificationService.publishNotification(receivers, task, NotificationType.PROCESSOR_ASSIGNED);
+        publishNotification(receivers, task);
 
         return TaskMapper.toApprovalTaskResponse(commandTaskPort.save(task));
     }
@@ -67,4 +68,11 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
         return TaskMapper.toFindApprovalFormResponse(task);
     }
 
+    private void publishNotification(List<Member> receivers, Task task){
+        receivers.forEach(receiver -> {
+            sendNotificationService.sendPushNotification(receiver, NotificationType.PROCESSOR_ASSIGNED,
+                    task, task.getProcessor().getNickname(), null);
+        });
+    }
+
 }
diff --git a/src/main/java/clap/server/application/service/task/CreateTaskService.java b/src/main/java/clap/server/application/service/task/CreateTaskService.java
index 49a34cc5..962bcb95 100644
--- a/src/main/java/clap/server/application/service/task/CreateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/CreateTaskService.java
@@ -9,8 +9,10 @@
 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.s3.S3UploadPort;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandTaskPort;
+import clap.server.application.service.webhook.SendNotificationService;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.common.constants.FilePathConstants;
 import clap.server.domain.model.member.Member;
@@ -32,8 +34,8 @@ public class CreateTaskService implements CreateTaskUsecase {
     private final CategoryService categoryService;
     private final CommandTaskPort commandTaskPort;
     private final CommandAttachmentPort commandAttachmentPort;
-    private final S3UploadAdapter s3UploadAdapter;
-    private final PublishNotificationService publishNotificationService;
+    private final S3UploadPort s3UploadPort;
+    private final SendNotificationService sendNotificationService;
 
     @Override
     @Transactional
@@ -46,18 +48,21 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT
         commandTaskPort.save(savedTask);
 
         if (files != null) {
-            saveAttachments(files, savedTask);
-        }
-
-        List<Member> reviewers = memberService.findReviewers();
-        publishNotificationService.publishNotification(reviewers, savedTask, NotificationType.TASK_REQUESTED);
+            saveAttachments(files, savedTask);}
+        publishNotification(savedTask);
         return TaskMapper.toCreateTaskResponse(savedTask);
     }
 
     private void saveAttachments(List<MultipartFile> files, Task task) {
-        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
+        List<String> fileUrls = s3UploadPort.uploadFiles(FilePathConstants.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }
 
+    private void publishNotification(Task task) {
+        List<Member> reviewers = memberService.findReviewers();
+        reviewers.forEach(reviewer -> {sendNotificationService.sendPushNotification(reviewer, NotificationType.TASK_REQUESTED,
+                task, null, null);});
+
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/task/PublishNotificationService.java b/src/main/java/clap/server/application/service/task/PublishNotificationService.java
deleted file mode 100644
index de1a20ea..00000000
--- a/src/main/java/clap/server/application/service/task/PublishNotificationService.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package clap.server.application.service.task;
-
-import clap.server.adapter.inbound.web.dto.notification.SseRequest;
-import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
-import clap.server.application.service.notification.SendWebhookService;
-import clap.server.domain.model.member.Member;
-import clap.server.domain.model.notification.Notification;
-import clap.server.domain.model.task.Task;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static clap.server.domain.model.notification.Notification.createTaskNotification;
-
-@Service
-@RequiredArgsConstructor
-public class PublishNotificationService {
-    private final ApplicationEventPublisher applicationEventPublisher;
-    private final SendWebhookService sendWebhookService;
-
-    //TODO: NotificationType에 따라 메세지 템플릿을 생성하는 로직 추가 필요
-
-    public void publishNotification(List<Member> receivers, Task task, NotificationType type) {
-        receivers.forEach(receiver -> {
-            Notification notification = createTaskNotification(task, receiver, type);
-            applicationEventPublisher.publishEvent(notification);
-
-            publishSSENotification(task.getProcessor().getNickname(), receiver, notification);
-
-            sendWebhookService.sendWebhookNotification(receiver, type,
-                    task, task.getProcessor().getNickname(), null);
-        });
-
-    }
-
-    public void publishCommentNotification(Member receiver, Task task, String message, String commenterName) {
-        Notification notification = createTaskNotification(task, receiver, NotificationType.COMMENT);
-        applicationEventPublisher.publishEvent(notification);
-
-        publishSSENotification(message, receiver, notification);
-
-        sendWebhookService.sendWebhookNotification(receiver, NotificationType.COMMENT, task, message, commenterName);
-    }
-
-    public void publishTaskUpdatedNotification(List<Member> receivers, Task task, NotificationType notificationType, String message) {
-        receivers.forEach(receiver -> {
-            Notification notification = createTaskNotification(task, receiver, notificationType);
-            applicationEventPublisher.publishEvent(notification);
-
-            publishSSENotification(message, receiver, notification);
-
-            sendWebhookService.sendWebhookNotification(receiver, notificationType,
-                    task, message, null);
-        });
-    }
-
-    private void publishSSENotification(String message, Member receiver, Notification notification) {
-        SseRequest sseRequest = new SseRequest(
-                notification.getTask().getTitle(),
-                notification.getType(),
-                receiver.getMemberId(),
-                message
-        );
-        applicationEventPublisher.publishEvent(sseRequest);
-    }
-}
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
index 50226e2a..7e661e20 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -1,7 +1,6 @@
 package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.*;
-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;
@@ -13,9 +12,11 @@
 import clap.server.application.port.inbound.task.UpdateTaskProcessorUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskStatusUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskUsecase;
+import clap.server.application.port.outbound.s3.S3UploadPort;
 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.service.webhook.SendNotificationService;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.common.constants.FilePathConstants;
 import clap.server.domain.model.member.Member;
@@ -41,13 +42,13 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
     private final MemberService memberService;
     private final CategoryService categoryService;
     private final TaskService taskService;
-    private final PublishNotificationService publishNotificationService;
+    private final SendNotificationService sendNotificationService;
 
     private final CommandTaskPort commandTaskPort;
     private final LoadAttachmentPort loadAttachmentPort;
     private final LabelService labelService;
     private final CommandAttachmentPort commandAttachmentPort;
-    private final S3UploadAdapter s3UploadAdapter;
+    private final S3UploadPort s3UploadPort;
 
     @Override
     @Transactional
@@ -73,7 +74,7 @@ public UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTask
         task.updateTaskStatus(updateTaskStatusRequest.taskStatus());
         Task updateTask = commandTaskPort.save(task);
 
-        publishNotificationService.publishTaskUpdatedNotification(List.of(task.getRequester()), updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
+        publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
         return TaskMapper.toUpdateTaskResponse(updateTask);
     }
 
@@ -87,9 +88,7 @@ public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTa
         task.updateProcessor(processor);
         Task updateTask = commandTaskPort.save(task);
 
-        List<Member> receivers = List.of(processor, task.getRequester());
-
-        publishNotificationService.publishTaskUpdatedNotification(receivers, updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname());
+        publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname());
         return TaskMapper.toUpdateTaskResponse(updateTask);
     }
 
@@ -109,8 +108,8 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
         List<Attachment> attachmentsToDelete = validateAndGetAttachments(attachmentIdsToDelete, task);
         attachmentsToDelete.forEach(Attachment::softDelete);
 
-        if(files != null) {
-            List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
+        if (files != null) {
+            List<String> fileUrls = s3UploadPort.uploadFiles(FilePathConstants.TASK_IMAGE, files);
             List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
             commandAttachmentPort.saveAll(attachments);
         }
@@ -123,4 +122,12 @@ private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDel
         }
         return attachmentsOfTask;
     }
+
+    private void publishNotification(Task task, NotificationType notificationType, String message) {
+        List<Member> receivers = List.of(task.getRequester(), task.getProcessor());
+        receivers.forEach(receiver -> {
+            sendNotificationService.sendPushNotification(receiver, notificationType,
+                    task, message, null);
+        });
+    }
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
similarity index 98%
rename from src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java
rename to src/main/java/clap/server/application/service/webhook/SendNotificationService.java
index 8c3b1d0d..dc31d418 100644
--- a/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java
@@ -17,7 +17,7 @@
 
 @ApplicationService
 @RequiredArgsConstructor
-public class SendPushNotificationService {
+public class SendNotificationService {
 
     private final SendSseService sendSseService;
     private final SendAgitService sendAgitService;

From 202352ffd562ce71bfc7ec94499e2e1110fe9756 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 21:30:46 +0900
Subject: [PATCH 12/14] =?UTF-8?q?CLAP-211=20Refactor:=20=EB=8B=A8=EC=9D=BC?=
 =?UTF-8?q?=20=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #214
---
 .../application/mapper/AttachmentMapper.java  | 12 ------
 .../service/comment/PostCommentService.java   | 42 +++++++++----------
 .../common/constants/FilePathConstants.java   |  1 +
 3 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/src/main/java/clap/server/application/mapper/AttachmentMapper.java b/src/main/java/clap/server/application/mapper/AttachmentMapper.java
index 217780eb..0753bf63 100644
--- a/src/main/java/clap/server/application/mapper/AttachmentMapper.java
+++ b/src/main/java/clap/server/application/mapper/AttachmentMapper.java
@@ -28,18 +28,6 @@ public static List<Attachment> toTaskAttachments(Task task, List<MultipartFile>
                 .toList();
     }
 
-    public static List<Attachment> toCommentAttachments(Task task, Comment comment, List<MultipartFile> files, List<String> fileUrls) {
-        return IntStream.range(0, files.size())
-                .mapToObj(i -> createCommentAttachment(
-                        task,
-                        comment,
-                        files.get(i).getOriginalFilename(),
-                        fileUrls.get(i),
-                        files.get(i).getSize()
-                ))
-                .toList();
-    }
-
 
     public static List<AttachmentResponse> toAttachmentResponseList(List<Attachment> attachments) {
         return attachments.stream()
diff --git a/src/main/java/clap/server/application/service/comment/PostCommentService.java b/src/main/java/clap/server/application/service/comment/PostCommentService.java
index 18ab514e..66590dcd 100644
--- a/src/main/java/clap/server/application/service/comment/PostCommentService.java
+++ b/src/main/java/clap/server/application/service/comment/PostCommentService.java
@@ -1,17 +1,17 @@
 package clap.server.application.service.comment;
 
 import clap.server.adapter.inbound.web.dto.task.PostAndEditCommentRequest;
-import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
-import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.port.inbound.comment.PostCommentUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
+import clap.server.application.port.outbound.s3.S3UploadPort;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandCommentPort;
 import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
-import clap.server.application.service.task.PublishNotificationService;
+import clap.server.application.service.webhook.SendNotificationService;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.common.constants.FilePathConstants;
 import clap.server.domain.model.member.Member;
@@ -23,8 +23,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 @ApplicationService
 @RequiredArgsConstructor
 public class PostCommentService implements PostCommentUsecase {
@@ -32,10 +30,10 @@ public class PostCommentService implements PostCommentUsecase {
     private final MemberService memberService;
     private final TaskService taskService;
     private final CommandCommentPort commandCommentPort;
-    private final S3UploadAdapter s3UploadAdapter;
+    private final S3UploadPort s3UploadPort;
     private final CommandAttachmentPort commandAttachmentPort;
     private final CommandTaskHistoryPort commandTaskHistoryPort;
-    private final PublishNotificationService publishNotificationService;
+    private final SendNotificationService sendNotificationService;
 
     @Transactional
     @Override
@@ -53,41 +51,43 @@ public void save(Long userId, Long taskId, PostAndEditCommentRequest request) {
             commandTaskHistoryPort.save(taskHistory);
 
             if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {
-                publishNotificationService.publishCommentNotification(task.getProcessor(), task, comment.getContent(), member.getNickname());
-            }
-            else {
-                publishNotificationService.publishCommentNotification(task.getRequester(), task, comment.getContent(), task.getProcessor().getNickname());
+                publishNotification(task.getProcessor(), task, comment.getContent(), member.getNickname());
+            } else {
+                publishNotification(task.getRequester(), task, comment.getContent(), task.getProcessor().getNickname());
             }
         }
     }
 
     @Transactional
     @Override
-    public void saveCommentAttachment(Long userId, Long taskId, List<MultipartFile> files) {
+    public void saveCommentAttachment(Long userId, Long taskId, MultipartFile file) {
         Task task = taskService.findById(taskId);
         Member member = memberService.findActiveMember(userId);
 
         if (Member.checkCommenter(task, member)) {
             Comment comment = Comment.createComment(member, task, null);
             Comment savedComment = commandCommentPort.saveComment(comment);
-            saveAttachment(files, task, savedComment);
+            saveAttachment(file, task, savedComment);
 
             TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.COMMENT_FILE, task, null, member, savedComment);
             commandTaskHistoryPort.save(taskHistory);
 
             if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) {
-                publishNotificationService.publishCommentNotification(task.getProcessor(), task, "첨부파일", member.getNickname());
-            }
-            else {
-                publishNotificationService.publishCommentNotification(task.getRequester(), task, "첨부파일", task.getProcessor().getNickname());
+                publishNotification(task.getProcessor(), task, "첨부파일", member.getNickname());
+            } else {
+                publishNotification(task.getRequester(), task, "첨부파일", task.getProcessor().getNickname());
             }
         }
     }
 
-    private void saveAttachment(List<MultipartFile> files, Task task, Comment comment) {
-        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
-        List<Attachment> attachments = AttachmentMapper.toCommentAttachments(task, comment, files, fileUrls);
-        commandAttachmentPort.saveAll(attachments);
+    private void saveAttachment(MultipartFile file, Task task, Comment comment) {
+        String fileUrl = s3UploadPort.uploadSingleFile(FilePathConstants.TASK_COMMENT, file);
+        Attachment attachment = Attachment.createCommentAttachment(task, comment, file.getOriginalFilename(), fileUrl, file.getSize());
+        commandAttachmentPort.save(attachment);
+    }
+
+    private void publishNotification(Member receiver, Task task, String message, String commenterName) {
+        sendNotificationService.sendPushNotification(receiver, NotificationType.COMMENT, task, message, commenterName);
     }
 
 }
diff --git a/src/main/java/clap/server/common/constants/FilePathConstants.java b/src/main/java/clap/server/common/constants/FilePathConstants.java
index 0b13ec57..3d2e6fd5 100644
--- a/src/main/java/clap/server/common/constants/FilePathConstants.java
+++ b/src/main/java/clap/server/common/constants/FilePathConstants.java
@@ -8,6 +8,7 @@
 public enum FilePathConstants {
     TASK_IMAGE("task/image"),
     TASK_DOCUMENT("task/docs"),
+    TASK_COMMENT("task/comments"),
     MEMBER_IMAGE("member"),
     ;
     private final String path;

From 040edebd5a34079c02491b9a7a86958d4a8e6ba8 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 21:46:26 +0900
Subject: [PATCH 13/14] =?UTF-8?q?CLAP-211=20Remove:=20=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=20=EC=97=86=EB=8A=94=20=EC=95=A0=EB=84=88=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EC=85=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #214
---
 .../server/domain/policy/task/TaskOrderCalculationPolicy.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java b/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
index 0cf0a7fe..bd73e31e 100644
--- a/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
@@ -4,11 +4,9 @@
 import clap.server.domain.model.task.Task;
 import clap.server.exception.DomainException;
 import clap.server.exception.code.TaskErrorCode;
-import lombok.RequiredArgsConstructor;
 
 import static clap.server.domain.policy.task.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
 
-@RequiredArgsConstructor
 @Policy
 public class TaskOrderCalculationPolicy {
 

From 5643f716633cc519d04d61973bc258b2bbbe30d9 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 21:49:42 +0900
Subject: [PATCH 14/14] =?UTF-8?q?CLAP-211=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=20=EB=B3=B4=EB=93=9C=20=EC=A1=B0=ED=9A=8C=20get=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/inbound/web/task/TaskBoardController.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
index 404d5c4c..954fa0a5 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
@@ -40,12 +40,12 @@ public class TaskBoardController {
 
     @Operation(summary = "작업 보드 조회 API")
     @Secured({"ROLE_MANAGER"})
-    @PostMapping
+    @GetMapping
     public ResponseEntity<TaskBoardResponse> getTaskBoard(@RequestParam(defaultValue = "0") int page,
                                                           @RequestParam(defaultValue = "20") int pageSize,
-                                                          @Parameter(description = "완료 일자 조회 기준, yyyy-mm-dd 형식으로 입력합니다.") @RequestParam(required = false)
+                                                          @Parameter(description = "작업 완료 일자 조회 기준, yyyy-mm-dd 형식으로 입력합니다.") @RequestParam(required = false)
                                                           @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate untilDate,
-                                                          @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "필터링 조회 request") @RequestBody(required = false) FilterTaskBoardRequest request,
+                                                          @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "필터링 조회 request") @ModelAttribute FilterTaskBoardRequest request,
                                                           @AuthenticationPrincipal SecurityUserDetails userInfo) {
         Pageable pageable = PageRequest.of(page, pageSize);
         if (request != null) {