From 5907785dcabc01b9b2cdda2f9833a623ec04b232 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:17:56 +0900
Subject: [PATCH 01/53] =?UTF-8?q?CLAP-213=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 d3bac55634361f24a2f2162066b1ea3039839ada Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:19:35 +0900
Subject: [PATCH 02/53] =?UTF-8?q?CLAP-213=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 dd55e7a0964daa631b9bc0473e94bee0fc602bfe Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:37:45 +0900
Subject: [PATCH 03/53] =?UTF-8?q?CLAP-213=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 6b3903df88fa3ee45e7e9024ac7052cea90572e0 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:38:11 +0900
Subject: [PATCH 04/53] =?UTF-8?q?CLAP-213=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 3efd4f914454510d4a35a620b2454421ae94a8e9 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 16:59:11 +0900
Subject: [PATCH 05/53] =?UTF-8?q?CLAP-213=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 a757b537c7b9c962d50a0854a2a1e93d04f7c923 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:22:06 +0900
Subject: [PATCH 06/53] =?UTF-8?q?CLAP-213=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 955854d375e06aa76b43d16acf31ff1ad1715282 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:23:17 +0900
Subject: [PATCH 07/53] =?UTF-8?q?CLAP-213=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 c6097d0670e3cf0970dc300bf3025357abb266a8 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:24:39 +0900
Subject: [PATCH 08/53] =?UTF-8?q?CLAP-213=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 0a319e3cb64fc48a5b946c3fad854f8b5f4838df Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:44:56 +0900
Subject: [PATCH 09/53] =?UTF-8?q?CLAP-213=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 1d3673f65900f3dbcdca4f3dccd4717a60d3d711 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 17:46:10 +0900
Subject: [PATCH 10/53] =?UTF-8?q?CLAP-213=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

---
 .../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 2849397981e18f823d2c12ed73f8d432552c47cb Mon Sep 17 00:00:00 2001
From: Sihun23 <gcsw16@Gachonui-MacBookPro-2.local>
Date: Sun, 26 Jan 2025 05:40:24 +0900
Subject: [PATCH 11/53] conflict solve

---
 .../inbound/web/member/MemberController.java  | 29 +++++++++++
 .../web/member/RetrieveAllMemberResponse.java | 27 ++++++++++
 .../persistense/MemberPersistenceAdapter.java | 49 ++++++++++++++++---
 .../repository/member/MemberRepository.java   |  3 ++
 .../mapper/RetrieveAllMemberMapper.java       | 28 +++++++++++
 .../port/outbound/member/LoadMemberPort.java  | 12 ++++-
 6 files changed, 138 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/member/RetrieveAllMemberResponse.java
 create mode 100644 src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java b/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
new file mode 100644
index 00000000..916ad50e
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
@@ -0,0 +1,29 @@
+package clap.server.adapter.inbound.web.member;
+
+import clap.server.application.mapper.RetrieveAllMemberMapper;
+import clap.server.application.port.inbound.management.FindAllMemberUsecase;
+import clap.server.domain.model.member.Member;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/members")
+@RequiredArgsConstructor
+public class MemberController {
+    private final FindAllMemberUsecase findAllMemberUsecase;
+    private final RetrieveAllMemberMapper retrieveAllMemberMapper;
+
+    @Operation(summary = "전체 회원 조회 API", description = "모든 회원 정보를 반환합니다.")
+    @GetMapping
+    public ResponseEntity<List<RetrieveAllMemberResponse>> getAllMembers() {
+        List<Member> members = findAllMemberUsecase.findAllMembers();
+        List<RetrieveAllMemberResponse> response = retrieveAllMemberMapper.toResponseList(members);
+        return ResponseEntity.ok(response);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/member/RetrieveAllMemberResponse.java b/src/main/java/clap/server/adapter/inbound/web/member/RetrieveAllMemberResponse.java
new file mode 100644
index 00000000..21915116
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/member/RetrieveAllMemberResponse.java
@@ -0,0 +1,27 @@
+package clap.server.adapter.inbound.web.member;
+
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record RetrieveAllMemberResponse(
+        @Schema(description = "회원 이름", example = "양시훈")
+        String name,
+
+        @Schema(description = "회원 이메일", example = "sihun123@gmail.com")
+        String email,
+
+        @Schema(description = "회원 닉네임, 로그인할 때 쓰입니다.", example = "leo.sh")
+        String nickname,
+
+        @Schema(description = "승인 권한 여부", example = "true")
+        Boolean isReviewer,
+
+        @Schema(description = "부서 ID", example = "1")
+        Long departmentId,
+
+        @Schema(description = "회원 역할", example = "ROLE_USER")
+        MemberRole role,
+
+        @Schema(description = "회원 직책", example = "개발자")
+        String departmentRole
+) {}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index f07be47c..bfd5cfeb 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -1,24 +1,33 @@
 package clap.server.adapter.outbound.persistense;
 
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.domain.model.task.Task;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus ;
+import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
+import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
+import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
+import java.util.stream.Collectors;
+import java.util.List;
+
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;
 
-import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 @PersistenceAdapter
 @RequiredArgsConstructor
     public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
     private final MemberRepository memberRepository;
     private final MemberPersistenceMapper memberPersistenceMapper;
+    private final TaskRepository taskRepository;
+    private final TaskPersistenceMapper taskPersistenceMapper;
 
 
     @Override
@@ -48,17 +57,41 @@ public List<Member> findReviewers() {
                 .collect(Collectors.toList());
     }
 
-    @Override
-    public Optional<Member> findReviewerById(Long id) {
-        Optional<MemberEntity> memberEntity =  memberRepository.findByMemberIdAndIsReviewerTrue(id);
-        return memberEntity.map(memberPersistenceMapper::toDomain);
-    }
-
     @Override
     public void save(final Member member) {
         MemberEntity memberEntity = memberPersistenceMapper.toEntity(member);
         memberRepository.save(memberEntity);
     }
 
+    @Override
+    public List<Member> findActiveManagers() {
+        List<MemberEntity> memberEntities = memberRepository.findByRoleAndStatus(MemberRole.valueOf("ROLE_MANAGER"), MemberStatus.ACTIVE);
+        return memberEntities.stream()
+                .map(memberPersistenceMapper::toDomain)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public int getRemainingTasks(Long memberId) {
+        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED);
+        return findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
+    }
+
+
+    @Override
+    public List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> taskStatuses) {
+        List<TaskEntity> taskEntities = taskRepository.findByProcessor_MemberIdAndTaskStatusIn(memberId, taskStatuses);
+        return taskEntities.stream()
+                .map(taskPersistenceMapper::toDomain)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Member> findAllMembers() {
+        List<MemberEntity> entities = memberRepository.findAll();
+        return entities.stream()
+                .map(memberPersistenceMapper::toDomain)
+                .toList();
+    }
 }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
index e1bd0b45..38e57d6f 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
@@ -22,6 +22,9 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long> {
 
     List<MemberEntity> findByIsReviewerTrue();
 
+    List<MemberEntity> findAll(); // 전체 회원 조회
+
+
     Optional<MemberEntity> findByMemberIdAndIsReviewerTrue(Long memberId);
 }
 
diff --git a/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java b/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java
new file mode 100644
index 00000000..b7cfe47a
--- /dev/null
+++ b/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java
@@ -0,0 +1,28 @@
+package clap.server.application.mapper;
+
+import clap.server.adapter.inbound.web.member.RetrieveAllMemberResponse;
+import clap.server.domain.model.member.Member;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class RetrieveAllMemberMapper {
+    public List<RetrieveAllMemberResponse> toResponseList(List<Member> members) {
+        return members.stream()
+                .map(this::toResponse)
+                .toList();
+    }
+
+    public RetrieveAllMemberResponse toResponse(Member member) {
+        return new RetrieveAllMemberResponse(
+                member.getMemberInfo().getName(),
+                member.getMemberInfo().getEmail(),
+                member.getMemberInfo().getNickname(),
+                member.getMemberInfo().isReviewer(),
+                member.getMemberInfo().getDepartment().getDepartmentId(),
+                member.getMemberInfo().getRole(),
+                member.getMemberInfo().getDepartmentRole()
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
index 70c04c75..4d47a5fc 100644
--- a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
@@ -1,7 +1,8 @@
 package clap.server.application.port.outbound.member;
 
 import clap.server.domain.model.member.Member;
-
+import clap.server.domain.model.task.Task;  // Task 클래스 임포트 확인
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; // TaskStatus 임포트
 import java.util.List;
 import java.util.Optional;
 
@@ -10,10 +11,17 @@ public interface LoadMemberPort {
 
     Optional<Member> findActiveMemberById(Long id);
 
+    List<Member> findActiveManagers();
+
+    List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> taskStatuses);
+
+    int getRemainingTasks(Long memberId);
+
     Optional<Member> findByNickname(String nickname);
 
     List<Member> findReviewers();
 
-    Optional<Member> findReviewerById(Long id);
+    List<Member> findAllMembers(); // 전체 회원 조회
+
 
 }

From 178c6a51e55db3494abf174d161d9369839f2e9a Mon Sep 17 00:00:00 2001
From: Sihun23 <gcsw16@Gachonui-MacBookPro-2.local>
Date: Wed, 29 Jan 2025 03:47:05 +0900
Subject: [PATCH 12/53] merge conflict solve

---
 .../inbound/web/member/MemberController.java  | 30 +++++++++++++++----
 .../persistense/MemberPersistenceAdapter.java | 11 +++----
 .../port/outbound/member/LoadMemberPort.java  |  6 ++--
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java b/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
index 916ad50e..cc814280 100644
--- a/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
@@ -4,14 +4,19 @@
 import clap.server.application.port.inbound.management.FindAllMemberUsecase;
 import clap.server.domain.model.member.Member;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/api/members")
 @RequiredArgsConstructor
@@ -19,11 +24,24 @@ public class MemberController {
     private final FindAllMemberUsecase findAllMemberUsecase;
     private final RetrieveAllMemberMapper retrieveAllMemberMapper;
 
-    @Operation(summary = "전체 회원 조회 API", description = "모든 회원 정보를 반환합니다.")
+    @Tag(name = "Admin")
+    @Secured({"ROLE_ADMIN"})
+    @Operation(
+            summary = "전체 회원 조회 API",
+            description = "모든 회원 정보를 페이징 처리하여 반환합니다.",
+            parameters = {
+                    @Parameter(name = "page", description = "조회할 페이지 번호 (1부터 시작, 기본값: 1)", example = "1"),
+                    @Parameter(name = "size", description = "페이지 당 회원 수 (기본값: 20)", example = "20")
+            }
+    )
     @GetMapping
-    public ResponseEntity<List<RetrieveAllMemberResponse>> getAllMembers() {
-        List<Member> members = findAllMemberUsecase.findAllMembers();
-        List<RetrieveAllMemberResponse> response = retrieveAllMemberMapper.toResponseList(members);
+    public ResponseEntity<Page<RetrieveAllMemberResponse>> getAllMembers(
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "20") int size) {
+
+        Pageable pageable = PageRequest.of(page, size);
+        Page<Member> members = findAllMemberUsecase.findAllMembers(pageable);
+        Page<RetrieveAllMemberResponse> response = members.map(retrieveAllMemberMapper::toResponse);
         return ResponseEntity.ok(response);
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index bfd5cfeb..3b886af7 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -13,11 +13,14 @@
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
 import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
+
 import java.util.stream.Collectors;
 import java.util.List;
 
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 
 import java.util.Optional;
 
@@ -87,11 +90,9 @@ public List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> t
     }
 
     @Override
-    public List<Member> findAllMembers() {
-        List<MemberEntity> entities = memberRepository.findAll();
-        return entities.stream()
-                .map(memberPersistenceMapper::toDomain)
-                .toList();
+    public Page<Member> findAllMembers(Pageable pageable) {
+        Page<MemberEntity> entities = memberRepository.findAll(pageable);
+        return entities.map(memberPersistenceMapper::toDomain);
     }
 }
 
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
index 4d47a5fc..8df83cc8 100644
--- a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
@@ -3,6 +3,9 @@
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;  // Task 클래스 임포트 확인
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; // TaskStatus 임포트
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
 import java.util.List;
 import java.util.Optional;
 
@@ -21,7 +24,6 @@ public interface LoadMemberPort {
 
     List<Member> findReviewers();
 
-    List<Member> findAllMembers(); // 전체 회원 조회
-
+    Page<Member> findAllMembers(Pageable pageable);
 
 }

From 167691a3b78582b134c98c8b994d660ed25f6c26 Mon Sep 17 00:00:00 2001
From: Sihun23 <gcsw16@Gachonui-MacBookPro-2.local>
Date: Wed, 29 Jan 2025 04:30:01 +0900
Subject: [PATCH 13/53] merge conflict solve

---
 .../web/dto/admin/FindMemberRequest.java      | 23 +++++++++++++
 .../inbound/web/member/MemberController.java  | 27 ++++++++++------
 .../persistense/MemberPersistenceAdapter.java |  8 +++++
 .../repository/member/MemberRepository.java   |  3 +-
 .../specification/MemberSpecification.java    | 32 +++++++++++++++++++
 .../port/outbound/member/LoadMemberPort.java  |  4 +++
 6 files changed, 86 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMemberRequest.java
 create mode 100644 src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMemberRequest.java
new file mode 100644
index 00000000..f94708ac
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMemberRequest.java
@@ -0,0 +1,23 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class FindMemberRequest {
+    @Schema(description = "회원 이름", example = "양시훈")
+    private String name;
+
+    @Schema(description = "회원 이메일", example = "sihun123@gmail.com")
+    private String email;
+
+    @Schema(description = "회원 닉네임", example = "leo.sh")
+    private String nickname;
+
+    @Schema(description = "부서 ID", example = "1")
+    private Long departmentId;
+
+    @Schema(description = "회원 역할", example = "ROLE_USER")
+    private MemberRole role;
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java b/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
index cc814280..e226f120 100644
--- a/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
@@ -1,5 +1,6 @@
 package clap.server.adapter.inbound.web.member;
 
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.application.mapper.RetrieveAllMemberMapper;
 import clap.server.application.port.inbound.management.FindAllMemberUsecase;
 import clap.server.domain.model.member.Member;
@@ -12,10 +13,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/members")
@@ -28,20 +26,29 @@ public class MemberController {
     @Secured({"ROLE_ADMIN"})
     @Operation(
             summary = "전체 회원 조회 API",
-            description = "모든 회원 정보를 페이징 처리하여 반환합니다.",
+            description = "모든 회원 정보를 페이징 처리하여 반환하거나 조건에 맞는 회원 정보를 반환합니다.",
             parameters = {
-                    @Parameter(name = "page", description = "조회할 페이지 번호 (1부터 시작, 기본값: 1)", example = "1"),
+                    @Parameter(name = "page", description = "조회할 페이지 번호 (0부터 시작, 기본값: 0)", example = "0"),
                     @Parameter(name = "size", description = "페이지 당 회원 수 (기본값: 20)", example = "20")
             }
     )
     @GetMapping
     public ResponseEntity<Page<RetrieveAllMemberResponse>> getAllMembers(
-            @RequestParam(defaultValue = "1") int page,
-            @RequestParam(defaultValue = "20") int size) {
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "20") int size,
+            @ModelAttribute FindMemberRequest filterRequest) {
 
         Pageable pageable = PageRequest.of(page, size);
-        Page<Member> members = findAllMemberUsecase.findAllMembers(pageable);
+        Page<Member> members;
+
+        if (filterRequest.getName() != null || filterRequest.getEmail() != null || filterRequest.getNickname() != null ||
+                filterRequest.getDepartmentId() != null || filterRequest.getRole() != null) {
+            members = findAllMemberUsecase.findMembersWithFilter(pageable, filterRequest);
+        } else {
+            members = findAllMemberUsecase.findAllMembers(pageable);
+        }
+
         Page<RetrieveAllMemberResponse> response = members.map(retrieveAllMemberMapper::toResponse);
         return ResponseEntity.ok(response);
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index 3b886af7..3a71b13a 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -1,10 +1,12 @@
 package clap.server.adapter.outbound.persistense;
 
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
+import clap.server.adapter.outbound.persistense.specification.MemberSpecification;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
@@ -94,5 +96,11 @@ public Page<Member> findAllMembers(Pageable pageable) {
         Page<MemberEntity> entities = memberRepository.findAll(pageable);
         return entities.map(memberPersistenceMapper::toDomain);
     }
+
+    @Override
+    public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
+        Page<MemberEntity> entities = memberRepository.findAll(MemberSpecification.withFilter(filterRequest), pageable);
+        return entities.map(memberPersistenceMapper::toDomain);
+    }
 }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
index 38e57d6f..e4f64a10 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
@@ -4,13 +4,14 @@
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface MemberRepository extends JpaRepository<MemberEntity, Long> {
+public interface MemberRepository extends JpaRepository<MemberEntity, Long>, JpaSpecificationExecutor<MemberEntity> {
 
 
     List<MemberEntity> findByRoleAndStatus(MemberRole role, MemberStatus status);
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java b/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java
new file mode 100644
index 00000000..58dfc355
--- /dev/null
+++ b/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java
@@ -0,0 +1,32 @@
+package clap.server.adapter.outbound.persistense.specification;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import org.springframework.data.jpa.domain.Specification;
+
+public class MemberSpecification {
+
+    public static Specification<MemberEntity> withFilter(FindMemberRequest filterRequest) {
+        return (root, query, cb) -> {
+            var predicates = cb.conjunction();
+
+            if (filterRequest.getName() != null) {
+                predicates = cb.and(predicates, cb.like(root.get("name"), "%" + filterRequest.getName() + "%"));
+            }
+            if (filterRequest.getEmail() != null) {
+                predicates = cb.and(predicates, cb.like(root.get("email"), "%" + filterRequest.getEmail() + "%"));
+            }
+            if (filterRequest.getNickname() != null) {
+                predicates = cb.and(predicates, cb.like(root.get("nickname"), "%" + filterRequest.getNickname() + "%"));
+            }
+            if (filterRequest.getDepartmentId() != null) {
+                predicates = cb.and(predicates, cb.equal(root.get("departmentId"), filterRequest.getDepartmentId()));
+            }
+            if (filterRequest.getRole() != null) {
+                predicates = cb.and(predicates, cb.equal(root.get("role"), filterRequest.getRole()));
+            }
+
+            return predicates;
+        };
+    }
+}
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
index 8df83cc8..60749793 100644
--- a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
@@ -1,5 +1,6 @@
 package clap.server.application.port.outbound.member;
 
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;  // Task 클래스 임포트 확인
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; // TaskStatus 임포트
@@ -26,4 +27,7 @@ public interface LoadMemberPort {
 
     Page<Member> findAllMembers(Pageable pageable);
 
+    Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest);
+
+
 }

From f1d307521ca777db286f6e350e17a00b31f5a97d Mon Sep 17 00:00:00 2001
From: Sihun23 <gcsw16@Gachonui-MacBookPro-2.local>
Date: Wed, 29 Jan 2025 04:37:52 +0900
Subject: [PATCH 14/53] =?UTF-8?q?CLAP-118=20fix:'=EC=82=AD=EC=A0=9C'?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=EC=9D=98=20=ED=9A=8C=EC=9B=90=EC=9D=80=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=97=90=EC=84=9C=20=EC=A0=9C=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outbound/persistense/MemberPersistenceAdapter.java |  3 ++-
 .../persistense/specification/MemberSpecification.java | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index 3a71b13a..cbd1c79c 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -93,7 +93,7 @@ public List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> t
 
     @Override
     public Page<Member> findAllMembers(Pageable pageable) {
-        Page<MemberEntity> entities = memberRepository.findAll(pageable);
+        Page<MemberEntity> entities = memberRepository.findAll(MemberSpecification.isNotDeleted(), pageable);
         return entities.map(memberPersistenceMapper::toDomain);
     }
 
@@ -101,6 +101,7 @@ public Page<Member> findAllMembers(Pageable pageable) {
     public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
         Page<MemberEntity> entities = memberRepository.findAll(MemberSpecification.withFilter(filterRequest), pageable);
         return entities.map(memberPersistenceMapper::toDomain);
+
     }
 }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java b/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java
index 58dfc355..8d376c32 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java
@@ -2,14 +2,24 @@
 
 import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import org.springframework.data.jpa.domain.Specification;
 
 public class MemberSpecification {
 
+    // DELETED 상태 제외
+    public static Specification<MemberEntity> isNotDeleted() {
+        return (root, query, cb) -> cb.notEqual(root.get("status"), MemberStatus.DELETED);
+    }
+
     public static Specification<MemberEntity> withFilter(FindMemberRequest filterRequest) {
         return (root, query, cb) -> {
             var predicates = cb.conjunction();
 
+            // DELETED 상태가 아닌 회원만 기본으로 조회
+            predicates = cb.and(predicates, isNotDeleted().toPredicate(root, query, cb));
+
+
             if (filterRequest.getName() != null) {
                 predicates = cb.and(predicates, cb.like(root.get("name"), "%" + filterRequest.getName() + "%"));
             }

From c62b532f3af33828575e383534b4e29c280b7d0e Mon Sep 17 00:00:00 2001
From: Sihun23 <gcsw16@Gachonui-MacBookPro-2.local>
Date: Wed, 29 Jan 2025 19:28:01 +0900
Subject: [PATCH 15/53] CLAP-118 fix:Controller,dto Rename

---
 .../web/{member => dto/admin}/RetrieveAllMemberResponse.java | 2 +-
 .../{MemberController.java => FindMemberController.java}     | 5 +++--
 .../server/application/mapper/RetrieveAllMemberMapper.java   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename src/main/java/clap/server/adapter/inbound/web/{member => dto/admin}/RetrieveAllMemberResponse.java (94%)
 rename src/main/java/clap/server/adapter/inbound/web/member/{MemberController.java => FindMemberController.java} (94%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/member/RetrieveAllMemberResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/RetrieveAllMemberResponse.java
similarity index 94%
rename from src/main/java/clap/server/adapter/inbound/web/member/RetrieveAllMemberResponse.java
rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/RetrieveAllMemberResponse.java
index 21915116..33c1e08f 100644
--- a/src/main/java/clap/server/adapter/inbound/web/member/RetrieveAllMemberResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/RetrieveAllMemberResponse.java
@@ -1,4 +1,4 @@
-package clap.server.adapter.inbound.web.member;
+package clap.server.adapter.inbound.web.dto.admin;
 
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java b/src/main/java/clap/server/adapter/inbound/web/member/FindMemberController.java
similarity index 94%
rename from src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
rename to src/main/java/clap/server/adapter/inbound/web/member/FindMemberController.java
index e226f120..fedb0dda 100644
--- a/src/main/java/clap/server/adapter/inbound/web/member/MemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/member/FindMemberController.java
@@ -1,6 +1,7 @@
 package clap.server.adapter.inbound.web.member;
 
 import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse;
 import clap.server.application.mapper.RetrieveAllMemberMapper;
 import clap.server.application.port.inbound.management.FindAllMemberUsecase;
 import clap.server.domain.model.member.Member;
@@ -18,11 +19,11 @@
 @RestController
 @RequestMapping("/api/members")
 @RequiredArgsConstructor
-public class MemberController {
+public class FindMemberController {
     private final FindAllMemberUsecase findAllMemberUsecase;
     private final RetrieveAllMemberMapper retrieveAllMemberMapper;
 
-    @Tag(name = "Admin")
+    @Tag(name = "05. Admin")
     @Secured({"ROLE_ADMIN"})
     @Operation(
             summary = "전체 회원 조회 API",
diff --git a/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java b/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java
index b7cfe47a..f48de77b 100644
--- a/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java
+++ b/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java
@@ -1,6 +1,6 @@
 package clap.server.application.mapper;
 
-import clap.server.adapter.inbound.web.member.RetrieveAllMemberResponse;
+import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse;
 import clap.server.domain.model.member.Member;
 import org.springframework.stereotype.Component;
 

From 2f5f00bb77b02f79994ac32c905dc4fa8b3fa2ab Mon Sep 17 00:00:00 2001
From: Sihun23 <gcsw16@Gachonui-MacBookPro-2.local>
Date: Wed, 29 Jan 2025 19:36:30 +0900
Subject: [PATCH 16/53] =?UTF-8?q?CLAP-118=20fix:Controller=20=ED=8C=A8?=
 =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=97=94=EB=93=9C=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inbound/web/{member => admin}/FindMemberController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename src/main/java/clap/server/adapter/inbound/web/{member => admin}/FindMemberController.java (95%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/member/FindMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
similarity index 95%
rename from src/main/java/clap/server/adapter/inbound/web/member/FindMemberController.java
rename to src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
index fedb0dda..5b9bb56a 100644
--- a/src/main/java/clap/server/adapter/inbound/web/member/FindMemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
@@ -1,4 +1,4 @@
-package clap.server.adapter.inbound.web.member;
+package clap.server.adapter.inbound.web.admin;
 
 import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse;
@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/members")
+@RequestMapping("/api/managements")
 @RequiredArgsConstructor
 public class FindMemberController {
     private final FindAllMemberUsecase findAllMemberUsecase;
@@ -33,7 +33,7 @@ public class FindMemberController {
                     @Parameter(name = "size", description = "페이지 당 회원 수 (기본값: 20)", example = "20")
             }
     )
-    @GetMapping
+    @GetMapping("/members")
     public ResponseEntity<Page<RetrieveAllMemberResponse>> getAllMembers(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int size,

From 12e32fc801861af74f7132e5de43369da8a6c142 Mon Sep 17 00:00:00 2001
From: Sihun23 <gcsw16@Gachonui-MacBookPro-2.local>
Date: Fri, 31 Jan 2025 18:44:00 +0900
Subject: [PATCH 17/53] merge conflict solve

---
 .../web/admin/FindMemberController.java       | 11 ++--
 .../persistense/MemberPersistenceAdapter.java | 63 +++++++++++++++++--
 .../specification/MemberSpecification.java    | 42 -------------
 .../port/inbound/domain/MemberService.java    | 33 +++++++---
 .../service/member/FindAllMembersService.java | 20 ++++++
 .../member/FindMembersWithFilterService.java  | 21 +++++++
 6 files changed, 131 insertions(+), 59 deletions(-)
 delete mode 100644 src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java
 create mode 100644 src/main/java/clap/server/application/service/member/FindAllMembersService.java
 create mode 100644 src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
index 5b9bb56a..28a18ec7 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
@@ -3,7 +3,8 @@
 import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse;
 import clap.server.application.mapper.RetrieveAllMemberMapper;
-import clap.server.application.port.inbound.management.FindAllMemberUsecase;
+import clap.server.application.port.inbound.management.FindAllMembersUsecase;
+import clap.server.application.port.inbound.management.FindMembersWithFilterUsecase;
 import clap.server.domain.model.member.Member;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -20,7 +21,8 @@
 @RequestMapping("/api/managements")
 @RequiredArgsConstructor
 public class FindMemberController {
-    private final FindAllMemberUsecase findAllMemberUsecase;
+    private final FindAllMembersUsecase findAllMembersUsecase;
+    private final FindMembersWithFilterUsecase findMembersWithFilterUsecase;
     private final RetrieveAllMemberMapper retrieveAllMemberMapper;
 
     @Tag(name = "05. Admin")
@@ -44,11 +46,12 @@ public ResponseEntity<Page<RetrieveAllMemberResponse>> getAllMembers(
 
         if (filterRequest.getName() != null || filterRequest.getEmail() != null || filterRequest.getNickname() != null ||
                 filterRequest.getDepartmentId() != null || filterRequest.getRole() != null) {
-            members = findAllMemberUsecase.findMembersWithFilter(pageable, filterRequest);
+            members = findMembersWithFilterUsecase.findMembersWithFilter(pageable, filterRequest);
         } else {
-            members = findAllMemberUsecase.findAllMembers(pageable);
+            members = findAllMembersUsecase.findAllMembers(pageable);
         }
 
+
         Page<RetrieveAllMemberResponse> response = members.map(retrieveAllMemberMapper::toResponse);
         return ResponseEntity.ok(response);
     }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index cbd1c79c..39630c88 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -6,7 +6,6 @@
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
-import clap.server.adapter.outbound.persistense.specification.MemberSpecification;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
@@ -20,12 +19,17 @@
 import java.util.List;
 
 import clap.server.domain.model.member.Member;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
 import java.util.Optional;
 
+import static clap.server.adapter.outbound.persistense.entity.member.QMemberEntity.memberEntity;
+
 @PersistenceAdapter
 @RequiredArgsConstructor
     public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
@@ -33,7 +37,7 @@ public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPo
     private final MemberPersistenceMapper memberPersistenceMapper;
     private final TaskRepository taskRepository;
     private final TaskPersistenceMapper taskPersistenceMapper;
-
+    private final JPAQueryFactory jpaQueryFactory;
 
     @Override
     public Optional<Member> findById(final Long id) {
@@ -93,15 +97,62 @@ public List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> t
 
     @Override
     public Page<Member> findAllMembers(Pageable pageable) {
-        Page<MemberEntity> entities = memberRepository.findAll(MemberSpecification.isNotDeleted(), pageable);
-        return entities.map(memberPersistenceMapper::toDomain);
+        return executeQueryWithPageable(pageable, new BooleanBuilder().and(memberEntity.status.ne(MemberStatus.DELETED)));
     }
 
     @Override
     public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
-        Page<MemberEntity> entities = memberRepository.findAll(MemberSpecification.withFilter(filterRequest), pageable);
-        return entities.map(memberPersistenceMapper::toDomain);
+        BooleanBuilder whereClause = createMemberFilter(filterRequest);
+        return executeQueryWithPageable(pageable, whereClause);
+    }
 
+    // 공통 쿼리 처리
+    private Page<Member> executeQueryWithPageable(Pageable pageable, BooleanBuilder whereClause) {
+        List<MemberEntity> entities = jpaQueryFactory
+                .selectFrom(memberEntity)
+                .where(whereClause)
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .fetch();
+
+        long total = jpaQueryFactory
+                .select(memberEntity.count())
+                .from(memberEntity)
+                .where(whereClause)
+                .fetchOne();
+
+        return new PageImpl<>(
+                entities.stream()
+                        .map(memberPersistenceMapper::toDomain)
+                        .toList(),
+                pageable,
+                total
+        );
+    }
+
+    // 필터 조건 생성
+    private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
+        BooleanBuilder whereClause = new BooleanBuilder();
+        whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
+
+        if (filterRequest.getName() != null) {
+            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.getName()));
+        }
+        if (filterRequest.getEmail() != null) {
+            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.getEmail()));
+        }
+        if (filterRequest.getNickname() != null) {
+            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.getNickname()));
+        }
+        if (filterRequest.getDepartmentId() != null) {
+            whereClause.and(memberEntity.department.departmentId.eq(filterRequest.getDepartmentId()));
+        }
+        if (filterRequest.getRole() != null) {
+            whereClause.and(memberEntity.role.eq(filterRequest.getRole()));
+        }
+
+        return whereClause;
     }
 }
 
+
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java b/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java
deleted file mode 100644
index 8d376c32..00000000
--- a/src/main/java/clap/server/adapter/outbound/persistense/specification/MemberSpecification.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package clap.server.adapter.outbound.persistense.specification;
-
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
-import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
-import org.springframework.data.jpa.domain.Specification;
-
-public class MemberSpecification {
-
-    // DELETED 상태 제외
-    public static Specification<MemberEntity> isNotDeleted() {
-        return (root, query, cb) -> cb.notEqual(root.get("status"), MemberStatus.DELETED);
-    }
-
-    public static Specification<MemberEntity> withFilter(FindMemberRequest filterRequest) {
-        return (root, query, cb) -> {
-            var predicates = cb.conjunction();
-
-            // DELETED 상태가 아닌 회원만 기본으로 조회
-            predicates = cb.and(predicates, isNotDeleted().toPredicate(root, query, cb));
-
-
-            if (filterRequest.getName() != null) {
-                predicates = cb.and(predicates, cb.like(root.get("name"), "%" + filterRequest.getName() + "%"));
-            }
-            if (filterRequest.getEmail() != null) {
-                predicates = cb.and(predicates, cb.like(root.get("email"), "%" + filterRequest.getEmail() + "%"));
-            }
-            if (filterRequest.getNickname() != null) {
-                predicates = cb.and(predicates, cb.like(root.get("nickname"), "%" + filterRequest.getNickname() + "%"));
-            }
-            if (filterRequest.getDepartmentId() != null) {
-                predicates = cb.and(predicates, cb.equal(root.get("departmentId"), filterRequest.getDepartmentId()));
-            }
-            if (filterRequest.getRole() != null) {
-                predicates = cb.and(predicates, cb.equal(root.get("role"), filterRequest.getRole()));
-            }
-
-            return predicates;
-        };
-    }
-}
diff --git a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
index 246b122d..6030f267 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
@@ -1,8 +1,8 @@
 package clap.server.application.port.inbound.domain;
 
-import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.domain.model.member.Member;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -14,8 +14,6 @@
 @RequiredArgsConstructor
 public class MemberService {
     private final LoadMemberPort loadMemberPort;
-    private final CommandMemberPort commandMemberPort;
-
 
     public Member findById(Long memberId) {
         return loadMemberPort.findById(memberId).orElseThrow(
@@ -27,10 +25,31 @@ public Member findActiveMember(Long memberId) {
                 () -> new ApplicationException(MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND));
     }
 
-    public Member findReviewer(Long memberId) {
-        return loadMemberPort.findReviewerById(memberId).orElseThrow(
-                ()-> new ApplicationException(MemberErrorCode.NOT_A_REVIEWER)
-        );
+    public int getRemainingTasks(Long memberId) {
+        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED);
+        return loadMemberPort.findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
+    }
+
+    public String getMemberNickname(Long memberId) {
+        Member member = findById(memberId);
+        if (member.getMemberInfo() == null) {
+            throw new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND);
+        }
+        return member.getMemberInfo().getNickname();
+    }
+
+    public String getMemberImageUrl(Long memberId) {
+        Member member = findById(memberId);
+        return member.getImageUrl() != null ? member.getImageUrl() : "default-image-url";
+    }
+
+    public List<Member> findActiveManagers() {
+        List<Member> activeManagers = loadMemberPort.findActiveManagers();
+
+        if (activeManagers.isEmpty()) {
+            return List.of();
+        }
+        return activeManagers;
     }
 
     public List<Member> findReviewers() {
diff --git a/src/main/java/clap/server/application/service/member/FindAllMembersService.java b/src/main/java/clap/server/application/service/member/FindAllMembersService.java
new file mode 100644
index 00000000..4467bd84
--- /dev/null
+++ b/src/main/java/clap/server/application/service/member/FindAllMembersService.java
@@ -0,0 +1,20 @@
+package clap.server.application.service.member;
+
+import clap.server.application.port.inbound.management.FindAllMembersUsecase;
+import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.domain.model.member.Member;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class FindAllMembersService implements FindAllMembersUsecase {
+    private final LoadMemberPort loadMemberPort;
+
+    @Override
+    public Page<Member> findAllMembers(Pageable pageable) {
+        return loadMemberPort.findAllMembers(pageable);
+    }
+}
diff --git a/src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java b/src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java
new file mode 100644
index 00000000..c13176e7
--- /dev/null
+++ b/src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java
@@ -0,0 +1,21 @@
+package clap.server.application.service.member;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.application.port.inbound.management.FindMembersWithFilterUsecase;
+import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.domain.model.member.Member;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class FindMembersWithFilterService implements FindMembersWithFilterUsecase {
+    private final LoadMemberPort loadMemberPort;
+
+    @Override
+    public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
+        return loadMemberPort.findMembersWithFilter(pageable, filterRequest);
+    }
+}

From 13d42cbd8d19615f9ac5451580d6e94b9140d410 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 12:38:02 +0900
Subject: [PATCH 18/53] =?UTF-8?q?CLAP-156=20Feat:=20member=20table=20?=
 =?UTF-8?q?=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #134
---
 ...250202156__Drop_notification_enabled_column_from_member.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/main/resources/db/migration/dev/V20250202156__Drop_notification_enabled_column_from_member.sql

diff --git a/src/main/resources/db/migration/dev/V20250202156__Drop_notification_enabled_column_from_member.sql b/src/main/resources/db/migration/dev/V20250202156__Drop_notification_enabled_column_from_member.sql
new file mode 100644
index 00000000..d868643e
--- /dev/null
+++ b/src/main/resources/db/migration/dev/V20250202156__Drop_notification_enabled_column_from_member.sql
@@ -0,0 +1,3 @@
+ALTER TABLE member
+DROP
+COLUMN notification_enabled;
\ No newline at end of file

From 3b2b8975e0995f2b9430ee7c0f31d5e197306e93 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 12:43:08 +0900
Subject: [PATCH 19/53] =?UTF-8?q?CLAP-156=20Feat:=20dev/=20local=20?=
 =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=EC=97=90=20=EB=8C=80=ED=95=B4=20fly?=
 =?UTF-8?q?way=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #134
---
 src/main/resources/mysql.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mysql.yml b/src/main/resources/mysql.yml
index e2b7a114..c922ce91 100644
--- a/src/main/resources/mysql.yml
+++ b/src/main/resources/mysql.yml
@@ -21,15 +21,15 @@ spring.config.activate.on-profile: local
 
 spring:
   flyway:
-    enabled: false
+    enabled: true
     baseline-on-migrate: true
-    locations: classpath:db/migration
+    locations: classpath:db/migration/dev
   jpa:
     database: MySQL
     open-in-view: false
     generate-ddl: false
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     show-sql: true
     properties:
       hibernate:
@@ -56,14 +56,14 @@ spring:
     open-in-view: false
     generate-ddl: false
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     show-sql: true
     properties:
       hibernate:
         dialect: org.hibernate.dialect.MySQLDialect
 
   flyway:
-    enabled: false
+    enabled: true
     baseline-on-migrate: true
     locations: classpath:db/migration/dev
 

From 940d002f528b4a18316312f3a68a78925f38c024 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 12:48:32 +0900
Subject: [PATCH 20/53] =?UTF-8?q?CLAP-156=20Feat:=20=ED=8C=8C=EC=8A=A4?=
 =?UTF-8?q?=EC=B9=BC=20=EC=BC=80=EC=9D=B4=EC=8A=A4=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #134
---
 ...20250202156__Drop_Notification_Enabled_Column_From_Member.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/resources/db/migration/dev/{V20250202156__Drop_notification_enabled_column_from_member.sql => V20250202156__Drop_Notification_Enabled_Column_From_Member.sql} (100%)

diff --git a/src/main/resources/db/migration/dev/V20250202156__Drop_notification_enabled_column_from_member.sql b/src/main/resources/db/migration/dev/V20250202156__Drop_Notification_Enabled_Column_From_Member.sql
similarity index 100%
rename from src/main/resources/db/migration/dev/V20250202156__Drop_notification_enabled_column_from_member.sql
rename to src/main/resources/db/migration/dev/V20250202156__Drop_Notification_Enabled_Column_From_Member.sql

From 4a7dda0008bb6fc1bac5f217e36822bce6c0c945 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 13:56:49 +0900
Subject: [PATCH 21/53] =?UTF-8?q?CLAP-156=20Feat:=20test=ED=99=98=EA=B2=BD?=
 =?UTF-8?q?=20flyway=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/clap/server/TaskflowApplicationTests.java | 1 -
 src/test/resources/application.yml                      | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/clap/server/TaskflowApplicationTests.java b/src/test/java/clap/server/TaskflowApplicationTests.java
index 65422b39..e98ffb8d 100644
--- a/src/test/java/clap/server/TaskflowApplicationTests.java
+++ b/src/test/java/clap/server/TaskflowApplicationTests.java
@@ -14,7 +14,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-//@DataElasticsearchTest
 @Testcontainers
 @SpringBootTest
 class TaskflowApplicationTests {
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 470fc61a..015a4da0 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -7,12 +7,14 @@ spring:
   # Database 설정 정보 (H2 연동 정보)
   datasource:
     driver-class-name: org.h2.Driver  # H2 Database 사용
-    url: jdbc:h2:mem:testdb  # H2 접속 정보
+    url: jdbc:h2:mem:testdb;DATABASE_TO_UPPER=false  # H2 접속 정보
     username: taskflow  # H2 접속 시 입력할 username 정보
     password:  # H2 접속 시 입력할 password 정보
   jpa:
     hibernate:
       ddl-auto: create
+  flyway:
+    enabled: false
 
   mail:
     host: smtp.gmail.com

From dd626d320168da5bd2bb076253025c09d6b3c985 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 14:01:03 +0900
Subject: [PATCH 22/53] =?UTF-8?q?CLAP-156=20Feat:=20test=20=EC=BB=A8?=
 =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=84=88=EC=97=90=20flyway=20=EB=B9=84?=
 =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/clap/server/TaskflowApplicationTests.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/clap/server/TaskflowApplicationTests.java b/src/test/java/clap/server/TaskflowApplicationTests.java
index e98ffb8d..12511b46 100644
--- a/src/test/java/clap/server/TaskflowApplicationTests.java
+++ b/src/test/java/clap/server/TaskflowApplicationTests.java
@@ -7,6 +7,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -16,6 +17,7 @@
 
 @Testcontainers
 @SpringBootTest
+@TestPropertySource(properties = "spring.flyway.enabled=false")
 class TaskflowApplicationTests {
 
     @Autowired

From 27fff2eb28854158614087033431ac3eb78a94f8 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 14:09:19 +0900
Subject: [PATCH 23/53] =?UTF-8?q?CLAP-156=20Feat:=20test=20=EC=BB=A8?=
 =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=84=88=EC=97=90=20flyway=20=EB=B9=84?=
 =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/admin/AddCategoryServiceTest.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/clap/server/application/service/admin/AddCategoryServiceTest.java b/src/test/java/clap/server/application/service/admin/AddCategoryServiceTest.java
index f3cf4259..83e7fb18 100644
--- a/src/test/java/clap/server/application/service/admin/AddCategoryServiceTest.java
+++ b/src/test/java/clap/server/application/service/admin/AddCategoryServiceTest.java
@@ -12,6 +12,7 @@
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -21,6 +22,7 @@
 @SpringBootTest
 @Testcontainers
 @Transactional
+@TestPropertySource(properties = "spring.flyway.enabled=false")
 class AddCategoryServiceTest {
 
     @Container

From ad5b61809804fb923c2f596775085ce45c4b428c Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 14:26:38 +0900
Subject: [PATCH 24/53] =?UTF-8?q?CLAP-156=20Feat:=20dev=20=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=20ddl-auto=20validate=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #134
---
 src/main/resources/mysql.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mysql.yml b/src/main/resources/mysql.yml
index c922ce91..f4679a83 100644
--- a/src/main/resources/mysql.yml
+++ b/src/main/resources/mysql.yml
@@ -56,7 +56,7 @@ spring:
     open-in-view: false
     generate-ddl: false
     hibernate:
-      ddl-auto: none
+      ddl-auto: validate
     show-sql: true
     properties:
       hibernate:

From 2b4755d3b504f9c6e2162988ea2ed76f4cba6c1c Mon Sep 17 00:00:00 2001
From: andrew <leegd120@gmail.com>
Date: Sun, 2 Feb 2025 01:45:53 +0900
Subject: [PATCH 25/53] merge conflict solve

---
 .../java/clap/server/TaskflowApplication.java |  2 +
 .../adapter/outbound/api/AgitClient.java      |  4 +-
 .../adapter/outbound/api/KakaoWorkClient.java |  4 +-
 .../outbound/api/ObjectBlockService.java      | 15 ++--
 .../outbound/api/dto/SendAgitRequest.java     | 13 ----
 .../api/dto/SendKakaoWorkRequest.java         | 14 ----
 .../evenlistener/CustomEventListener.java     | 52 -------------
 .../outbound/webhook/MakeObjectBlockPort.java | 12 +--
 .../port/outbound/webhook/SendAgitPort.java   |  4 +-
 .../outbound/webhook/SendKaKaoWorkPort.java   |  4 +-
 .../notification/SendWebhookService.java      | 50 ------------
 .../service/webhook/SendAgitService.java      |  4 +-
 .../service/webhook/SendKaKaoWorkService.java |  6 +-
 .../webhook/SendPushNotificationService.java  | 77 +++++++++++++++++++
 .../SendSseService.java                       |  4 +-
 .../SubscribeSseService.java                  |  3 +-
 .../clap/server/config/async/AsyncConfig.java | 29 +++++++
 17 files changed, 136 insertions(+), 161 deletions(-)
 delete mode 100644 src/main/java/clap/server/adapter/outbound/api/dto/SendAgitRequest.java
 delete mode 100644 src/main/java/clap/server/adapter/outbound/api/dto/SendKakaoWorkRequest.java
 delete mode 100644 src/main/java/clap/server/adapter/outbound/persistense/evenlistener/CustomEventListener.java
 delete mode 100644 src/main/java/clap/server/application/service/notification/SendWebhookService.java
 create mode 100644 src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java
 rename src/main/java/clap/server/application/service/{notification => webhook}/SendSseService.java (92%)
 rename src/main/java/clap/server/application/service/{notification => webhook}/SubscribeSseService.java (94%)
 create mode 100644 src/main/java/clap/server/config/async/AsyncConfig.java

diff --git a/src/main/java/clap/server/TaskflowApplication.java b/src/main/java/clap/server/TaskflowApplication.java
index ae57f0c1..9d4bdbc7 100644
--- a/src/main/java/clap/server/TaskflowApplication.java
+++ b/src/main/java/clap/server/TaskflowApplication.java
@@ -2,10 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
+@EnableAsync
 public class TaskflowApplication {
 
     public static void main(String[] args) {
diff --git a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
index ee4ff073..7746f58c 100644
--- a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
@@ -1,6 +1,6 @@
 package clap.server.adapter.outbound.api;
 
-import clap.server.adapter.outbound.api.dto.SendAgitRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendAgitPort;
 import clap.server.common.annotation.architecture.ExternalApiAdapter;
@@ -20,7 +20,7 @@ public class AgitClient implements SendAgitPort {
     private String AGIT_WEBHOOK_URL;
 
     @Override
-    public void sendAgit(SendAgitRequest request) {
+    public void sendAgit(SendWebhookRequest request) {
         RestTemplate restTemplate = new RestTemplate();
 
         String message = null;
diff --git a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
index aa0a7743..27a05cfe 100644
--- a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
@@ -1,6 +1,6 @@
 package clap.server.adapter.outbound.api;
 
-import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendKaKaoWorkPort;
 import clap.server.common.annotation.architecture.ExternalApiAdapter;
@@ -26,7 +26,7 @@ public class KakaoWorkClient implements SendKaKaoWorkPort {
     private final ObjectBlockService makeObjectBlock;
 
     @Override
-    public void sendKakaoWord(SendKakaoWorkRequest request) {
+    public void sendKakaoWork(SendWebhookRequest request) {
         RestTemplate restTemplate = new RestTemplate();
 
         // Payload 생성
diff --git a/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java b/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java
index 77c67eef..9c8451f4 100644
--- a/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java
+++ b/src/main/java/clap/server/adapter/outbound/api/ObjectBlockService.java
@@ -1,7 +1,6 @@
 package clap.server.adapter.outbound.api;
 
-
-import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 import clap.server.adapter.outbound.persistense.repository.notification.NotificationRepository;
 import clap.server.application.port.outbound.webhook.MakeObjectBlockPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
@@ -19,7 +18,7 @@ public class ObjectBlockService implements MakeObjectBlockPort {
     private final NotificationRepository notificationRepository;
 
     @Override
-    public String makeTaskRequestBlock(SendKakaoWorkRequest request) {
+    public String makeTaskRequestBlock(SendWebhookRequest request) {
         // Blocks 데이터 생성
         Object[] blocks = new Object[]{
                 // Header 블록
@@ -92,7 +91,7 @@ public String makeTaskRequestBlock(SendKakaoWorkRequest request) {
     }
 
     @Override
-    public String makeNewProcessorBlock(SendKakaoWorkRequest request) {
+    public String makeNewProcessorBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
                         "type", "header",
@@ -148,7 +147,7 @@ public String makeNewProcessorBlock(SendKakaoWorkRequest request) {
         try {
             payload = "{" +
                         "\"email\":\"" + request.email() + "\"," +
-                        "\"text\":\"작업 담당자 할당 알림\"," + // fallback 메시지
+                        "\"text\":\"작업 담당자 선정 알림\"," + // fallback 메시지
                         "\"blocks\":" + objectMapper.writeValueAsString(blocks) +
                         "}";
         } catch (JsonProcessingException e) {
@@ -159,7 +158,7 @@ public String makeNewProcessorBlock(SendKakaoWorkRequest request) {
     }
 
     @Override
-    public String makeProcessorChangeBlock(SendKakaoWorkRequest request) {
+    public String makeProcessorChangeBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
                         "type", "header",
@@ -227,7 +226,7 @@ public String makeProcessorChangeBlock(SendKakaoWorkRequest request) {
     }
 
     @Override
-    public String makeCommentBlock(SendKakaoWorkRequest request) {
+    public String makeCommentBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
                         "type", "header",
@@ -305,7 +304,7 @@ public String makeCommentBlock(SendKakaoWorkRequest request) {
     }
 
     @Override
-    public String makeTaskStatusBlock(SendKakaoWorkRequest request) {
+    public String makeTaskStatusBlock(SendWebhookRequest request) {
         Object[] blocks = new Object[]{
                 Map.of(
                         "type", "header",
diff --git a/src/main/java/clap/server/adapter/outbound/api/dto/SendAgitRequest.java b/src/main/java/clap/server/adapter/outbound/api/dto/SendAgitRequest.java
deleted file mode 100644
index 65add4ab..00000000
--- a/src/main/java/clap/server/adapter/outbound/api/dto/SendAgitRequest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.adapter.outbound.api.dto;
-
-import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
-
-public record SendAgitRequest(
-        String email,
-        NotificationType notificationType,
-        String taskName,
-        String senderName,
-        String message,
-        String commenterName
-) {
-}
diff --git a/src/main/java/clap/server/adapter/outbound/api/dto/SendKakaoWorkRequest.java b/src/main/java/clap/server/adapter/outbound/api/dto/SendKakaoWorkRequest.java
deleted file mode 100644
index 2bf6252d..00000000
--- a/src/main/java/clap/server/adapter/outbound/api/dto/SendKakaoWorkRequest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package clap.server.adapter.outbound.api.dto;
-
-import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
-
-public record SendKakaoWorkRequest(
-
-        String email,
-        NotificationType notificationType,
-        String taskName,
-        String senderName,
-        String message,
-        String commenterName
-) {
-}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/evenlistener/CustomEventListener.java b/src/main/java/clap/server/adapter/outbound/persistense/evenlistener/CustomEventListener.java
deleted file mode 100644
index 5e88dcad..00000000
--- a/src/main/java/clap/server/adapter/outbound/persistense/evenlistener/CustomEventListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package clap.server.adapter.outbound.persistense.evenlistener;
-
-import clap.server.adapter.inbound.web.dto.notification.SseRequest;
-import clap.server.adapter.outbound.api.dto.SendAgitRequest;
-import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
-import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
-import clap.server.application.service.notification.CreateNotificationService;
-import clap.server.application.service.notification.SendSseService;
-import clap.server.application.service.webhook.SendAgitService;
-import clap.server.application.service.webhook.SendEmailService;
-import clap.server.application.service.webhook.SendKaKaoWorkService;
-import clap.server.domain.model.notification.Notification;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.event.TransactionPhase;
-import org.springframework.transaction.event.TransactionalEventListener;
-
-// 이벤트 발행 시 실행
-@RequiredArgsConstructor
-@Component
-public class CustomEventListener {
-    private final CreateNotificationService createNotificationService;
-    private final SendSseService sendSseService;
-    private final SendEmailService sendEmailService;
-    private final SendKaKaoWorkService sendKaKaoWorkService;
-    private final SendAgitService agitService;
-
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void handler(Notification request) {
-        createNotificationService.createNotification(request);
-    }
-
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void handleSseNotification(SseRequest sseRequest) {
-        sendSseService.send(sseRequest);
-    }
-
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void handleEmailSend(SendWebhookRequest email) {
-        sendEmailService.sendEmail(email);
-    }
-
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void handleKakaoWorkSend(SendKakaoWorkRequest kakaoWork) {
-        sendKaKaoWorkService.sendKaKaoWork(kakaoWork);
-    }
-
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void handleAgitSend(SendAgitRequest agit) {
-        agitService.sendAgit(agit);
-    }
-}
diff --git a/src/main/java/clap/server/application/port/outbound/webhook/MakeObjectBlockPort.java b/src/main/java/clap/server/application/port/outbound/webhook/MakeObjectBlockPort.java
index 9ca0ac86..dfcb3f61 100644
--- a/src/main/java/clap/server/application/port/outbound/webhook/MakeObjectBlockPort.java
+++ b/src/main/java/clap/server/application/port/outbound/webhook/MakeObjectBlockPort.java
@@ -1,16 +1,16 @@
 package clap.server.application.port.outbound.webhook;
 
-import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 
 public interface MakeObjectBlockPort {
 
-    String makeTaskRequestBlock(SendKakaoWorkRequest request);
+    String makeTaskRequestBlock(SendWebhookRequest request);
 
-    String makeNewProcessorBlock(SendKakaoWorkRequest request);
+    String makeNewProcessorBlock(SendWebhookRequest request);
 
-    String makeProcessorChangeBlock(SendKakaoWorkRequest request);
+    String makeProcessorChangeBlock(SendWebhookRequest request);
 
-    String makeCommentBlock(SendKakaoWorkRequest request);
+    String makeCommentBlock(SendWebhookRequest request);
 
-    String makeTaskStatusBlock(SendKakaoWorkRequest request);
+    String makeTaskStatusBlock(SendWebhookRequest request);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java b/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java
index f6e7cfd3..c9d39669 100644
--- a/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java
+++ b/src/main/java/clap/server/application/port/outbound/webhook/SendAgitPort.java
@@ -1,7 +1,7 @@
 package clap.server.application.port.outbound.webhook;
 
-import clap.server.adapter.outbound.api.dto.SendAgitRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 
 public interface SendAgitPort {
-    void sendAgit(SendAgitRequest request);
+    void sendAgit(SendWebhookRequest request);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/webhook/SendKaKaoWorkPort.java b/src/main/java/clap/server/application/port/outbound/webhook/SendKaKaoWorkPort.java
index 03550a57..077399b6 100644
--- a/src/main/java/clap/server/application/port/outbound/webhook/SendKaKaoWorkPort.java
+++ b/src/main/java/clap/server/application/port/outbound/webhook/SendKaKaoWorkPort.java
@@ -1,8 +1,8 @@
 package clap.server.application.port.outbound.webhook;
 
-import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 
 public interface SendKaKaoWorkPort {
 
-    void sendKakaoWord(SendKakaoWorkRequest request);
+    void sendKakaoWork(SendWebhookRequest request);
 }
diff --git a/src/main/java/clap/server/application/service/notification/SendWebhookService.java b/src/main/java/clap/server/application/service/notification/SendWebhookService.java
deleted file mode 100644
index efb5a2e2..00000000
--- a/src/main/java/clap/server/application/service/notification/SendWebhookService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package clap.server.application.service.notification;
-
-import clap.server.adapter.outbound.api.dto.SendAgitRequest;
-import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
-import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
-import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
-import clap.server.common.annotation.architecture.ApplicationService;
-import clap.server.domain.model.member.Member;
-import clap.server.domain.model.task.Task;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.ApplicationEventPublisher;
-
-@ApplicationService
-@RequiredArgsConstructor
-public class SendWebhookService {
-
-    private final ApplicationEventPublisher applicationEventPublisher;
-
-    public void sendWebhookNotification(Member receiver, NotificationType notificationType,
-                                        Task task, String message, String commenterName) {
-        // 공통 데이터
-        String email = receiver.getMemberInfo().getEmail();
-        String taskTitle = task.getTitle();
-        String requesterNickname = task.getRequester().getNickname();
-
-        // 이메일 전송
-        if (receiver.getEmailNotificationEnabled()) {
-            SendWebhookRequest sendWebhookRequest = new SendWebhookRequest(
-                    email, notificationType, taskTitle, requesterNickname, message, commenterName
-            );
-            applicationEventPublisher.publishEvent(sendWebhookRequest);
-        }
-
-        // 카카오워크 전송
-        if (receiver.getKakaoworkNotificationEnabled()) {
-            SendKakaoWorkRequest sendKakaoWorkRequest = new SendKakaoWorkRequest(
-                    email, notificationType, taskTitle, requesterNickname, message, commenterName
-            );
-            applicationEventPublisher.publishEvent(sendKakaoWorkRequest);
-        }
-
-        // 아지트 전송
-        if (receiver.getAgitNotificationEnabled()) {
-            SendAgitRequest sendAgitRequest = new SendAgitRequest(
-                    email, notificationType, taskTitle, requesterNickname, message, commenterName
-            );
-            applicationEventPublisher.publishEvent(sendAgitRequest);
-        }
-    }
-}
diff --git a/src/main/java/clap/server/application/service/webhook/SendAgitService.java b/src/main/java/clap/server/application/service/webhook/SendAgitService.java
index 958ce52c..5ae628ce 100644
--- a/src/main/java/clap/server/application/service/webhook/SendAgitService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendAgitService.java
@@ -1,6 +1,6 @@
 package clap.server.application.service.webhook;
 
-import clap.server.adapter.outbound.api.dto.SendAgitRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 import clap.server.application.port.outbound.webhook.SendAgitPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import lombok.RequiredArgsConstructor;
@@ -11,7 +11,7 @@ public class SendAgitService {
 
     private final SendAgitPort agitPort;
 
-    public void sendAgit(SendAgitRequest request) {
+    public void sendAgit(SendWebhookRequest request) {
         agitPort.sendAgit(request);
     }
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendKaKaoWorkService.java b/src/main/java/clap/server/application/service/webhook/SendKaKaoWorkService.java
index 35ea3f22..487026ba 100644
--- a/src/main/java/clap/server/application/service/webhook/SendKaKaoWorkService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendKaKaoWorkService.java
@@ -1,6 +1,6 @@
 package clap.server.application.service.webhook;
 
-import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 import clap.server.application.port.outbound.webhook.SendKaKaoWorkPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import lombok.RequiredArgsConstructor;
@@ -11,7 +11,7 @@ public class SendKaKaoWorkService {
 
     private final SendKaKaoWorkPort sendKaKaoWorkPort;
 
-    public void sendKaKaoWork(SendKakaoWorkRequest request) {
-        sendKaKaoWorkPort.sendKakaoWord(request);
+    public void sendKaKaoWork(SendWebhookRequest request) {
+        sendKaKaoWorkPort.sendKakaoWork(request);
     }
 }
diff --git a/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java
new file mode 100644
index 00000000..8c3b1d0d
--- /dev/null
+++ b/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java
@@ -0,0 +1,77 @@
+package clap.server.application.service.webhook;
+
+import clap.server.adapter.inbound.web.dto.notification.SseRequest;
+import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
+import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
+import clap.server.application.port.outbound.notification.CommandNotificationPort;
+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.Task;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.concurrent.CompletableFuture;
+
+import static clap.server.domain.model.notification.Notification.createTaskNotification;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class SendPushNotificationService {
+
+    private final SendSseService sendSseService;
+    private final SendAgitService sendAgitService;
+    private final SendEmailService sendEmailService;
+    private final SendKaKaoWorkService sendKaKaoWorkService;
+    private final CommandNotificationPort commandNotificationPort;
+
+    @Async("notificationExecutor")
+    public void sendPushNotification(Member receiver, NotificationType notificationType,
+                                        Task task, String message, String commenterName) {
+        String email = receiver.getMemberInfo().getEmail();
+        String taskTitle = task.getTitle();
+        String requesterNickname = task.getRequester().getNickname();
+
+        Notification notification = createTaskNotification(task, receiver, notificationType);
+
+        SseRequest sseRequest = new SseRequest(
+                task.getTitle(),
+                notificationType,
+                receiver.getMemberId(),
+                message
+        );
+
+        SendWebhookRequest sendWebhookRequest = new SendWebhookRequest(
+                email, notificationType, taskTitle, requesterNickname, message, commenterName
+        );
+
+        CompletableFuture<Void> saveNotification = CompletableFuture.runAsync(() -> {
+            commandNotificationPort.save(notification);
+        });
+
+        CompletableFuture<Void> sendSseFuture = CompletableFuture.runAsync(() -> {
+            sendSseService.send(sseRequest);
+        });
+
+        CompletableFuture<Void> sendEmailFuture = CompletableFuture.runAsync(() -> {
+            if (receiver.getEmailNotificationEnabled()) {
+                sendEmailService.sendEmail(sendWebhookRequest);
+            }
+        });
+
+        CompletableFuture<Void> sendAgitFuture = CompletableFuture.runAsync(() -> {
+            if (receiver.getAgitNotificationEnabled()) {
+                sendAgitService.sendAgit(sendWebhookRequest);
+            }
+        });
+
+        CompletableFuture<Void> sendKakaoWorkFuture = CompletableFuture.runAsync(() -> {
+            if (receiver.getKakaoworkNotificationEnabled()) {
+                sendKaKaoWorkService.sendKaKaoWork(sendWebhookRequest);
+            }
+        });
+
+        CompletableFuture<Void> allOf = CompletableFuture.allOf(saveNotification, sendSseFuture, sendEmailFuture, sendKakaoWorkFuture, sendAgitFuture);
+        allOf.join();
+    }
+}
diff --git a/src/main/java/clap/server/application/service/notification/SendSseService.java b/src/main/java/clap/server/application/service/webhook/SendSseService.java
similarity index 92%
rename from src/main/java/clap/server/application/service/notification/SendSseService.java
rename to src/main/java/clap/server/application/service/webhook/SendSseService.java
index 4139b53d..6774a110 100644
--- a/src/main/java/clap/server/application/service/notification/SendSseService.java
+++ b/src/main/java/clap/server/application/service/webhook/SendSseService.java
@@ -1,4 +1,4 @@
-package clap.server.application.service.notification;
+package clap.server.application.service.webhook;
 
 import clap.server.adapter.inbound.web.dto.notification.SseRequest;
 import clap.server.application.port.inbound.notification.SendSseUsecase;
@@ -9,8 +9,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import java.io.IOException;
-
 @ApplicationService
 @RequiredArgsConstructor
 public class SendSseService implements SendSseUsecase {
diff --git a/src/main/java/clap/server/application/service/notification/SubscribeSseService.java b/src/main/java/clap/server/application/service/webhook/SubscribeSseService.java
similarity index 94%
rename from src/main/java/clap/server/application/service/notification/SubscribeSseService.java
rename to src/main/java/clap/server/application/service/webhook/SubscribeSseService.java
index 558e4aa5..d18a254d 100644
--- a/src/main/java/clap/server/application/service/notification/SubscribeSseService.java
+++ b/src/main/java/clap/server/application/service/webhook/SubscribeSseService.java
@@ -1,4 +1,4 @@
-package clap.server.application.service.notification;
+package clap.server.application.service.webhook;
 
 import clap.server.application.port.inbound.notification.SubscribeSseUsecase;
 import clap.server.application.port.outbound.notification.CommandSsePort;
@@ -7,7 +7,6 @@
 import clap.server.exception.code.NotificationErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-import java.io.IOException;
 
 @ApplicationService
 @RequiredArgsConstructor
diff --git a/src/main/java/clap/server/config/async/AsyncConfig.java b/src/main/java/clap/server/config/async/AsyncConfig.java
new file mode 100644
index 00000000..8671f0eb
--- /dev/null
+++ b/src/main/java/clap/server/config/async/AsyncConfig.java
@@ -0,0 +1,29 @@
+package clap.server.config.async;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+
+
+    @Bean(name = "notificationExecutor")
+    public ThreadPoolTaskExecutor taskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+
+        // 스레드 풀 크기 설정 (최대 1000명 사용자를 위한 설정 예시)
+        executor.setCorePoolSize(50);  // 기본적으로 유지할 스레드 수
+        executor.setMaxPoolSize(200);  // 최대 스레드 수
+        executor.setQueueCapacity(1000);  // 큐의 크기 (백로그)
+        executor.setThreadNamePrefix("async-task-");  // 스레드 이름 접두사
+
+        // 스레드가 유휴 상태로 일정 시간이 지나면 종료되도록 설정
+        executor.setKeepAliveSeconds(60);  // 60초 후 유휴 스레드 종료
+
+        executor.initialize();
+        return executor;
+    }
+}

From 64a3f5b500689c4fcf0e9f36045935fce0d30939 Mon Sep 17 00:00:00 2001
From: andrew <leegd120@gmail.com>
Date: Sun, 2 Feb 2025 01:46:17 +0900
Subject: [PATCH 26/53] merge conflict solve

---
 .../adapter/inbound/web/comment/PostCommentController.java    | 4 ++--
 .../application/port/inbound/comment/PostCommentUsecase.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/comment/PostCommentController.java b/src/main/java/clap/server/adapter/inbound/web/comment/PostCommentController.java
index af7db1d6..5889e1cc 100644
--- a/src/main/java/clap/server/adapter/inbound/web/comment/PostCommentController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/comment/PostCommentController.java
@@ -44,8 +44,8 @@ public void createComment(
     public void createAttachmentComment(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @PathVariable Long taskId,
-            @RequestPart(name = "attachment") @NotNull List<MultipartFile> attachments) {
-        postCommentUsecase.saveCommentAttachment(userInfo.getUserId(), taskId, attachments);
+            @RequestPart(name = "attachment") @NotNull MultipartFile attachment) {
+        postCommentUsecase.saveCommentAttachment(userInfo.getUserId(), taskId, attachment);
     }
 
 }
diff --git a/src/main/java/clap/server/application/port/inbound/comment/PostCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/comment/PostCommentUsecase.java
index e964316e..168dbf37 100644
--- a/src/main/java/clap/server/application/port/inbound/comment/PostCommentUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/comment/PostCommentUsecase.java
@@ -9,5 +9,5 @@ public interface PostCommentUsecase {
 
     void save(Long userId, Long taskId, PostAndEditCommentRequest request);
 
-    void saveCommentAttachment(Long userId, Long taskId, List<MultipartFile> files);
+    void saveCommentAttachment(Long userId, Long taskId, MultipartFile file);
 }

From 15bd3cab273ebe25cb3c477ec7f5bf7a7c4b0dcc Mon Sep 17 00:00:00 2001
From: andrew <leegd120@gmail.com>
Date: Sun, 2 Feb 2025 01:46:38 +0900
Subject: [PATCH 27/53] =?UTF-8?q?CLAP-201=20Fix:=20html=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B3=80=EC=88=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/processor-assign.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/processor-assign.html b/src/main/resources/templates/processor-assign.html
index 0de7fd85..fc97d3f6 100644
--- a/src/main/resources/templates/processor-assign.html
+++ b/src/main/resources/templates/processor-assign.html
@@ -71,7 +71,7 @@
   <div class="content">
     <p>"<strong th:text="${title}"></strong>" 작업의 담당자가 할당되었습니다.</p>
     <ul>
-      <li>담당자: <span th:text="${processor}"></span></li>
+      <li>담당자: <span th:text="${processorName}"></span></li>
     </ul>
     <div class="cta-button">
       <a href="https://www.notion.so" target="_blank">확인하기</a>

From 6a45f79c2497967c1c753cb43f1adafc55dbc7f2 Mon Sep 17 00:00:00 2001
From: andrew <leegd120@gmail.com>
Date: Sun, 2 Feb 2025 18:04:48 +0900
Subject: [PATCH 28/53] =?UTF-8?q?CLAP-219=20Fix:=20label=20color=EC=97=90?=
 =?UTF-8?q?=20=EC=9D=B8=EB=94=94=EA=B3=A0=20=EC=83=89=EC=83=81=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outbound/persistense/entity/task/constant/LabelColor.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelColor.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelColor.java
index 79ccb338..1c7567ad 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelColor.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelColor.java
@@ -12,7 +12,8 @@ public enum LabelColor {
     GREEN("초록"),
     BLUE("파랑"),
     PURPLE("보라"),
-    GREY("회색");
+    GREY("회색"),
+    INDIGO("인디고");
 
     private final String description;
 }

From c3d110629a294e25caebea5c94f1304981d718e6 Mon Sep 17 00:00:00 2001
From: Choi hyoseong <105284587+hyoseong-Choi@users.noreply.github.com>
Date: Sun, 2 Feb 2025 18:39:53 +0900
Subject: [PATCH 29/53] =?UTF-8?q?CLAP-214=20Cleanup=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84,=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=AF=B8?=
 =?UTF-8?q?=ED=9D=A1=ED=95=9C=EB=B6=80=EB=B6=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

* CLAP-110 Feature : 담당자별 작업 처리량 조회 API 구현

<footer>
- 관련: #73

* CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정

<footer>
- 관련: #74

* 내 작업한 내용에 대한 설명

* 담당자 조회 API 구현

* CLAP-111 Refactor : 통계 조회 API 주소 통합, 리팩토링, 예외처리

<footer>
- 관련: #74

* Bug : 프로퍼티파일 수정

* CLAP-104 CI/CD : CI에서 s3.yml 파일 생성하도록 수정

* CLAP-146 Feature : 카테고리 목록 조회 API 구현

<footer>
- 관련: #118

* CLAP-147 Feature : 카테고리 수정 API 구현

<footer>
- 관련: #119

* CLAP-147 Feature : 카테고리 추가, 수정 API 리뷰반영 수정

<footer>
- 관련: #119

* CLAP-148 Feature : 카테고리 삭제 API 구현

<footer>
- 관련: #120

* CLAP-148 Feature : 카테고리 삭제 API 수정

<footer>
- 관련: #120

* CLAP-148 Docs : 카테고리 API 스웨거 수정

<footer>
- 관련: #120

* CLAP-107 Bug : CI test yml파일 key 중복 수정

<footer>
- 관련: #60

* CLAP-148 Feature : 카테고리 CUD 리뷰 반영 수정, 조회 반환 양식 수정

<footer>
- 관련: #120

* CLAP-214 Cleanup : 통계, 카테고리 미흡한부분 리팩토링

<footer>
- 관련: #216

* CLAP-214 Fix : 통계조회 API 파라미터 바인딩 오류 수정

<footer>
- 관련: #216

---------

Co-authored-by: nano-mm <nano123@gachon.ac.kr>
---
 .../web/admin/AddCategoryController.java      | 10 ++++----
 .../web/admin/FindCategoryController.java     |  2 +-
 .../web/admin/UpdateCategoryController.java   |  3 ++-
 .../statistics/FindStatisticsController.java  |  8 +++++--
 .../inbound/admin/AddMainCategoryUsecase.java |  5 ++++
 ...secase.java => AddSubCategoryUsecase.java} |  5 ++--
 .../service/admin/AddCategoryService.java     |  5 ++--
 .../utils/StringToPeriodTypeConverter.java    | 13 +++++++++++
 .../StringToStatisticsTypeConverter.java      | 13 +++++++++++
 .../clap/server/config/web/WebConfig.java     | 23 +++++++++++++++++++
 10 files changed, 74 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/AddMainCategoryUsecase.java
 rename src/main/java/clap/server/application/port/inbound/admin/{AddCategoryUsecase.java => AddSubCategoryUsecase.java} (56%)
 create mode 100644 src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
 create mode 100644 src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
 create mode 100644 src/main/java/clap/server/config/web/WebConfig.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
index 584726c4..d1ad5fd5 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
@@ -3,7 +3,8 @@
 import clap.server.adapter.inbound.security.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.admin.AddMainCategoryRequest;
 import clap.server.adapter.inbound.web.dto.admin.AddSubCategoryRequest;
-import clap.server.application.port.inbound.admin.AddCategoryUsecase;
+import clap.server.application.port.inbound.admin.AddMainCategoryUsecase;
+import clap.server.application.port.inbound.admin.AddSubCategoryUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,20 +21,21 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/managements")
 public class AddCategoryController {
-    private final AddCategoryUsecase addCategoryUsecase;
+    private final AddMainCategoryUsecase addMainCategoryUsecase;
+    private final AddSubCategoryUsecase addSubCategoryUsecase;
 
     @Operation(summary = "1차 카테고리 추가")
     @PostMapping("/main-category")
     @Secured("ROLE_ADMIN")
     public void addMainCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Valid @RequestBody AddMainCategoryRequest addMainCategoryRequest) {
-        addCategoryUsecase.addMainCategory(userInfo.getUserId(), addMainCategoryRequest.code(), addMainCategoryRequest.name());
+        addMainCategoryUsecase.addMainCategory(userInfo.getUserId(), addMainCategoryRequest.code(), addMainCategoryRequest.name());
     }
 
     @Operation(summary = "2차 카테고리 추가")
     @PostMapping("/sub-category")
     @Secured("ROLE_ADMIN")
     public void addSubCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Valid @RequestBody AddSubCategoryRequest addCategoryRequest) {
-        addCategoryUsecase.addSubCategory(userInfo.getUserId(), addCategoryRequest.mainCategoryId(), addCategoryRequest.code(), addCategoryRequest.name());
+        addSubCategoryUsecase.addSubCategory(userInfo.getUserId(), addCategoryRequest.mainCategoryId(), addCategoryRequest.code(), addCategoryRequest.name());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
index bc2ed571..16b74c08 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
@@ -16,7 +16,7 @@
 
 import java.util.List;
 
-@Tag(name = "카테고리 조회")
+@Tag(name = "02. Task [카테고리]", description = "카테고리 조회 API")
 @WebAdapter
 @RequiredArgsConstructor
 @RequestMapping("/api")
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
index 9ec32397..0f3d877a 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -6,6 +6,7 @@
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -25,7 +26,7 @@ public class UpdateCategoryController {
     @PatchMapping("/categories/{categoryId}")
     @Secured("ROLE_ADMIN")
     public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @PathVariable Long categoryId,
-                               @RequestBody UpdateCategoryRequest updateCategoryRequest) {
+                               @Valid @RequestBody UpdateCategoryRequest updateCategoryRequest) {
         updateCategoryUsecase.updateCategory(userInfo.getUserId(), categoryId, updateCategoryRequest.name(), updateCategoryRequest.code());
     }
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
index e84c0c75..dfa2b023 100644
--- a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
@@ -3,7 +3,8 @@
 import clap.server.adapter.inbound.web.dto.statistics.PeriodType;
 import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse;
 import clap.server.adapter.inbound.web.dto.statistics.StatisticsType;
-import clap.server.application.port.inbound.statistics.*;
+import clap.server.application.port.inbound.statistics.FindSubCategoryTaskRequestUsecase;
+import clap.server.application.port.inbound.statistics.FindTaskProcessUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import clap.server.exception.StatisticsException;
 import io.swagger.v3.oas.annotations.Operation;
@@ -11,6 +12,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,7 +22,7 @@
 import static clap.server.exception.code.StatisticsErrorCode.STATISTICS_BAD_REQUEST;
 import static io.swagger.v3.oas.annotations.enums.ParameterIn.QUERY;
 
-@Tag(name = "02. Task [담당자]", description = "작업 통계 API")
+@Tag(name = "02. Task [통계]", description = "작업 통계 API")
 @WebAdapter
 @RequiredArgsConstructor
 @RequestMapping("/api/tasks/statistics")
@@ -33,6 +35,7 @@ public class FindStatisticsController {
     @Parameter(name = "periodType", description = "day, week, month", required = true, in = QUERY)
     @Parameter(name = "statisticsType", description = "request-by-period, process-by-period, request-by-category, process-by-manager", required = true, in = QUERY)
     @GetMapping
+    @Secured("ROLE_MANAGER")
     public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
         switch (statisticsType) {
             case REQUEST_BY_PERIOD ->
@@ -51,6 +54,7 @@ public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@Request
     @Parameter(name = "periodType", description = "day, week, month", required = true, in = QUERY)
     @Parameter(name = "mainCategory", description = "1차 카테고리 이름", required = true, in = QUERY)
     @GetMapping("/subcategory")
+    @Secured("ROLE_MANAGER")
     public ResponseEntity<List<StatisticsResponse>> aggregateSubCategoryTaskRequest(@RequestParam PeriodType periodType, @RequestParam String mainCategory) {
         return ResponseEntity.ok(findSubCategoryTaskRequestUsecase
                 .aggregateSubCategoryTaskRequest(periodType.getType(), mainCategory));
diff --git a/src/main/java/clap/server/application/port/inbound/admin/AddMainCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/AddMainCategoryUsecase.java
new file mode 100644
index 00000000..382c7f57
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/AddMainCategoryUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.admin;
+
+public interface AddMainCategoryUsecase {
+    void addMainCategory(Long adminId, String code, String name);
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/inbound/admin/AddCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/AddSubCategoryUsecase.java
similarity index 56%
rename from src/main/java/clap/server/application/port/inbound/admin/AddCategoryUsecase.java
rename to src/main/java/clap/server/application/port/inbound/admin/AddSubCategoryUsecase.java
index b49bc41b..26df3d7b 100644
--- a/src/main/java/clap/server/application/port/inbound/admin/AddCategoryUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/admin/AddSubCategoryUsecase.java
@@ -1,6 +1,5 @@
 package clap.server.application.port.inbound.admin;
 
-public interface AddCategoryUsecase {
-    void addMainCategory(Long adminId, String code, String name);
+public interface AddSubCategoryUsecase {
     void addSubCategory(Long adminId, Long mainCategoryId, String code, String name);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/clap/server/application/service/admin/AddCategoryService.java b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
index e759577e..cd401450 100644
--- a/src/main/java/clap/server/application/service/admin/AddCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
@@ -1,6 +1,7 @@
 package clap.server.application.service.admin;
 
-import clap.server.application.port.inbound.admin.AddCategoryUsecase;
+import clap.server.application.port.inbound.admin.AddMainCategoryUsecase;
+import clap.server.application.port.inbound.admin.AddSubCategoryUsecase;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.application.port.outbound.task.CommandCategoryPort;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
@@ -17,7 +18,7 @@
 
 @ApplicationService
 @RequiredArgsConstructor
-public class AddCategoryService implements AddCategoryUsecase {
+public class AddCategoryService implements AddMainCategoryUsecase, AddSubCategoryUsecase {
     private final CommandCategoryPort commandCategoryPort;
     private final LoadCategoryPort loadCategoryPort;
     private final LoadMemberPort loadMemberPort;
diff --git a/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java b/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
new file mode 100644
index 00000000..ae462adf
--- /dev/null
+++ b/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
@@ -0,0 +1,13 @@
+package clap.server.common.utils;
+
+import clap.server.adapter.inbound.web.dto.statistics.PeriodType;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StringToPeriodTypeConverter implements Converter<String, PeriodType> {
+    @Override
+    public PeriodType convert(String source) {
+        return PeriodType.from(source);
+    }
+}
diff --git a/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java b/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
new file mode 100644
index 00000000..6828d711
--- /dev/null
+++ b/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
@@ -0,0 +1,13 @@
+package clap.server.common.utils;
+
+import clap.server.adapter.inbound.web.dto.statistics.StatisticsType;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StringToStatisticsTypeConverter implements Converter<String, StatisticsType> {
+    @Override
+    public StatisticsType convert(String source) {
+        return StatisticsType.from(source);
+    }
+}
diff --git a/src/main/java/clap/server/config/web/WebConfig.java b/src/main/java/clap/server/config/web/WebConfig.java
new file mode 100644
index 00000000..ac2294c6
--- /dev/null
+++ b/src/main/java/clap/server/config/web/WebConfig.java
@@ -0,0 +1,23 @@
+package clap.server.config.web;
+
+import clap.server.common.utils.StringToPeriodTypeConverter;
+import clap.server.common.utils.StringToStatisticsTypeConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ConversionServiceFactoryBean;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.Set;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    @Bean
+    public ConversionServiceFactoryBean conversionService() {
+        ConversionServiceFactoryBean conversionService = new ConversionServiceFactoryBean();
+        conversionService.setConverters(Set.of(
+                new StringToStatisticsTypeConverter(),
+                new StringToPeriodTypeConverter()
+        ));
+        return conversionService;
+    }
+}

From ab88d7b526a0d8f1591f6b8e48596b7c7e7515c8 Mon Sep 17 00:00:00 2001
From: Choi hyoseong <105284587+hyoseong-Choi@users.noreply.github.com>
Date: Sun, 2 Feb 2025 18:48:53 +0900
Subject: [PATCH 30/53] =?UTF-8?q?CLAP-214=20Hotfix=20:=20WebMvcConfigurer?=
 =?UTF-8?q?=20addConverter=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CLAP-110 Feature : 담당자별 작업 처리량 조회 API 구현

<footer>
- 관련: #73

* CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정

<footer>
- 관련: #74

* 내 작업한 내용에 대한 설명

* 담당자 조회 API 구현

* CLAP-111 Refactor : 통계 조회 API 주소 통합, 리팩토링, 예외처리

<footer>
- 관련: #74

* Bug : 프로퍼티파일 수정

* CLAP-104 CI/CD : CI에서 s3.yml 파일 생성하도록 수정

* CLAP-146 Feature : 카테고리 목록 조회 API 구현

<footer>
- 관련: #118

* CLAP-147 Feature : 카테고리 수정 API 구현

<footer>
- 관련: #119

* CLAP-147 Feature : 카테고리 추가, 수정 API 리뷰반영 수정

<footer>
- 관련: #119

* CLAP-148 Feature : 카테고리 삭제 API 구현

<footer>
- 관련: #120

* CLAP-148 Feature : 카테고리 삭제 API 수정

<footer>
- 관련: #120

* CLAP-148 Docs : 카테고리 API 스웨거 수정

<footer>
- 관련: #120

* CLAP-107 Bug : CI test yml파일 key 중복 수정

<footer>
- 관련: #60

* CLAP-148 Feature : 카테고리 CUD 리뷰 반영 수정, 조회 반환 양식 수정

<footer>
- 관련: #120

* CLAP-214 Cleanup : 통계, 카테고리 미흡한부분 리팩토링

<footer>
- 관련: #216

* CLAP-214 Fix : 통계조회 API 파라미터 바인딩 오류 수정

<footer>
- 관련: #216

* CLAP-214 Fix : addConverter 수정

<footer>
- 관련: #216

---------

Co-authored-by: nano-mm <nano123@gachon.ac.kr>
---
 .../java/clap/server/config/web/WebConfig.java  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/clap/server/config/web/WebConfig.java b/src/main/java/clap/server/config/web/WebConfig.java
index ac2294c6..07947005 100644
--- a/src/main/java/clap/server/config/web/WebConfig.java
+++ b/src/main/java/clap/server/config/web/WebConfig.java
@@ -2,22 +2,17 @@
 
 import clap.server.common.utils.StringToPeriodTypeConverter;
 import clap.server.common.utils.StringToStatisticsTypeConverter;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ConversionServiceFactoryBean;
+import org.springframework.format.FormatterRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import java.util.Set;
 
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
-    @Bean
-    public ConversionServiceFactoryBean conversionService() {
-        ConversionServiceFactoryBean conversionService = new ConversionServiceFactoryBean();
-        conversionService.setConverters(Set.of(
-                new StringToStatisticsTypeConverter(),
-                new StringToPeriodTypeConverter()
-        ));
-        return conversionService;
+
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new StringToStatisticsTypeConverter());
+        registry.addConverter(new StringToPeriodTypeConverter());
     }
 }

From 26ec2e2592ca68e08b1d68e22c608af5fd8b5568 Mon Sep 17 00:00:00 2001
From: Choi hyoseong <105284587+hyoseong-Choi@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:08:15 +0900
Subject: [PATCH 31/53] =?UTF-8?q?CLAP-214=20Hotfix=20:=20=EC=97=98?=
 =?UTF-8?q?=EB=9D=BC=EC=8A=A4=ED=8B=B1=EC=84=9C=EC=B9=98=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95=EC=A4=91=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=ED=95=9C=20=ED=8C=8C=EC=9D=BC=EB=93=A4=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=B4=EC=A0=B8=EC=84=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CLAP-110 Feature : 담당자별 작업 처리량 조회 API 구현

<footer>
- 관련: #73

* CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정

<footer>
- 관련: #74

* 내 작업한 내용에 대한 설명

* 담당자 조회 API 구현

* CLAP-111 Refactor : 통계 조회 API 주소 통합, 리팩토링, 예외처리

<footer>
- 관련: #74

* Bug : 프로퍼티파일 수정

* CLAP-104 CI/CD : CI에서 s3.yml 파일 생성하도록 수정

* CLAP-146 Feature : 카테고리 목록 조회 API 구현

<footer>
- 관련: #118

* CLAP-147 Feature : 카테고리 수정 API 구현

<footer>
- 관련: #119

* CLAP-147 Feature : 카테고리 추가, 수정 API 리뷰반영 수정

<footer>
- 관련: #119

* CLAP-148 Feature : 카테고리 삭제 API 구현

<footer>
- 관련: #120

* CLAP-148 Feature : 카테고리 삭제 API 수정

<footer>
- 관련: #120

* CLAP-148 Docs : 카테고리 API 스웨거 수정

<footer>
- 관련: #120

* CLAP-107 Bug : CI test yml파일 key 중복 수정

<footer>
- 관련: #60

* CLAP-148 Feature : 카테고리 CUD 리뷰 반영 수정, 조회 반환 양식 수정

<footer>
- 관련: #120

* CLAP-214 Cleanup : 통계, 카테고리 미흡한부분 리팩토링

<footer>
- 관련: #216

* CLAP-214 Fix : 통계조회 API 파라미터 바인딩 오류 수정

<footer>
- 관련: #216

* CLAP-214 Fix : addConverter 수정

<footer>
- 관련: #216

* CLAP-214 Hotfix : 추가한 파일들 제거

<footer>
- 관련: #216

---------

Co-authored-by: nano-mm <nano123@gachon.ac.kr>
---
 .../statistics/FindStatisticsController.java   |  4 ++--
 .../utils/StringToPeriodTypeConverter.java     | 13 -------------
 .../utils/StringToStatisticsTypeConverter.java | 13 -------------
 .../java/clap/server/config/web/WebConfig.java | 18 ------------------
 4 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
 delete mode 100644 src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
 delete mode 100644 src/main/java/clap/server/config/web/WebConfig.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
index dfa2b023..f0164060 100644
--- a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
@@ -32,8 +32,8 @@ public class FindStatisticsController {
 
 
     @Operation(summary = "기본 통계 API")
-    @Parameter(name = "periodType", description = "day, week, month", required = true, in = QUERY)
-    @Parameter(name = "statisticsType", description = "request-by-period, process-by-period, request-by-category, process-by-manager", required = true, in = QUERY)
+    @Parameter(name = "periodType", required = true, in = QUERY)
+    @Parameter(name = "statisticsType", required = true, in = QUERY)
     @GetMapping
     @Secured("ROLE_MANAGER")
     public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
diff --git a/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java b/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
deleted file mode 100644
index ae462adf..00000000
--- a/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.common.utils;
-
-import clap.server.adapter.inbound.web.dto.statistics.PeriodType;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Component;
-
-@Component
-public class StringToPeriodTypeConverter implements Converter<String, PeriodType> {
-    @Override
-    public PeriodType convert(String source) {
-        return PeriodType.from(source);
-    }
-}
diff --git a/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java b/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
deleted file mode 100644
index 6828d711..00000000
--- a/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.common.utils;
-
-import clap.server.adapter.inbound.web.dto.statistics.StatisticsType;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Component;
-
-@Component
-public class StringToStatisticsTypeConverter implements Converter<String, StatisticsType> {
-    @Override
-    public StatisticsType convert(String source) {
-        return StatisticsType.from(source);
-    }
-}
diff --git a/src/main/java/clap/server/config/web/WebConfig.java b/src/main/java/clap/server/config/web/WebConfig.java
deleted file mode 100644
index 07947005..00000000
--- a/src/main/java/clap/server/config/web/WebConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package clap.server.config.web;
-
-import clap.server.common.utils.StringToPeriodTypeConverter;
-import clap.server.common.utils.StringToStatisticsTypeConverter;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.format.FormatterRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-
-@Configuration
-public class WebConfig implements WebMvcConfigurer {
-
-    @Override
-    public void addFormatters(FormatterRegistry registry) {
-        registry.addConverter(new StringToStatisticsTypeConverter());
-        registry.addConverter(new StringToPeriodTypeConverter());
-    }
-}

From 2ac8c81a1223ea83341e814b801f2635c4b52688 Mon Sep 17 00:00:00 2001
From: Choi hyoseong <105284587+hyoseong-Choi@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:32:59 +0900
Subject: [PATCH 32/53] =?UTF-8?q?CLAP-214=20Hotfix=20:=20FindStatisticsCon?=
 =?UTF-8?q?troller=20=EC=8A=A4=EC=9C=84=EC=B9=98=EB=AC=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CLAP-110 Feature : 담당자별 작업 처리량 조회 API 구현

<footer>
- 관련: #73

* CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정

<footer>
- 관련: #74

* 내 작업한 내용에 대한 설명

* 담당자 조회 API 구현

* CLAP-111 Refactor : 통계 조회 API 주소 통합, 리팩토링, 예외처리

<footer>
- 관련: #74

* Bug : 프로퍼티파일 수정

* CLAP-104 CI/CD : CI에서 s3.yml 파일 생성하도록 수정

* CLAP-146 Feature : 카테고리 목록 조회 API 구현

<footer>
- 관련: #118

* CLAP-147 Feature : 카테고리 수정 API 구현

<footer>
- 관련: #119

* CLAP-147 Feature : 카테고리 추가, 수정 API 리뷰반영 수정

<footer>
- 관련: #119

* CLAP-148 Feature : 카테고리 삭제 API 구현

<footer>
- 관련: #120

* CLAP-148 Feature : 카테고리 삭제 API 수정

<footer>
- 관련: #120

* CLAP-148 Docs : 카테고리 API 스웨거 수정

<footer>
- 관련: #120

* CLAP-107 Bug : CI test yml파일 key 중복 수정

<footer>
- 관련: #60

* CLAP-148 Feature : 카테고리 CUD 리뷰 반영 수정, 조회 반환 양식 수정

<footer>
- 관련: #120

* CLAP-214 Cleanup : 통계, 카테고리 미흡한부분 리팩토링

<footer>
- 관련: #216

* CLAP-214 Fix : 통계조회 API 파라미터 바인딩 오류 수정

<footer>
- 관련: #216

* CLAP-214 Fix : addConverter 수정

<footer>
- 관련: #216

* CLAP-214 Hotfix : 추가한 파일들 제거

<footer>
- 관련: #216

* CLAP-214 Hotfix : FindStatisticsController 스위치문 수정

<footer>
- 관련: #216

---------

Co-authored-by: nano-mm <nano123@gachon.ac.kr>
---
 .../inbound/web/statistics/FindStatisticsController.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
index f0164060..de72d30b 100644
--- a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
@@ -37,7 +37,9 @@ public class FindStatisticsController {
     @GetMapping
     @Secured("ROLE_MANAGER")
     public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
-        switch (statisticsType) {
+        System.out.println("periodType = " + periodType);
+        System.out.println("statisticsType = " + statisticsType);
+        return switch (statisticsType) {
             case REQUEST_BY_PERIOD ->
                     ResponseEntity.ok(findTaskProcessUsecase.aggregatePeriodTaskRequest(periodType.getType()));
             case PROCESS_BY_PERIOD -> ResponseEntity.ok(findTaskProcessUsecase
@@ -46,8 +48,8 @@ public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@Request
                     ResponseEntity.ok(findTaskProcessUsecase.aggregateCategoryTaskRequest(periodType.getType()));
             case PROCESS_BY_MANAGER -> ResponseEntity.ok(findTaskProcessUsecase
                     .aggregateManagerTaskProcess(periodType.getType()));
-        }
-        throw new StatisticsException(STATISTICS_BAD_REQUEST);
+            default -> throw new StatisticsException(STATISTICS_BAD_REQUEST);
+        };
     }
 
     @Operation(summary = "1차 카테고리 하위 2차 카테고리별 통계 API")

From 962d5981bcda793dd36a21cdc5af63c032e40dbc Mon Sep 17 00:00:00 2001
From: Choi hyoseong <105284587+hyoseong-Choi@users.noreply.github.com>
Date: Sun, 2 Feb 2025 20:43:22 +0900
Subject: [PATCH 33/53] =?UTF-8?q?CLAP-214=20Hotfix=20:=20AddCategoryServic?=
 =?UTF-8?q?e=20=EC=A7=80=EC=97=B0=EB=A1=9C=EB=94=A9=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CLAP-110 Feature : 담당자별 작업 처리량 조회 API 구현

<footer>
- 관련: #73

* CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정

<footer>
- 관련: #74

* 내 작업한 내용에 대한 설명

* 담당자 조회 API 구현

* CLAP-111 Refactor : 통계 조회 API 주소 통합, 리팩토링, 예외처리

<footer>
- 관련: #74

* Bug : 프로퍼티파일 수정

* CLAP-104 CI/CD : CI에서 s3.yml 파일 생성하도록 수정

* CLAP-146 Feature : 카테고리 목록 조회 API 구현

<footer>
- 관련: #118

* CLAP-147 Feature : 카테고리 수정 API 구현

<footer>
- 관련: #119

* CLAP-147 Feature : 카테고리 추가, 수정 API 리뷰반영 수정

<footer>
- 관련: #119

* CLAP-148 Feature : 카테고리 삭제 API 구현

<footer>
- 관련: #120

* CLAP-148 Feature : 카테고리 삭제 API 수정

<footer>
- 관련: #120

* CLAP-148 Docs : 카테고리 API 스웨거 수정

<footer>
- 관련: #120

* CLAP-107 Bug : CI test yml파일 key 중복 수정

<footer>
- 관련: #60

* CLAP-148 Feature : 카테고리 CUD 리뷰 반영 수정, 조회 반환 양식 수정

<footer>
- 관련: #120

* CLAP-214 Cleanup : 통계, 카테고리 미흡한부분 리팩토링

<footer>
- 관련: #216

* CLAP-214 Fix : 통계조회 API 파라미터 바인딩 오류 수정

<footer>
- 관련: #216

* CLAP-214 Fix : addConverter 수정

<footer>
- 관련: #216

* CLAP-214 Hotfix : 추가한 파일들 제거

<footer>
- 관련: #216

* CLAP-214 Hotfix : FindStatisticsController 스위치문 수정

<footer>
- 관련: #216

* CLAP-214 Hotfix : AddCategoryService 지연로딩 오류 수정

<footer>
- 관련: #216
---
 .../server/application/service/admin/AddCategoryService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/clap/server/application/service/admin/AddCategoryService.java b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
index cd401450..61f656ca 100644
--- a/src/main/java/clap/server/application/service/admin/AddCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
@@ -10,6 +10,7 @@
 import clap.server.domain.model.task.Category;
 import clap.server.exception.ApplicationException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
@@ -24,6 +25,7 @@ public class AddCategoryService implements AddMainCategoryUsecase, AddSubCategor
     private final LoadMemberPort loadMemberPort;
 
     @Override
+    @Transactional
     public void addMainCategory(Long adminId, String code, String name) {
         Optional<Member> activeMember = loadMemberPort.findActiveMemberById(adminId);
         Category mainCategory = Category.createMainCategory(
@@ -33,6 +35,7 @@ public void addMainCategory(Long adminId, String code, String name) {
     }
 
     @Override
+    @Transactional
     public void addSubCategory(Long adminId, Long mainCategoryId, String code, String name) {
         Optional<Member> activeMember = loadMemberPort.findActiveMemberById(adminId);
         Optional<Category> mainCategory = loadCategoryPort.findById(mainCategoryId);

From 8ae7929e771185ef9e1f7023b12c3f61575d62f9 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sat, 1 Feb 2025 16:08:51 +0900
Subject: [PATCH 34/53] =?UTF-8?q?CLAP-196=20Add:=20ContentCachingFilter=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=ED=95=98=EC=97=AC=20request=20=EC=BA=90?=
 =?UTF-8?q?=EC=8B=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/aop/ContentCachingFilter.java      | 24 +++++++++++++++++++
 .../clap/server/config/aop/LoggingAspect.java |  7 +-----
 .../server/domain/model/log/MemberLog.java    |  2 +-
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/clap/server/config/aop/ContentCachingFilter.java

diff --git a/src/main/java/clap/server/config/aop/ContentCachingFilter.java b/src/main/java/clap/server/config/aop/ContentCachingFilter.java
new file mode 100644
index 00000000..e003c6b9
--- /dev/null
+++ b/src/main/java/clap/server/config/aop/ContentCachingFilter.java
@@ -0,0 +1,24 @@
+package clap.server.config.aop;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.util.ContentCachingRequestWrapper;
+
+import java.io.IOException;
+
+@Component
+public class ContentCachingFilter extends OncePerRequestFilter {
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+        System.out.println("In filter");
+        ContentCachingRequestWrapper contentCachingRequestWrapper = new ContentCachingRequestWrapper(request);
+        filterChain.doFilter(contentCachingRequestWrapper, response);
+        System.out.println("after doFilter");
+        System.out.println(new String(contentCachingRequestWrapper.getContentAsByteArray()));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java
index 5355d373..e1460087 100644
--- a/src/main/java/clap/server/config/aop/LoggingAspect.java
+++ b/src/main/java/clap/server/config/aop/LoggingAspect.java
@@ -45,9 +45,6 @@ public void controllerMethods() {
     public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
-        if (!(request instanceof ContentCachingRequestWrapper)) {
-            request = new ContentCachingRequestWrapper(request);
-        }
         HttpServletResponse response = attributes.getResponse();
 
         Object result = null;
@@ -98,7 +95,6 @@ private String getCustomCode(HttpServletResponse response) {
         return customCode != null ? customCode : "CUSTOM" + (response != null ? response.getStatus() : 500);
     }
 
-    //TODO: 로그인 시도 시 닉네임 파싱하도록 수정
     private String getNicknameFromRequestBody(HttpServletRequest request) {
         try {
             String requestBody = getRequestBody(request);
@@ -109,14 +105,13 @@ private String getNicknameFromRequestBody(HttpServletRequest request) {
         }
     }
 
-    //TODO: 제거
     private String getRequestBody(HttpServletRequest request) {
         try {
             ContentCachingRequestWrapper cachingRequest = (ContentCachingRequestWrapper) request;
             byte[] content = cachingRequest.getContentAsByteArray();
             return new String(content, StandardCharsets.UTF_8);
         } catch (Exception e) {
-            return "ERROR: Unable to read request body";
+            return "요청 바디의 내용을 읽을 수 없음";
         }
     }
 
diff --git a/src/main/java/clap/server/domain/model/log/MemberLog.java b/src/main/java/clap/server/domain/model/log/MemberLog.java
index 566887d9..fce005a0 100644
--- a/src/main/java/clap/server/domain/model/log/MemberLog.java
+++ b/src/main/java/clap/server/domain/model/log/MemberLog.java
@@ -25,7 +25,7 @@ public static MemberLog createMemberLog(HttpServletRequest request, HttpServletR
                 .statusCode(response.getStatus())
                 .customStatusCode(customCode)
                 .requestBody(requestBody)
-                .responseBody(responseResult != null ? responseResult.toString() : "UNKNOWN")
+                .responseBody(responseResult != null ? responseResult.toString() : "일반 실패")
                 .requestAt(LocalDateTime.now())
                 .logStatus(logStatus)
                 .member(member)

From 2fa4b86b032f0d8e94badc075ef6b864b14fce05 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sat, 1 Feb 2025 17:40:27 +0900
Subject: [PATCH 35/53] =?UTF-8?q?CLAP-196=20Fix:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EB=AA=A9=EB=A1=9D=20=EC=9D=91=EB=8B=B5=20?=
 =?UTF-8?q?imageUrl=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inbound/web/dto/task/FilterAllTasksResponse.java     | 2 ++
 .../web/dto/task/FilterAssignedTaskListResponse.java     | 1 +
 .../web/dto/task/FilterPendingApprovalResponse.java      | 3 ++-
 .../web/dto/task/FilterRequestedTasksResponse.java       | 1 +
 .../java/clap/server/application/mapper/TaskMapper.java  | 9 +++++++--
 src/main/java/clap/server/config/aop/LoggingAspect.java  | 7 -------
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAllTasksResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAllTasksResponse.java
index 71e6210b..e8caf21d 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAllTasksResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAllTasksResponse.java
@@ -12,7 +12,9 @@ public record FilterAllTasksResponse(
         String categoryName,
         String title,
         String processorName,
+        String processorUrl,
         String requesterName,
+        String requesterUrl,
         TaskStatus taskStatus,
         LocalDateTime finishedAt
 ) {
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java
index 0f444351..408dace7 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java
@@ -12,6 +12,7 @@ public record FilterAssignedTaskListResponse(
         String categoryName,
         String title,
         String requesterName,
+        String requesterUrl,
         TaskStatus taskStatus,
         LocalDateTime finishedAt
 ) {}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalResponse.java
index 0ab86e16..9fbaeee1 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalResponse.java
@@ -11,6 +11,7 @@ public record FilterPendingApprovalResponse(
         String mainCategoryName,
         String categoryName,
         String title,
-        String requesterName
+        String requesterName,
+        String requesterUrl
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterRequestedTasksResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterRequestedTasksResponse.java
index e7bf680b..8f1540e0 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterRequestedTasksResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterRequestedTasksResponse.java
@@ -12,6 +12,7 @@ public record FilterRequestedTasksResponse(
         String categoryName,
         String title,
         String processorName,
+        String processorUrl,
         TaskStatus taskStatus,
         LocalDateTime finishedAt
 ) {
diff --git a/src/main/java/clap/server/application/mapper/TaskMapper.java b/src/main/java/clap/server/application/mapper/TaskMapper.java
index 2a88dab0..c03911eb 100644
--- a/src/main/java/clap/server/application/mapper/TaskMapper.java
+++ b/src/main/java/clap/server/application/mapper/TaskMapper.java
@@ -38,6 +38,7 @@ public static FilterRequestedTasksResponse toFilterRequestedTasksResponse(Task t
                 task.getCategory().getName(),
                 task.getTitle(),
                 task.getProcessor() != null ? task.getProcessor().getMemberInfo().getNickname() : "",
+                task.getProcessor() != null ? task.getProcessor().getImageUrl() : "",
                 task.getTaskStatus(),
                 task.getFinishedAt() != null ? task.getFinishedAt() : null
         );
@@ -51,6 +52,7 @@ public static FilterAssignedTaskListResponse toFilterAssignedTaskListResponse(Ta
                 task.getCategory().getName(),
                 task.getTitle(),
                 task.getRequester() != null ? task.getRequester().getMemberInfo().getNickname() : "",
+                task.getRequester() != null ? task.getRequester().getImageUrl() : "",
                 task.getTaskStatus(),
                 task.getFinishedAt() != null ? task.getFinishedAt() : null
         );
@@ -63,7 +65,8 @@ public static FilterPendingApprovalResponse toFilterPendingApprovalTasksResponse
                 task.getCategory().getMainCategory().getName(),
                 task.getCategory().getName(),
                 task.getTitle(),
-                task.getRequester().getMemberInfo().getNickname()
+                task.getRequester() != null ? task.getRequester().getMemberInfo().getNickname() : "",
+                task.getRequester() != null ? task.getRequester().getImageUrl() : ""
         );
     }
 
@@ -106,8 +109,10 @@ public static FilterAllTasksResponse toFilterAllTasksResponse(Task task) {
                 task.getCategory().getMainCategory().getName(),
                 task.getCategory().getName(),
                 task.getTitle(),
-                task.getRequester().getMemberInfo().getNickname(),
                 task.getProcessor() != null ? task.getProcessor().getMemberInfo().getNickname() : "",
+                task.getProcessor() != null ? task.getProcessor().getImageUrl() : "",
+                task.getRequester() != null ? task.getRequester().getMemberInfo().getNickname() : "",
+                task.getRequester() != null ? task.getRequester().getImageUrl() : "",
                 task.getTaskStatus(),
                 task.getFinishedAt() != null ? task.getFinishedAt() : null
         );
diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java
index e1460087..a5990563 100644
--- a/src/main/java/clap/server/config/aop/LoggingAspect.java
+++ b/src/main/java/clap/server/config/aop/LoggingAspect.java
@@ -51,9 +51,6 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
         try {
             result = joinPoint.proceed();
         } catch (Exception ex) {
-            log.error("Exception occurred: {}", ex.getMessage());
-            log.info("response.getStatus()={}",response.getStatus());
-            log.info("getRequestBody()={}", getRequestBody(request));
             throw ex;
         } finally {
             MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
@@ -61,10 +58,6 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
             String customCode = getCustomCode(response);
             if (logType != null) {
                 if (LogStatus.LOGIN.equals(logType)) {
-                    log.info("result={}",result);
-                    log.info("response.getStatus()={}",response.getStatus());
-                    log.info("getRequestBody()={}", getRequestBody(request));
-                    log.info("getNicknameFromRequestBody()={}", getNicknameFromRequestBody(request));
                     createAnonymousLogsUsecase.createAnonymousLog(request, response, result, logType, customCode, getRequestBody(request), getNicknameFromRequestBody(request));
                 } else {
                     if (!isUserAuthenticated()) {

From ea2e6b8f56ff37ee832874a03f835f39f0b1590e Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sat, 1 Feb 2025 22:15:14 +0900
Subject: [PATCH 36/53] =?UTF-8?q?CLAP-196=20Fix:=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=A3=BC=EC=84=9D=20=EB=B0=8F=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/clap/server/config/aop/ContentCachingFilter.java | 3 ---
 src/main/java/clap/server/config/aop/LoggingAspect.java        | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/main/java/clap/server/config/aop/ContentCachingFilter.java b/src/main/java/clap/server/config/aop/ContentCachingFilter.java
index e003c6b9..f4f50619 100644
--- a/src/main/java/clap/server/config/aop/ContentCachingFilter.java
+++ b/src/main/java/clap/server/config/aop/ContentCachingFilter.java
@@ -15,10 +15,7 @@ public class ContentCachingFilter extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
             throws ServletException, IOException {
-        System.out.println("In filter");
         ContentCachingRequestWrapper contentCachingRequestWrapper = new ContentCachingRequestWrapper(request);
         filterChain.doFilter(contentCachingRequestWrapper, response);
-        System.out.println("after doFilter");
-        System.out.println(new String(contentCachingRequestWrapper.getContentAsByteArray()));
     }
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java
index a5990563..a2e491ad 100644
--- a/src/main/java/clap/server/config/aop/LoggingAspect.java
+++ b/src/main/java/clap/server/config/aop/LoggingAspect.java
@@ -26,7 +26,6 @@
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
 
 @Slf4j
 @Aspect
@@ -82,7 +81,6 @@ private LogStatus getLogType(MethodSignature methodSignature) {
         }
     }
 
-    //TODO: 로그인 시도에 대한 에러 잡도록 수정
     private String getCustomCode(HttpServletResponse response) {
         String customCode = ErrorContext.getCustomCode();
         return customCode != null ? customCode : "CUSTOM" + (response != null ? response.getStatus() : 500);

From f803696dc0123b9081eaa574ab193cdb09692c83 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 2 Feb 2025 11:19:01 +0900
Subject: [PATCH 37/53] =?UTF-8?q?CLAP-196=20Add:=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B9=85=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EC=9D=B8?=
 =?UTF-8?q?=ED=84=B0=EC=85=89=ED=84=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/config/aop/InterceptorConfig.java  | 13 ++++++++++
 .../server/config/aop/LoggingInterceptor.java | 25 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 src/main/java/clap/server/config/aop/InterceptorConfig.java
 create mode 100644 src/main/java/clap/server/config/aop/LoggingInterceptor.java

diff --git a/src/main/java/clap/server/config/aop/InterceptorConfig.java b/src/main/java/clap/server/config/aop/InterceptorConfig.java
new file mode 100644
index 00000000..ee7596ab
--- /dev/null
+++ b/src/main/java/clap/server/config/aop/InterceptorConfig.java
@@ -0,0 +1,13 @@
+package clap.server.config.aop;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class InterceptorConfig implements WebMvcConfigurer {
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new LoggingInterceptor());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/config/aop/LoggingInterceptor.java b/src/main/java/clap/server/config/aop/LoggingInterceptor.java
new file mode 100644
index 00000000..303c382a
--- /dev/null
+++ b/src/main/java/clap/server/config/aop/LoggingInterceptor.java
@@ -0,0 +1,25 @@
+package clap.server.config.aop;
+
+import io.micrometer.common.lang.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.util.ContentCachingRequestWrapper;
+
+import static clap.server.exception.ErrorContext.getCustomCode;
+
+@Slf4j
+public class LoggingInterceptor implements HandlerInterceptor {
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
+                                @Nullable Exception ex) throws Exception {
+        ContentCachingRequestWrapper cachingRequest = (ContentCachingRequestWrapper) request;
+        System.out.println("Interceptor");
+        System.out.println(new String(cachingRequest.getContentAsByteArray()));
+        int statusCode = response.getStatus();
+        String customCode = getCustomCode();
+        //TODO: 여기서 error에 대한 log 저장
+        log.info("API 응답 예외 발생 - Status: {}, CustomCode: {}", statusCode, customCode);
+    }
+}
\ No newline at end of file

From 212b13bfd2c76fb604d5cd58bc009bb223199599 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 2 Feb 2025 15:52:13 +0900
Subject: [PATCH 38/53] =?UTF-8?q?CLAP-196=20Refactor:=20=EC=98=88=EC=99=B8?=
 =?UTF-8?q?=EB=A5=BC=20=ED=86=B5=ED=95=9C=20statusCode=20=ED=8C=8C?=
 =?UTF-8?q?=EC=8B=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/CreateAnonymousLogsUsecase.java       |  2 +-
 .../inbound/log/CreateMemberLogsUsecase.java  |  2 +-
 .../log/CreateAnonymousLogsService.java       |  4 +-
 .../service/log/CreateMemberLogsService.java  |  4 +-
 .../server/config/aop/InterceptorConfig.java  | 13 -------
 .../clap/server/config/aop/LoggingAspect.java | 37 +++++++++++++------
 .../server/config/aop/LoggingInterceptor.java | 25 -------------
 .../server/domain/model/log/AnonymousLog.java |  8 ++--
 .../server/domain/model/log/MemberLog.java    |  8 ++--
 9 files changed, 39 insertions(+), 64 deletions(-)
 delete mode 100644 src/main/java/clap/server/config/aop/InterceptorConfig.java
 delete mode 100644 src/main/java/clap/server/config/aop/LoggingInterceptor.java

diff --git a/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java
index e21c6f5c..9c6eca65 100644
--- a/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java
@@ -7,6 +7,6 @@
 import java.time.LocalDateTime;
 
 public interface CreateAnonymousLogsUsecase {
-    void createAnonymousLog(HttpServletRequest request, HttpServletResponse response, Object result,  LogStatus logType, String customCode, String requestBody, String nicknameFromRequestBody);
+    void createAnonymousLog(HttpServletRequest request, int statusCode, LogStatus logStatus,  Object responseBody, String requestBody, String nickName);
 
 }
diff --git a/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java
index b6870930..8b604cf1 100644
--- a/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java
@@ -8,5 +8,5 @@
 
 public interface CreateMemberLogsUsecase {
 
-    void createMemberLog(HttpServletRequest request, HttpServletResponse response, Object result, LogStatus logType, String customCode, String body, Long userId);
+    void createMemberLog(HttpServletRequest request, int statusCode, LogStatus logStatus, Object responseBody, String requestBody, Long userId);
 }
diff --git a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java b/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java
index f2152d64..ad75a402 100644
--- a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java
+++ b/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java
@@ -18,8 +18,8 @@ public class CreateAnonymousLogsService implements CreateAnonymousLogsUsecase {
     private final ApiLogPersistenceAdapter apiLogPersistenceAdapter;
 
     @Override
-    public void createAnonymousLog(HttpServletRequest request, HttpServletResponse response, Object result, LogStatus logType, String customCode, String body, String nickName) {
-        AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, response, result,  logType, customCode, body, nickName);
+    public void createAnonymousLog(HttpServletRequest request,  int statusCode,  LogStatus logStatus, Object responseBody, String requestBody, String nickName) {
+        AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode, logStatus, responseBody, requestBody, nickName);
         apiLogPersistenceAdapter.saveAnonymousLog(anonymousLog);
     }
 }
diff --git a/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java b/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java
index 9026e8f5..7724a1cd 100644
--- a/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java
+++ b/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java
@@ -23,9 +23,9 @@ public class CreateMemberLogsService implements CreateMemberLogsUsecase {
 
     @Override
     @Transactional
-    public void createMemberLog(HttpServletRequest request, HttpServletResponse response, Object result, LogStatus logType, String customCode, String body, Long userId) {
+    public void createMemberLog(HttpServletRequest request, int statusCode, LogStatus logStatus, Object responseBody, String requestBody, Long userId) {
         Member member = memberService.findById(userId);
-        MemberLog memberLog = MemberLog.createMemberLog(request, response, result, logType, customCode, body, member);
+        MemberLog memberLog = MemberLog.createMemberLog(request, statusCode, logStatus,  responseBody, requestBody, member);
         apiLogPersistenceAdapter.saveMemberLog(memberLog);
     }
 }
diff --git a/src/main/java/clap/server/config/aop/InterceptorConfig.java b/src/main/java/clap/server/config/aop/InterceptorConfig.java
deleted file mode 100644
index ee7596ab..00000000
--- a/src/main/java/clap/server/config/aop/InterceptorConfig.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.config.aop;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new LoggingInterceptor());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java
index a2e491ad..7e792858 100644
--- a/src/main/java/clap/server/config/aop/LoggingAspect.java
+++ b/src/main/java/clap/server/config/aop/LoggingAspect.java
@@ -6,6 +6,7 @@
 import clap.server.application.port.inbound.log.CreateAnonymousLogsUsecase;
 import clap.server.application.port.inbound.log.CreateMemberLogsUsecase;
 import clap.server.config.annotation.LogType;
+import clap.server.exception.BaseException;
 import clap.server.exception.ErrorContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,9 +19,13 @@
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
+import org.springframework.web.server.ResponseStatusException;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.ContentCachingRequestWrapper;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -35,6 +40,7 @@ public class LoggingAspect {
     private final ObjectMapper objectMapper;
     private final CreateAnonymousLogsUsecase createAnonymousLogsUsecase;
     private final CreateMemberLogsUsecase createMemberLogsUsecase;
+    private final HandlerExceptionResolver handlerExceptionResolver;
 
     @Pointcut("execution(* clap.server.adapter.inbound.web..*Controller.*(..))")
     public void controllerMethods() {
@@ -47,24 +53,36 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
         HttpServletResponse response = attributes.getResponse();
 
         Object result = null;
+        Exception capturedException = null;
         try {
             result = joinPoint.proceed();
         } catch (Exception ex) {
+            capturedException = ex;
             throw ex;
         } finally {
-            MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-            LogStatus logType = getLogType(methodSignature);
-            String customCode = getCustomCode(response);
-            if (logType != null) {
-                if (LogStatus.LOGIN.equals(logType)) {
-                    createAnonymousLogsUsecase.createAnonymousLog(request, response, result, logType, customCode, getRequestBody(request), getNicknameFromRequestBody(request));
+            LogStatus logStatus = getLogType((MethodSignature) joinPoint.getSignature());
+            int statusCode;
+            if (capturedException != null) {
+                if (capturedException instanceof BaseException e) {
+                    statusCode = e.getCode().getHttpStatus().value();
+                } else {
+                    ModelAndView modelAndView = handlerExceptionResolver.resolveException(request, response, null, capturedException);
+                    statusCode = modelAndView.getStatus().value();
+                }
+            } else {
+                statusCode = response.getStatus();
+            }
+
+            if (logStatus != null) {
+                if (LogStatus.LOGIN.equals(logStatus)) {
+                    createAnonymousLogsUsecase.createAnonymousLog(request, statusCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request));
                 } else {
                     if (!isUserAuthenticated()) {
                         log.error("로그인 시도 로그를 기록할 수 없음");
                     } else {
                         Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
                         if (principal instanceof SecurityUserDetails userDetails) {
-                            createMemberLogsUsecase.createMemberLog(request, response, result, logType, customCode, getRequestBody(request), userDetails.getUserId());
+                            createMemberLogsUsecase.createMemberLog(request, statusCode, logStatus, result, getRequestBody(request), userDetails.getUserId());
                         }
                     }
                 }
@@ -81,11 +99,6 @@ private LogStatus getLogType(MethodSignature methodSignature) {
         }
     }
 
-    private String getCustomCode(HttpServletResponse response) {
-        String customCode = ErrorContext.getCustomCode();
-        return customCode != null ? customCode : "CUSTOM" + (response != null ? response.getStatus() : 500);
-    }
-
     private String getNicknameFromRequestBody(HttpServletRequest request) {
         try {
             String requestBody = getRequestBody(request);
diff --git a/src/main/java/clap/server/config/aop/LoggingInterceptor.java b/src/main/java/clap/server/config/aop/LoggingInterceptor.java
deleted file mode 100644
index 303c382a..00000000
--- a/src/main/java/clap/server/config/aop/LoggingInterceptor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package clap.server.config.aop;
-
-import io.micrometer.common.lang.Nullable;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.util.ContentCachingRequestWrapper;
-
-import static clap.server.exception.ErrorContext.getCustomCode;
-
-@Slf4j
-public class LoggingInterceptor implements HandlerInterceptor {
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
-                                @Nullable Exception ex) throws Exception {
-        ContentCachingRequestWrapper cachingRequest = (ContentCachingRequestWrapper) request;
-        System.out.println("Interceptor");
-        System.out.println(new String(cachingRequest.getContentAsByteArray()));
-        int statusCode = response.getStatus();
-        String customCode = getCustomCode();
-        //TODO: 여기서 error에 대한 log 저장
-        log.info("API 응답 예외 발생 - Status: {}, CustomCode: {}", statusCode, customCode);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/clap/server/domain/model/log/AnonymousLog.java b/src/main/java/clap/server/domain/model/log/AnonymousLog.java
index c0324740..282a7947 100644
--- a/src/main/java/clap/server/domain/model/log/AnonymousLog.java
+++ b/src/main/java/clap/server/domain/model/log/AnonymousLog.java
@@ -16,15 +16,15 @@
 public class AnonymousLog extends ApiLog {
     private String loginNickname;
 
-    public static AnonymousLog createAnonymousLog(HttpServletRequest request, HttpServletResponse response, Object responseResult, LogStatus logStatus, String customCode, String requestBody, String nickName) {
+    public static AnonymousLog createAnonymousLog(HttpServletRequest request, int statusCode,  LogStatus logStatus, Object responseBody, String requestBody, String nickName) {
         return AnonymousLog.builder()
                 .clientIp(ClientIpParseUtil.getClientIp(request))
                 .requestUrl(request.getRequestURI())
                 .requestMethod(request.getMethod())
-                .statusCode(response.getStatus())
-                .customStatusCode(customCode)
+                .statusCode(statusCode)
+                .customStatusCode("")
                 .requestBody(requestBody)
-                .responseBody(responseResult != null ? responseResult.toString() : "로그인 실패")
+                .responseBody(responseBody != null ? responseBody.toString() : "로그인 실패")
                 .requestAt(LocalDateTime.now())
                 .logStatus(logStatus)
                 .loginNickname(nickName)
diff --git a/src/main/java/clap/server/domain/model/log/MemberLog.java b/src/main/java/clap/server/domain/model/log/MemberLog.java
index fce005a0..69896cf1 100644
--- a/src/main/java/clap/server/domain/model/log/MemberLog.java
+++ b/src/main/java/clap/server/domain/model/log/MemberLog.java
@@ -17,15 +17,15 @@
 public class MemberLog extends ApiLog {
     private Member member;
 
-    public static MemberLog createMemberLog(HttpServletRequest request, HttpServletResponse response, Object responseResult, LogStatus logStatus, String customCode, String requestBody, Member member) {
+    public static MemberLog createMemberLog(HttpServletRequest request, int statusCode, LogStatus logStatus, Object responseBody, String requestBody, Member member) {
         return MemberLog.builder()
                 .clientIp(ClientIpParseUtil.getClientIp(request))
                 .requestUrl(request.getRequestURI())
                 .requestMethod(request.getMethod())
-                .statusCode(response.getStatus())
-                .customStatusCode(customCode)
+                .statusCode(statusCode)
+                .customStatusCode("")
                 .requestBody(requestBody)
-                .responseBody(responseResult != null ? responseResult.toString() : "일반 실패")
+                .responseBody(responseBody != null ? responseBody.toString() : "일반 실패")
                 .requestAt(LocalDateTime.now())
                 .logStatus(logStatus)
                 .member(member)

From ab15e707619cb4d2988c1581f4be409766a38198 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 2 Feb 2025 16:02:41 +0900
Subject: [PATCH 39/53] =?UTF-8?q?CLAP-196=20Fix:=20memberLogResponse=20req?=
 =?UTF-8?q?uestAt=EC=9C=BC=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/dto/log/AnonymousLogResponse.java  | 2 --
 .../adapter/inbound/web/dto/log/MemberLogResponse.java     | 2 +-
 .../outbound/persistense/ApiLogPersistenceAdapter.java     | 6 ------
 .../clap/server/application/mapper/response/LogMapper.java | 1 -
 .../application/port/inbound/log/FindApiLogsUsecase.java   | 1 -
 .../server/application/port/outbound/log/LoadLogPort.java  | 1 -
 .../server/application/service/log/FindApiLogsService.java | 7 -------
 7 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java
index bc74da6b..d0e7b772 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java
@@ -17,8 +17,6 @@ public record AnonymousLogResponse(
         String clientIp,
         @NotBlank
         Integer statusCode,
-        @NotNull
-        String customStatusCode,
         int failedAttempts
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java
index 1c499ce7..950695e6 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java
@@ -11,7 +11,7 @@ public record MemberLogResponse(
         Long logId,
         LogStatus logStatus,
         @NotBlank
-        LocalDateTime responseAt,
+        LocalDateTime requestAt,
         String nickName,
         String clientIp,
         @NotBlank
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java
index dd3d9f25..e9d0bb8f 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java
@@ -44,12 +44,6 @@ public void saveAnonymousLog(AnonymousLog anonymousLog) {
         apiLogRepository.save(apiLogPersistenceMapper.mapAnonymousLogToEntity(anonymousLog, anonymousLog.getLoginNickname()));
     }
 
-    @Override
-    public List<ApiLog> findAllLogs() {
-        return apiLogRepository.findAll().stream()
-                .map(apiLogPersistenceMapper::mapLogEntityToDomain)
-                .toList();
-    }
 
     @Override
     public Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
diff --git a/src/main/java/clap/server/application/mapper/response/LogMapper.java b/src/main/java/clap/server/application/mapper/response/LogMapper.java
index b5759cf4..a230dda2 100644
--- a/src/main/java/clap/server/application/mapper/response/LogMapper.java
+++ b/src/main/java/clap/server/application/mapper/response/LogMapper.java
@@ -14,7 +14,6 @@ public static AnonymousLogResponse toAnonymousLogResponse(AnonymousLog anonymous
                 anonymousLog.getLoginNickname(),
                 anonymousLog.getClientIp(),
                 anonymousLog.getStatusCode(),
-                anonymousLog.getCustomStatusCode(),
                 failedAttempts
         );
     }
diff --git a/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java
index 35c7f644..34f11b6d 100644
--- a/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java
@@ -14,5 +14,4 @@
 public interface FindApiLogsUsecase {
     PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable);
     PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
-    List<ApiLog> getApiLogs();
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java b/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java
index 4ee39ae2..a517ba4a 100644
--- a/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java
+++ b/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java
@@ -12,7 +12,6 @@
 import java.util.List;
 
 public interface LoadLogPort {
-    List<ApiLog> findAllLogs();
     Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable);
 
     Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
diff --git a/src/main/java/clap/server/application/service/log/FindApiLogsService.java b/src/main/java/clap/server/application/service/log/FindApiLogsService.java
index 0798c598..fc5fc1cc 100644
--- a/src/main/java/clap/server/application/service/log/FindApiLogsService.java
+++ b/src/main/java/clap/server/application/service/log/FindApiLogsService.java
@@ -25,7 +25,6 @@
 @Transactional(readOnly = true)
 public class FindApiLogsService implements FindApiLogsUsecase {
 
-    private final ApiLogPersistenceAdapter apiLogPersistenceAdapter;
     private final LoginDomainService loginDomainService;
     private final LoadLogPort loadLogPort;
 
@@ -45,10 +44,4 @@ public PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberL
         Page<MemberLogResponse> memberLogResponses = memberLogs.map(LogMapper::toMemberLogResponse);
         return PageResponse.from(memberLogResponses);
     }
-
-    //테스트용
-    @Override
-    public List<ApiLog> getApiLogs() {
-        return apiLogPersistenceAdapter.findAllLogs();
-    }
 }

From 49593a32470cb164c7a1746f7c66e4b503dee17b Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 2 Feb 2025 16:21:01 +0900
Subject: [PATCH 40/53] =?UTF-8?q?CLAP-196=20Fix:=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=8B=A4=ED=8C=A8=20=EC=8B=9C=20=EC=84=A4=EB=AA=85=20=EA=B5=AC?=
 =?UTF-8?q?=EC=B2=B4=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../port/inbound/log/CreateAnonymousLogsUsecase.java        | 2 +-
 .../port/inbound/log/CreateMemberLogsUsecase.java           | 2 +-
 .../application/service/log/CreateAnonymousLogsService.java | 4 ++--
 .../application/service/log/CreateMemberLogsService.java    | 4 ++--
 src/main/java/clap/server/config/aop/LoggingAspect.java     | 6 ++++--
 .../java/clap/server/domain/model/log/AnonymousLog.java     | 4 ++--
 src/main/java/clap/server/domain/model/log/MemberLog.java   | 6 +++---
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java
index 9c6eca65..342dc2ea 100644
--- a/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java
@@ -7,6 +7,6 @@
 import java.time.LocalDateTime;
 
 public interface CreateAnonymousLogsUsecase {
-    void createAnonymousLog(HttpServletRequest request, int statusCode, LogStatus logStatus,  Object responseBody, String requestBody, String nickName);
+    void createAnonymousLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus,  Object responseBody, String requestBody, String nickName);
 
 }
diff --git a/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java
index 8b604cf1..756ae736 100644
--- a/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java
@@ -8,5 +8,5 @@
 
 public interface CreateMemberLogsUsecase {
 
-    void createMemberLog(HttpServletRequest request, int statusCode, LogStatus logStatus, Object responseBody, String requestBody, Long userId);
+    void createMemberLog(HttpServletRequest request, int statusCode,String customCode, LogStatus logStatus, Object responseBody, String requestBody, Long userId);
 }
diff --git a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java b/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java
index ad75a402..ff79d66e 100644
--- a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java
+++ b/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java
@@ -18,8 +18,8 @@ public class CreateAnonymousLogsService implements CreateAnonymousLogsUsecase {
     private final ApiLogPersistenceAdapter apiLogPersistenceAdapter;
 
     @Override
-    public void createAnonymousLog(HttpServletRequest request,  int statusCode,  LogStatus logStatus, Object responseBody, String requestBody, String nickName) {
-        AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode, logStatus, responseBody, requestBody, nickName);
+    public void createAnonymousLog(HttpServletRequest request,  int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName) {
+        AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName);
         apiLogPersistenceAdapter.saveAnonymousLog(anonymousLog);
     }
 }
diff --git a/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java b/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java
index 7724a1cd..690e24ea 100644
--- a/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java
+++ b/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java
@@ -23,9 +23,9 @@ public class CreateMemberLogsService implements CreateMemberLogsUsecase {
 
     @Override
     @Transactional
-    public void createMemberLog(HttpServletRequest request, int statusCode, LogStatus logStatus, Object responseBody, String requestBody, Long userId) {
+    public void createMemberLog(HttpServletRequest request, int statusCode, String customCode,LogStatus logStatus, Object responseBody, String requestBody, Long userId) {
         Member member = memberService.findById(userId);
-        MemberLog memberLog = MemberLog.createMemberLog(request, statusCode, logStatus,  responseBody, requestBody, member);
+        MemberLog memberLog = MemberLog.createMemberLog(request, statusCode, customCode, logStatus,  responseBody, requestBody, member);
         apiLogPersistenceAdapter.saveMemberLog(memberLog);
     }
 }
diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java
index 7e792858..8c9a47b7 100644
--- a/src/main/java/clap/server/config/aop/LoggingAspect.java
+++ b/src/main/java/clap/server/config/aop/LoggingAspect.java
@@ -62,9 +62,11 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
         } finally {
             LogStatus logStatus = getLogType((MethodSignature) joinPoint.getSignature());
             int statusCode;
+            String customCode = null;
             if (capturedException != null) {
                 if (capturedException instanceof BaseException e) {
                     statusCode = e.getCode().getHttpStatus().value();
+                    customCode = e.getCode().getCustomCode();
                 } else {
                     ModelAndView modelAndView = handlerExceptionResolver.resolveException(request, response, null, capturedException);
                     statusCode = modelAndView.getStatus().value();
@@ -75,14 +77,14 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
 
             if (logStatus != null) {
                 if (LogStatus.LOGIN.equals(logStatus)) {
-                    createAnonymousLogsUsecase.createAnonymousLog(request, statusCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request));
+                    createAnonymousLogsUsecase.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request));
                 } else {
                     if (!isUserAuthenticated()) {
                         log.error("로그인 시도 로그를 기록할 수 없음");
                     } else {
                         Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
                         if (principal instanceof SecurityUserDetails userDetails) {
-                            createMemberLogsUsecase.createMemberLog(request, statusCode, logStatus, result, getRequestBody(request), userDetails.getUserId());
+                            createMemberLogsUsecase.createMemberLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), userDetails.getUserId());
                         }
                     }
                 }
diff --git a/src/main/java/clap/server/domain/model/log/AnonymousLog.java b/src/main/java/clap/server/domain/model/log/AnonymousLog.java
index 282a7947..06f56b95 100644
--- a/src/main/java/clap/server/domain/model/log/AnonymousLog.java
+++ b/src/main/java/clap/server/domain/model/log/AnonymousLog.java
@@ -16,13 +16,13 @@
 public class AnonymousLog extends ApiLog {
     private String loginNickname;
 
-    public static AnonymousLog createAnonymousLog(HttpServletRequest request, int statusCode,  LogStatus logStatus, Object responseBody, String requestBody, String nickName) {
+    public static AnonymousLog createAnonymousLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName) {
         return AnonymousLog.builder()
                 .clientIp(ClientIpParseUtil.getClientIp(request))
                 .requestUrl(request.getRequestURI())
                 .requestMethod(request.getMethod())
                 .statusCode(statusCode)
-                .customStatusCode("")
+                .customStatusCode(customCode != null ? customCode : "")
                 .requestBody(requestBody)
                 .responseBody(responseBody != null ? responseBody.toString() : "로그인 실패")
                 .requestAt(LocalDateTime.now())
diff --git a/src/main/java/clap/server/domain/model/log/MemberLog.java b/src/main/java/clap/server/domain/model/log/MemberLog.java
index 69896cf1..933b753e 100644
--- a/src/main/java/clap/server/domain/model/log/MemberLog.java
+++ b/src/main/java/clap/server/domain/model/log/MemberLog.java
@@ -17,15 +17,15 @@
 public class MemberLog extends ApiLog {
     private Member member;
 
-    public static MemberLog createMemberLog(HttpServletRequest request, int statusCode, LogStatus logStatus, Object responseBody, String requestBody, Member member) {
+    public static MemberLog createMemberLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, Member member) {
         return MemberLog.builder()
                 .clientIp(ClientIpParseUtil.getClientIp(request))
                 .requestUrl(request.getRequestURI())
                 .requestMethod(request.getMethod())
                 .statusCode(statusCode)
-                .customStatusCode("")
+                .customStatusCode(customCode != null ? customCode : "")
                 .requestBody(requestBody)
-                .responseBody(responseBody != null ? responseBody.toString() : "일반 실패")
+                .responseBody(responseBody != null ? responseBody.toString() : logStatus.getDescription() + " 실패")
                 .requestAt(LocalDateTime.now())
                 .logStatus(logStatus)
                 .member(member)

From f39063deb99e0d8d2ff48231db299642b4108971 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 2 Feb 2025 16:37:16 +0900
Subject: [PATCH 41/53] =?UTF-8?q?CLAP-196=20Add:=20=EC=A0=9C=EC=95=BD=20?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95=EC=9D=84=20=EC=9C=84?=
 =?UTF-8?q?=ED=95=9C=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ApiLogPersistenceMapper.java           | 15 ---------------
 ...95__Modify_Custom_Status_Code_From_Api_Log.sql |  2 ++
 ...0250202196__Modify_Log_Status_From_Api_Log.sql |  4 ++++
 3 files changed, 6 insertions(+), 15 deletions(-)
 create mode 100644 src/main/resources/db/migration/dev/V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql
 create mode 100644 src/main/resources/db/migration/dev/V20250202196__Modify_Log_Status_From_Api_Log.sql

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/mapper/ApiLogPersistenceMapper.java b/src/main/java/clap/server/adapter/outbound/persistense/mapper/ApiLogPersistenceMapper.java
index 1b986eb1..573ac8d8 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/mapper/ApiLogPersistenceMapper.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/mapper/ApiLogPersistenceMapper.java
@@ -78,19 +78,4 @@ public MemberLog mapMemberLogEntityToDomain(MemberLogEntity memberLogEntity) {
                         : null)
                 .build();
     }
-
-    public ApiLog mapLogEntityToDomain(ApiLogEntity logEntity) {
-        return ApiLog.builder()
-                .logId(logEntity.getLogId())
-                .clientIp(logEntity.getClientIp())
-                .requestUrl(logEntity.getRequestUrl())
-                .requestMethod(logEntity.getRequestMethod().name())
-                .statusCode(logEntity.getStatusCode())
-                .customStatusCode(logEntity.getCustomStatusCode())
-                .requestBody(logEntity.getRequestBody())
-                .responseBody(logEntity.getResponseBody())
-                .requestAt(logEntity.getRequestAt())
-                .logStatus(logEntity.getLogStatus())
-                .build();
-    }
 }
diff --git a/src/main/resources/db/migration/dev/V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql b/src/main/resources/db/migration/dev/V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql
new file mode 100644
index 00000000..1e4167a2
--- /dev/null
+++ b/src/main/resources/db/migration/dev/V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql
@@ -0,0 +1,2 @@
+ALTER TABLE api_log
+    MODIFY COLUMN custom_status_code VARCHAR(255) NULL;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/dev/V20250202196__Modify_Log_Status_From_Api_Log.sql b/src/main/resources/db/migration/dev/V20250202196__Modify_Log_Status_From_Api_Log.sql
new file mode 100644
index 00000000..b9b69e64
--- /dev/null
+++ b/src/main/resources/db/migration/dev/V20250202196__Modify_Log_Status_From_Api_Log.sql
@@ -0,0 +1,4 @@
+ALTER TABLE api_log
+    MODIFY COLUMN log_status ENUM('LOGIN', 'REQUEST_CREATED', 'REQUEST_UPDATED', 'REQUEST_CANCELLED',
+    'REQUEST_APPROVED', 'ASSIGNER_CHANGED', 'COMMENT_ADDED',
+    'COMMENT_UPDATED', 'STATUS_CHANGED', 'TASK_VIEWED') NOT NULL;
\ No newline at end of file

From fb111422b89ffd01ad2a9640fb7d6d3aa4be4fc6 Mon Sep 17 00:00:00 2001
From: parkjaehak <atom8426@gmail.com>
Date: Sun, 2 Feb 2025 20:45:21 +0900
Subject: [PATCH 42/53] =?UTF-8?q?CLAP-196=20Fix:=20flyway=20=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EB=B3=91=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql    | 2 --
 ...__Modify_Custom_Status_Code_And_Log_Status_From_Api_Log.sql} | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 src/main/resources/db/migration/dev/V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql
 rename src/main/resources/db/migration/dev/{V20250202196__Modify_Log_Status_From_Api_Log.sql => V20250202196__Modify_Custom_Status_Code_And_Log_Status_From_Api_Log.sql} (81%)

diff --git a/src/main/resources/db/migration/dev/V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql b/src/main/resources/db/migration/dev/V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql
deleted file mode 100644
index 1e4167a2..00000000
--- a/src/main/resources/db/migration/dev/V20250202195__Modify_Custom_Status_Code_From_Api_Log.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE api_log
-    MODIFY COLUMN custom_status_code VARCHAR(255) NULL;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/dev/V20250202196__Modify_Log_Status_From_Api_Log.sql b/src/main/resources/db/migration/dev/V20250202196__Modify_Custom_Status_Code_And_Log_Status_From_Api_Log.sql
similarity index 81%
rename from src/main/resources/db/migration/dev/V20250202196__Modify_Log_Status_From_Api_Log.sql
rename to src/main/resources/db/migration/dev/V20250202196__Modify_Custom_Status_Code_And_Log_Status_From_Api_Log.sql
index b9b69e64..b69f2e67 100644
--- a/src/main/resources/db/migration/dev/V20250202196__Modify_Log_Status_From_Api_Log.sql
+++ b/src/main/resources/db/migration/dev/V20250202196__Modify_Custom_Status_Code_And_Log_Status_From_Api_Log.sql
@@ -1,4 +1,5 @@
 ALTER TABLE api_log
+    MODIFY COLUMN custom_status_code VARCHAR(255) NULL,
     MODIFY COLUMN log_status ENUM('LOGIN', 'REQUEST_CREATED', 'REQUEST_UPDATED', 'REQUEST_CANCELLED',
     'REQUEST_APPROVED', 'ASSIGNER_CHANGED', 'COMMENT_ADDED',
     'COMMENT_UPDATED', 'STATUS_CHANGED', 'TASK_VIEWED') NOT NULL;
\ No newline at end of file

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

<footer>
- 관련: #215
---
 .../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 18668664fd392251f848a8447886943958d9e7eb Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 21:30:46 +0900
Subject: [PATCH 44/53] =?UTF-8?q?CLAP-213=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 66aa9f171ab16f99223b6f434bc236a04ae052fb Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 21:46:26 +0900
Subject: [PATCH 45/53] =?UTF-8?q?CLAP-213=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 f7f6312cd109f81dc47d16ad9d75c4f27b0537b4 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 21:49:42 +0900
Subject: [PATCH 46/53] =?UTF-8?q?CLAP-213=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) {

From b79a82d70fd9734db7e13025d3ee4e028252198a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 22:02:58 +0900
Subject: [PATCH 47/53] =?UTF-8?q?CLAP-213=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EC=83=81=EC=88=98=EB=93=A4=EC=9D=84=20?=
 =?UTF-8?q?=EC=BA=A1=EC=8A=90=ED=99=94=ED=95=9C=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EB=A1=9C=20=ED=86=B5=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 관련: #215
---
 .../entity/task/constant/TaskStatus.java           |  7 -------
 .../service/task/GetTaskBoardService.java          |  6 +++---
 .../java/clap/server/domain/model/task/Task.java   |  2 +-
 .../domain/policy/task/TaskOrderGapPolicy.java     |  8 --------
 .../server/domain/policy/task/TaskValuePolicy.java | 14 ++++++++++++++
 5 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 src/main/java/clap/server/domain/policy/task/TaskOrderGapPolicy.java
 create mode 100644 src/main/java/clap/server/domain/policy/task/TaskValuePolicy.java

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java
index 3eb78723..d3d335bc 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java
@@ -16,11 +16,4 @@ public enum TaskStatus {
     TERMINATED("종료");
 
     private final String description;
-
-    public static List<TaskStatus> getTaskBoardStatusList() {
-        return List.of(
-                TaskStatus.IN_PROGRESS,
-                TaskStatus.PENDING_COMPLETED,
-                TaskStatus.COMPLETED);
-    }
 }
diff --git a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
index 16a3569f..5d377ca8 100644
--- a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
@@ -10,6 +10,7 @@
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.task.Task;
+import clap.server.domain.policy.task.TaskValuePolicy;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
@@ -25,7 +26,6 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 class GetTaskBoardService implements GetTaskBoardUsecase, FilterTaskBoardUsecase {
-    private final static List<TaskStatus> VIEWABLE_STATUSES = TaskStatus.getTaskBoardStatusList();
 
     private final MemberService memberService;
     private final LoadTaskPort loadTaskPort;
@@ -34,7 +34,7 @@ class GetTaskBoardService implements GetTaskBoardUsecase, FilterTaskBoardUsecase
     public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
         memberService.findActiveMember(processorId);
         LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
-        Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, VIEWABLE_STATUSES, untilDateTime, pageable);
+        Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, List.of(TaskValuePolicy.TASK_BOARD_STATUS_FILTER), untilDateTime, pageable);
         return TaskMapper.toSliceTaskItemResponse(tasks);
     }
 
@@ -42,7 +42,7 @@ public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pa
     public TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate untilDate, FilterTaskBoardRequest request, Pageable pageable) {
         memberService.findActiveMember(processorId);
         LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
-        Slice<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, VIEWABLE_STATUSES, untilDateTime, request, pageable);
+        Slice<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, List.of(TaskValuePolicy.TASK_BOARD_STATUS_FILTER), untilDateTime, request, pageable);
         return TaskMapper.toSliceTaskItemResponse(tasks);
     }
 }
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 50362b30..89abf6e2 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.policy.task.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+import static clap.server.domain.policy.task.TaskValuePolicy.DEFAULT_PROCESSOR_ORDER_GAP;
 
 @Getter
 @SuperBuilder
diff --git a/src/main/java/clap/server/domain/policy/task/TaskOrderGapPolicy.java b/src/main/java/clap/server/domain/policy/task/TaskOrderGapPolicy.java
deleted file mode 100644
index bca343ea..00000000
--- a/src/main/java/clap/server/domain/policy/task/TaskOrderGapPolicy.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package clap.server.domain.policy.task;
-
-import lombok.Getter;
-
-@Getter
-public class TaskOrderGapPolicy {
-    public static final long DEFAULT_PROCESSOR_ORDER_GAP = (long) Math.pow(2,6);
-}
\ No newline at end of file
diff --git a/src/main/java/clap/server/domain/policy/task/TaskValuePolicy.java b/src/main/java/clap/server/domain/policy/task/TaskValuePolicy.java
new file mode 100644
index 00000000..a9a39037
--- /dev/null
+++ b/src/main/java/clap/server/domain/policy/task/TaskValuePolicy.java
@@ -0,0 +1,14 @@
+package clap.server.domain.policy.task;
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import lombok.Getter;
+
+@Getter
+public class TaskValuePolicy {
+    public static final long DEFAULT_PROCESSOR_ORDER_GAP = (long) Math.pow(2,6);
+
+    public static final TaskStatus[] TASK_BOARD_STATUS_FILTER = {
+            TaskStatus.IN_PROGRESS,
+            TaskStatus.PENDING_COMPLETED,
+            TaskStatus.COMPLETED};
+}
\ No newline at end of file

From fc5ed201cdde6f547111db27286d20b8b52758c2 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 22:16:40 +0900
Subject: [PATCH 48/53] merge conflict solve

---
 .../inbound/web/admin/FindMemberController.java        |  4 ++--
 .../inbound/admin/FindMembersWithFilterUsecase.java    | 10 ++++++++++
 .../{member => admin}/FindAllMembersService.java       |  4 ++--
 .../FindMembersWithFilterService.java                  |  4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java
 rename src/main/java/clap/server/application/service/{member => admin}/FindAllMembersService.java (82%)
 rename src/main/java/clap/server/application/service/{member => admin}/FindMembersWithFilterService.java (84%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
index 28a18ec7..3cf036f0 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
@@ -3,8 +3,8 @@
 import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse;
 import clap.server.application.mapper.RetrieveAllMemberMapper;
-import clap.server.application.port.inbound.management.FindAllMembersUsecase;
-import clap.server.application.port.inbound.management.FindMembersWithFilterUsecase;
+import clap.server.application.port.inbound.admin.FindAllMembersUsecase;
+import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase;
 import clap.server.domain.model.member.Member;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java
new file mode 100644
index 00000000..4f263b51
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java
@@ -0,0 +1,10 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.domain.model.member.Member;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface FindMembersWithFilterUsecase {
+    Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest);
+}
diff --git a/src/main/java/clap/server/application/service/member/FindAllMembersService.java b/src/main/java/clap/server/application/service/admin/FindAllMembersService.java
similarity index 82%
rename from src/main/java/clap/server/application/service/member/FindAllMembersService.java
rename to src/main/java/clap/server/application/service/admin/FindAllMembersService.java
index 4467bd84..55874fb3 100644
--- a/src/main/java/clap/server/application/service/member/FindAllMembersService.java
+++ b/src/main/java/clap/server/application/service/admin/FindAllMembersService.java
@@ -1,6 +1,6 @@
-package clap.server.application.service.member;
+package clap.server.application.service.admin;
 
-import clap.server.application.port.inbound.management.FindAllMembersUsecase;
+import clap.server.application.port.inbound.admin.FindAllMembersUsecase;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java b/src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java
similarity index 84%
rename from src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java
rename to src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java
index c13176e7..529ce8ec 100644
--- a/src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java
+++ b/src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java
@@ -1,7 +1,7 @@
-package clap.server.application.service.member;
+package clap.server.application.service.admin;
 
 import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
-import clap.server.application.port.inbound.management.FindMembersWithFilterUsecase;
+import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;

From d61db8f57a86a14002cf3652bf9f7bee2d2caf24 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 22:18:08 +0900
Subject: [PATCH 49/53] =?UTF-8?q?CLAP-213=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=EB=90=9C=20=EC=83=81=EC=88=98=EB=93=A4?=
 =?UTF-8?q?=EC=9D=84=20=EC=BA=A1=EC=8A=90=ED=99=94=ED=95=9C=20policy=20?=
 =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A1=9C=20=ED=86=B5=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #215
---
 .../persistense/entity/task/constant/TaskStatus.java        | 3 ---
 .../application/service/task/GetTaskBoardService.java       | 4 ++--
 .../application/service/task/UpdateTaskBoardService.java    | 3 ++-
 .../domain/policy/task/TaskOrderCalculationPolicy.java      | 2 +-
 .../clap/server/domain/policy/task/TaskValuePolicy.java     | 6 ++++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java
index d3d335bc..c2990dfd 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java
@@ -1,11 +1,8 @@
 package clap.server.adapter.outbound.persistense.entity.task.constant;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.List;
-
 @Getter
 @RequiredArgsConstructor
 public enum TaskStatus {
diff --git a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
index 5d377ca8..e624f1a2 100644
--- a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
@@ -34,7 +34,7 @@ class GetTaskBoardService implements GetTaskBoardUsecase, FilterTaskBoardUsecase
     public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
         memberService.findActiveMember(processorId);
         LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
-        Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, List.of(TaskValuePolicy.TASK_BOARD_STATUS_FILTER), untilDateTime, pageable);
+        Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, TaskValuePolicy.TASK_BOARD_STATUS_FILTER, untilDateTime, pageable);
         return TaskMapper.toSliceTaskItemResponse(tasks);
     }
 
@@ -42,7 +42,7 @@ public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pa
     public TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate untilDate, FilterTaskBoardRequest request, Pageable pageable) {
         memberService.findActiveMember(processorId);
         LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
-        Slice<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, List.of(TaskValuePolicy.TASK_BOARD_STATUS_FILTER), untilDateTime, request, pageable);
+        Slice<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, TaskValuePolicy.TASK_BOARD_STATUS_FILTER, untilDateTime, request, pageable);
         return TaskMapper.toSliceTaskItemResponse(tasks);
     }
 }
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 f7af4cf7..1e0f7dca 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -13,6 +13,7 @@
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;
+import clap.server.domain.policy.task.TaskValuePolicy;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -137,7 +138,7 @@ public void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetSta
         }
 
         // 타겟 상태가 유효한지 검증
-        if (targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)) {
+        if (targetStatus != null && !TaskValuePolicy.TASK_BOARD_STATUS_FILTER.contains(targetStatus)) {
             throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
         }
     }
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 bd73e31e..64f7ec29 100644
--- a/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
@@ -5,7 +5,7 @@
 import clap.server.exception.DomainException;
 import clap.server.exception.code.TaskErrorCode;
 
-import static clap.server.domain.policy.task.TaskOrderGapPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+import static clap.server.domain.policy.task.TaskValuePolicy.DEFAULT_PROCESSOR_ORDER_GAP;
 
 @Policy
 public class TaskOrderCalculationPolicy {
diff --git a/src/main/java/clap/server/domain/policy/task/TaskValuePolicy.java b/src/main/java/clap/server/domain/policy/task/TaskValuePolicy.java
index a9a39037..2663d656 100644
--- a/src/main/java/clap/server/domain/policy/task/TaskValuePolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/TaskValuePolicy.java
@@ -3,12 +3,14 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 public class TaskValuePolicy {
     public static final long DEFAULT_PROCESSOR_ORDER_GAP = (long) Math.pow(2,6);
 
-    public static final TaskStatus[] TASK_BOARD_STATUS_FILTER = {
+    public static final List<TaskStatus> TASK_BOARD_STATUS_FILTER = List.of(
             TaskStatus.IN_PROGRESS,
             TaskStatus.PENDING_COMPLETED,
-            TaskStatus.COMPLETED};
+            TaskStatus.COMPLETED);
 }
\ No newline at end of file

From 8a47effcf57a299c94c3d590a67caf04dac304a7 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 22:47:21 +0900
Subject: [PATCH 50/53] =?UTF-8?q?CLAP-213=20Refactor:=20query=20dsl=20cust?=
 =?UTF-8?q?om=20repository=EB=A1=9C=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistense/MemberPersistenceAdapter.java | 104 ++----------------
 .../member/MemberCustomRepository.java        |  11 ++
 .../member/MemberCustomRepositoryImpl.java    |  78 +++++++++++++
 .../repository/member/MemberRepository.java   |   3 +-
 .../task/TaskCustomRepositoryImpl.java        |   3 +-
 .../inbound/admin/FindAllMembersUsecase.java  |   9 ++
 .../port/inbound/domain/MemberService.java    |  29 +----
 .../port/outbound/member/LoadMemberPort.java  |   6 +-
 8 files changed, 117 insertions(+), 126 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java
 create mode 100644 src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/FindAllMembersUsecase.java

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index 39630c88..5ba45c50 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -2,42 +2,26 @@
 
 import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
-import clap.server.domain.model.task.Task;
-import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus ;
-import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
-import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
-import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
-
-import java.util.stream.Collectors;
-import java.util.List;
-
 import clap.server.domain.model.member.Member;
-import com.querydsl.core.BooleanBuilder;
-import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
 import java.util.Optional;
-
-import static clap.server.adapter.outbound.persistense.entity.member.QMemberEntity.memberEntity;
+import java.util.stream.Collectors;
 
 @PersistenceAdapter
 @RequiredArgsConstructor
-    public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
+public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
     private final MemberRepository memberRepository;
     private final MemberPersistenceMapper memberPersistenceMapper;
-    private final TaskRepository taskRepository;
-    private final TaskPersistenceMapper taskPersistenceMapper;
-    private final JPAQueryFactory jpaQueryFactory;
 
     @Override
     public Optional<Member> findById(final Long id) {
@@ -67,91 +51,25 @@ public List<Member> findReviewers() {
     }
 
     @Override
-    public void save(final Member member) {
-        MemberEntity memberEntity = memberPersistenceMapper.toEntity(member);
-        memberRepository.save(memberEntity);
-    }
-
-    @Override
-    public List<Member> findActiveManagers() {
-        List<MemberEntity> memberEntities = memberRepository.findByRoleAndStatus(MemberRole.valueOf("ROLE_MANAGER"), MemberStatus.ACTIVE);
-        return memberEntities.stream()
-                .map(memberPersistenceMapper::toDomain)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public int getRemainingTasks(Long memberId) {
-        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED);
-        return findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
+    public Optional<Member> findReviewerById(Long id) {
+        Optional<MemberEntity> memberEntity =  memberRepository.findByMemberIdAndIsReviewerTrue(id);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
     }
 
-
     @Override
-    public List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> taskStatuses) {
-        List<TaskEntity> taskEntities = taskRepository.findByProcessor_MemberIdAndTaskStatusIn(memberId, taskStatuses);
-        return taskEntities.stream()
-                .map(taskPersistenceMapper::toDomain)
-                .collect(Collectors.toList());
+    public void save(final Member member) {
+        MemberEntity memberEntity = memberPersistenceMapper.toEntity(member);
+        memberRepository.save(memberEntity);
     }
 
     @Override
     public Page<Member> findAllMembers(Pageable pageable) {
-        return executeQueryWithPageable(pageable, new BooleanBuilder().and(memberEntity.status.ne(MemberStatus.DELETED)));
+        return memberRepository.findAllMembers(pageable).map(memberPersistenceMapper::toDomain);
     }
 
     @Override
     public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
-        BooleanBuilder whereClause = createMemberFilter(filterRequest);
-        return executeQueryWithPageable(pageable, whereClause);
-    }
-
-    // 공통 쿼리 처리
-    private Page<Member> executeQueryWithPageable(Pageable pageable, BooleanBuilder whereClause) {
-        List<MemberEntity> entities = jpaQueryFactory
-                .selectFrom(memberEntity)
-                .where(whereClause)
-                .offset(pageable.getOffset())
-                .limit(pageable.getPageSize())
-                .fetch();
-
-        long total = jpaQueryFactory
-                .select(memberEntity.count())
-                .from(memberEntity)
-                .where(whereClause)
-                .fetchOne();
-
-        return new PageImpl<>(
-                entities.stream()
-                        .map(memberPersistenceMapper::toDomain)
-                        .toList(),
-                pageable,
-                total
-        );
-    }
-
-    // 필터 조건 생성
-    private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
-        BooleanBuilder whereClause = new BooleanBuilder();
-        whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
-
-        if (filterRequest.getName() != null) {
-            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.getName()));
-        }
-        if (filterRequest.getEmail() != null) {
-            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.getEmail()));
-        }
-        if (filterRequest.getNickname() != null) {
-            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.getNickname()));
-        }
-        if (filterRequest.getDepartmentId() != null) {
-            whereClause.and(memberEntity.department.departmentId.eq(filterRequest.getDepartmentId()));
-        }
-        if (filterRequest.getRole() != null) {
-            whereClause.and(memberEntity.role.eq(filterRequest.getRole()));
-        }
-
-        return whereClause;
+        return memberRepository.findMembersWithFilter(pageable, filterRequest).map(memberPersistenceMapper::toDomain);
     }
 }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java
new file mode 100644
index 00000000..f6eff057
--- /dev/null
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java
@@ -0,0 +1,11 @@
+package clap.server.adapter.outbound.persistense.repository.member;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface MemberCustomRepository {
+    Page<MemberEntity> findAllMembers(Pageable pageable);
+    Page<MemberEntity> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) ;
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java
new file mode 100644
index 00000000..846e668a
--- /dev/null
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java
@@ -0,0 +1,78 @@
+package clap.server.adapter.outbound.persistense.repository.member;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+import static clap.server.adapter.outbound.persistense.entity.member.QMemberEntity.memberEntity;
+
+@Repository
+@RequiredArgsConstructor
+public class MemberCustomRepositoryImpl implements MemberCustomRepository {
+    private final JPAQueryFactory queryFactory;
+
+    private Page<MemberEntity> executeQueryWithPageable(Pageable pageable, BooleanBuilder whereClause) {
+        List<MemberEntity> result = queryFactory
+                .selectFrom(memberEntity)
+                .where(whereClause)
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .fetch();
+
+        long total = queryFactory
+                .select(memberEntity.count())
+                .from(memberEntity)
+                .where(whereClause)
+                .fetch().size();
+
+        return new PageImpl<>(
+                result,
+                pageable,
+                total
+        );
+    }
+
+    // 필터 조건 생성
+    private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
+        BooleanBuilder whereClause = new BooleanBuilder();
+        whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
+
+        if (filterRequest.getName() != null) {
+            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.getName()));
+        }
+        if (filterRequest.getEmail() != null) {
+            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.getEmail()));
+        }
+        if (filterRequest.getNickname() != null) {
+            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.getNickname()));
+        }
+        if (filterRequest.getDepartmentId() != null) {
+            whereClause.and(memberEntity.department.departmentId.eq(filterRequest.getDepartmentId()));
+        }
+        if (filterRequest.getRole() != null) {
+            whereClause.and(memberEntity.role.eq(filterRequest.getRole()));
+        }
+
+        return whereClause;
+    }
+
+    @Override
+    public Page<MemberEntity> findAllMembers(Pageable pageable) {
+        return executeQueryWithPageable(pageable, new BooleanBuilder().and(memberEntity.status.ne(MemberStatus.DELETED)));
+    }
+
+    @Override
+    public Page<MemberEntity> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
+        BooleanBuilder whereClause = createMemberFilter(filterRequest);
+        return executeQueryWithPageable(pageable, whereClause);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
index e4f64a10..fc8899a4 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
@@ -4,14 +4,13 @@
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface MemberRepository extends JpaRepository<MemberEntity, Long>, JpaSpecificationExecutor<MemberEntity> {
+public interface MemberRepository extends JpaRepository<MemberEntity, Long>,  MemberCustomRepository {
 
 
     List<MemberEntity> findByRoleAndStatus(MemberRole role, MemberStatus status);
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
index ca429333..5b68b86a 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -18,7 +18,8 @@
 import java.util.List;
 
 import static clap.server.adapter.outbound.persistense.entity.task.QTaskEntity.taskEntity;
-import static com.querydsl.core.types.Order.*;
+import static com.querydsl.core.types.Order.ASC;
+import static com.querydsl.core.types.Order.DESC;
 
 @Repository
 @RequiredArgsConstructor
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindAllMembersUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindAllMembersUsecase.java
new file mode 100644
index 00000000..b06a30a9
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/FindAllMembersUsecase.java
@@ -0,0 +1,9 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.domain.model.member.Member;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface FindAllMembersUsecase {
+    Page<Member> findAllMembers(Pageable pageable);
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
index 6030f267..b8396065 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
@@ -25,31 +25,10 @@ public Member findActiveMember(Long memberId) {
                 () -> new ApplicationException(MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND));
     }
 
-    public int getRemainingTasks(Long memberId) {
-        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED);
-        return loadMemberPort.findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
-    }
-
-    public String getMemberNickname(Long memberId) {
-        Member member = findById(memberId);
-        if (member.getMemberInfo() == null) {
-            throw new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND);
-        }
-        return member.getMemberInfo().getNickname();
-    }
-
-    public String getMemberImageUrl(Long memberId) {
-        Member member = findById(memberId);
-        return member.getImageUrl() != null ? member.getImageUrl() : "default-image-url";
-    }
-
-    public List<Member> findActiveManagers() {
-        List<Member> activeManagers = loadMemberPort.findActiveManagers();
-
-        if (activeManagers.isEmpty()) {
-            return List.of();
-        }
-        return activeManagers;
+    public Member findReviewer(Long memberId) {
+        return loadMemberPort.findReviewerById(memberId).orElseThrow(
+                ()-> new ApplicationException(MemberErrorCode.NOT_A_REVIEWER)
+        );
     }
 
     public List<Member> findReviewers() {
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
index 60749793..5b63970c 100644
--- a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
@@ -15,11 +15,7 @@ public interface LoadMemberPort {
 
     Optional<Member> findActiveMemberById(Long id);
 
-    List<Member> findActiveManagers();
-
-    List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> taskStatuses);
-
-    int getRemainingTasks(Long memberId);
+    Optional<Member> findReviewerById(Long id);
 
     Optional<Member> findByNickname(String nickname);
 

From d7cdcee7e86d47781555f85039ca10f57589f094 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 2 Feb 2025 22:55:46 +0900
Subject: [PATCH 51/53] =?UTF-8?q?CLAP-213=20Refactor:=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/member/FindAllMembersService.java | 20 ------------------
 .../member/FindMembersWithFilterService.java  | 21 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 src/main/java/clap/server/application/service/member/FindAllMembersService.java
 delete mode 100644 src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java

diff --git a/src/main/java/clap/server/application/service/member/FindAllMembersService.java b/src/main/java/clap/server/application/service/member/FindAllMembersService.java
deleted file mode 100644
index 4467bd84..00000000
--- a/src/main/java/clap/server/application/service/member/FindAllMembersService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package clap.server.application.service.member;
-
-import clap.server.application.port.inbound.management.FindAllMembersUsecase;
-import clap.server.application.port.outbound.member.LoadMemberPort;
-import clap.server.domain.model.member.Member;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-
-@Service
-@RequiredArgsConstructor
-public class FindAllMembersService implements FindAllMembersUsecase {
-    private final LoadMemberPort loadMemberPort;
-
-    @Override
-    public Page<Member> findAllMembers(Pageable pageable) {
-        return loadMemberPort.findAllMembers(pageable);
-    }
-}
diff --git a/src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java b/src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java
deleted file mode 100644
index c13176e7..00000000
--- a/src/main/java/clap/server/application/service/member/FindMembersWithFilterService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package clap.server.application.service.member;
-
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
-import clap.server.application.port.inbound.management.FindMembersWithFilterUsecase;
-import clap.server.application.port.outbound.member.LoadMemberPort;
-import clap.server.domain.model.member.Member;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-
-@Service
-@RequiredArgsConstructor
-public class FindMembersWithFilterService implements FindMembersWithFilterUsecase {
-    private final LoadMemberPort loadMemberPort;
-
-    @Override
-    public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
-        return loadMemberPort.findMembersWithFilter(pageable, filterRequest);
-    }
-}

From 4bd74ccdb7304f5b92cb7d5c47e5ce7e3cf07570 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 09:57:16 +0900
Subject: [PATCH 52/53] merge conflict solve

---
 .../application/service/comment/PostCommentService.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 1b7370b1..8ec5f262 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,11 @@
 package clap.server.application.service.comment;
 
-import clap.server.adapter.inbound.web.dto.task.PostAndEditCommentRequest;
+import clap.server.adapter.inbound.web.dto.comment.CreateCommentRequest;
 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.port.inbound.comment.PostCommentUsecase;
+import clap.server.application.port.inbound.comment.SaveCommentAttachmentUsecase;
+import clap.server.application.port.inbound.comment.SaveCommentUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.outbound.s3.S3UploadPort;

From 2074b5a0d4c3b8264ed7db21dc834e6fe7f9692e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 3 Feb 2025 10:01:31 +0900
Subject: [PATCH 53/53] merge conflict fix

---
 .../member/MemberCustomRepositoryImpl.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java
index 846e668a..f9ed9a79 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java
@@ -46,20 +46,20 @@ private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
         BooleanBuilder whereClause = new BooleanBuilder();
         whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
 
-        if (filterRequest.getName() != null) {
-            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.getName()));
+        if (filterRequest.name() != null) {
+            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.name()));
         }
-        if (filterRequest.getEmail() != null) {
-            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.getEmail()));
+        if (filterRequest.email() != null) {
+            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.email()));
         }
-        if (filterRequest.getNickname() != null) {
-            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.getNickname()));
+        if (filterRequest.nickName() != null) {
+            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.nickName()));
         }
-        if (filterRequest.getDepartmentId() != null) {
-            whereClause.and(memberEntity.department.departmentId.eq(filterRequest.getDepartmentId()));
+        if (filterRequest.departmentName() != null) {
+            whereClause.and(memberEntity.department.name.eq(filterRequest.departmentName()));
         }
-        if (filterRequest.getRole() != null) {
-            whereClause.and(memberEntity.role.eq(filterRequest.getRole()));
+        if (filterRequest.role() != null) {
+            whereClause.and(memberEntity.role.eq(filterRequest.role()));
         }
 
         return whereClause;