From 2dda83932cc02333b92e469367f023bf7dbc05d8 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 20:00:50 +0900
Subject: [PATCH 1/3] =?UTF-8?q?CLAP-267=20Feat:=20=EA=B0=99=EC=9D=80=20sta?=
 =?UTF-8?q?tus=EC=9D=98=20Task=20=EC=A4=91=EC=97=90=EC=84=9C=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=8B=9C=EA=B0=84=20=EA=B8=B0=EC=A4=80=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EA=B0=80=EC=9E=A5=20=EA=B0=80=EC=9E=A5=20=EA=B7=BC?=
 =?UTF-8?q?=EC=A0=91=ED=95=9C=20=EC=9D=B4=EC=A0=84=20=EB=98=90=EB=8A=94=20?=
 =?UTF-8?q?=EC=9D=B4=ED=9B=84=EC=9D=98=20Task=EB=A5=BC=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=ED=95=98=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #302
---
 .../persistense/TaskPersistenceAdapter.java   | 20 +++++++++++++++----
 .../repository/task/TaskRepository.java       |  8 +++++---
 .../port/outbound/task/LoadTaskPort.java      |  8 ++++++--
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
index 57fefeaf..ca989a80 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -81,14 +81,26 @@ public Page<Task> findAllTasks(Pageable pageable, FilterTaskListRequest filterTa
     }
 
     @Override
-    public Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder) {
-        Optional<TaskEntity> taskEntity = taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(processorId, taskStatus, processorOrder);
+    public Optional<Task> findPrevOrderTaskByProcessorOrderAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder) {
+        Optional<TaskEntity> taskEntity = taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderAsc(processorId, taskStatus, processorOrder);
         return taskEntity.map(taskPersistenceMapper::toDomain);
     }
 
     @Override
-    public Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder) {
-        Optional<TaskEntity> taskEntity = taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderDesc(processorId, taskStatus, processorOrder);
+    public Optional<Task> findNextOrderTaskByProcessorOrderAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder) {
+        Optional<TaskEntity> taskEntity = taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderAsc(processorId, taskStatus, processorOrder);
+        return taskEntity.map(taskPersistenceMapper::toDomain);
+    }
+
+    @Override
+    public Optional<Task> findPrevOrderTaskByTaskIdAndStatus(Long processorId, TaskStatus taskStatus, Long taskId) {
+        Optional<TaskEntity> taskEntity = taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndTaskIdLessThanOrderByTaskIdDesc(processorId, taskStatus, taskId);
+        return taskEntity.map(taskPersistenceMapper::toDomain);
+    }
+
+    @Override
+    public Optional<Task> findNextOrderTaskByTaskIdAndStatus(Long processorId, TaskStatus taskStatus, Long taskId) {
+        Optional<TaskEntity> taskEntity = taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndTaskIdGreaterThanOrderByTaskIdAsc(processorId, taskStatus, taskId);
         return taskEntity.map(taskPersistenceMapper::toDomain);
     }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
index 5c8fd21e..fe78f507 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
@@ -24,7 +24,6 @@ public interface TaskRepository extends JpaRepository<TaskEntity, Long>, TaskCus
 
     @Query("select t from TaskEntity t join fetch t.processor p" +
             " where t.updatedAt between :updatedAtAfter and :updatedAtBefore")
-
     List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
             @Param("updatedAtAfter") LocalDateTime updatedAtAfter,
             @Param("updatedAtBefore") LocalDateTime updatedAtBefore
@@ -49,14 +48,17 @@ List<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
 
     Optional<TaskEntity> findByTaskIdAndTaskStatus(Long id, TaskStatus status);
 
-    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(Long processorId, TaskStatus taskStatus, Long processorOrder);
+    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderAsc(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
-    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderDesc(
+    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderAsc(
             Long processorId, TaskStatus taskStatus, Long processorOrder);
 
     @Query("SELECT t FROM TaskEntity t JOIN FETCH t.processor p WHERE (:memberId IS NULL OR p.memberId = :memberId) ")
     Page<TeamTaskResponse> findTeamStatus(@Param("memberId") Long memberId, FilterTeamStatusRequest filter, Pageable pageable);
 
+    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndTaskIdLessThanOrderByTaskIdDesc(Long processorId, TaskStatus taskStatus, Long taskId);
+
+    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndTaskIdGreaterThanOrderByTaskIdAsc(Long processorId, TaskStatus status, Long taskId);
 
 
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
index a069ab78..0b385460 100644
--- a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
@@ -28,9 +28,13 @@ public interface LoadTaskPort {
 
     Optional<Task> findByIdAndStatus(Long id, TaskStatus status);
 
-    Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
+    Optional<Task> findPrevOrderTaskByProcessorOrderAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
-    Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
+    Optional<Task> findNextOrderTaskByProcessorOrderAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
+
+    Optional<Task> findPrevOrderTaskByTaskIdAndStatus(Long processorId, TaskStatus taskStatus, Long taskId);
+
+    Optional<Task> findNextOrderTaskByTaskIdAndStatus(Long processorId, TaskStatus taskStatus, Long taskId);
 
     List<Task> findTaskBoardByFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDateTime, FilterTaskBoardRequest request);
 

From 47a2cd17dc9a666c430dcbf116cdefbd7d974302 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 20:05:44 +0900
Subject: [PATCH 2/3] =?UTF-8?q?CLAP-267=20Feat:=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EB=90=9C=20=EC=9E=91=EC=97=85=20=EB=B3=B4=EB=93=9C=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=ED=95=98=EB=82=98=EC=9D=98=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EB=A7=8C=20=EC=A1=B4=EC=9E=AC=ED=95=98=EA=B3=A0,=20=EC=9D=B4?=
 =?UTF-8?q?=20=EC=9E=91=EC=97=85=EC=9D=84=20=EC=9D=B4=EB=8F=99=ED=95=A0=20?=
 =?UTF-8?q?=EB=95=8C=EC=9D=98=20case=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #302
---
 .../service/task/UpdateTaskBoardService.java  | 52 ++++++++++++++-----
 1 file changed, 38 insertions(+), 14 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 e85a1831..215722d7 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -53,7 +53,7 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
         if (request.prevTaskId() == 0) {
             Task nextTask = findByIdAndStatus(request.nextTaskId(), targetTask.getTaskStatus());
             // 해당 상태에서 바로 앞에 있는 작업 찾기
-            Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
+            Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorOrderAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
             long newOrder = taskOrderCalculationPolicy.calculateOrderForTop(prevTask, nextTask);
             updateNewTaskOrder(targetTask, newOrder);
         }
@@ -61,7 +61,7 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
         else if (request.nextTaskId() == 0) {
             Task prevTask = findByIdAndStatus(request.prevTaskId(), targetTask.getTaskStatus());
             // 해당 상태에서 바로 뒤에 있는 작업 찾기
-            Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
+            Task nextTask = loadTaskPort.findNextOrderTaskByProcessorOrderAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
             long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, nextTask);
             updateNewTaskOrder(targetTask, newOrder);
         } else {
@@ -98,21 +98,50 @@ public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest re
         Task targetTask = taskService.findById(request.targetTaskId());
         processorValidationPolicy.validateProcessor(processorId, targetTask);
 
-        if (request.prevTaskId() == 0) {
-            Task nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
+        Task prevTask;
+        Task nextTask;
+
+        // 조회된 작업 보드에서 하나의 작업만 존재하고, 이 작업을 이동할 때
+        if (request.prevTaskId() == 0 && request.nextTaskId() == 0) {
+
+            // 요청 시간 기준으로 가장 가장 근접한 이전의 Task를 조회
+            prevTask = loadTaskPort.findPrevOrderTaskByTaskIdAndStatus(processorId, targetStatus, targetTask.getTaskId()).orElse(null);
+            if (prevTask != null) {
+                // 이전 Task가 있다면 바로 다음의 Task 조회
+                nextTask = loadTaskPort.findNextOrderTaskByProcessorOrderAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
+            } // 요청 시간 기준으로 가장 가장 근접한 이후의 Task를 조회
+            else
+                nextTask = loadTaskPort.findNextOrderTaskByTaskIdAndStatus(processorId, targetStatus, targetTask.getTaskId()).orElse(null);
+
+            // 하나의 task만 존재할 경우 상태만 update
+            if (prevTask == null && nextTask == null) {
+                targetTask.updateTaskStatus(targetStatus);
+                taskService.upsert(targetTask);
+            } else if (prevTask == null) {
+                long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(null, nextTask);
+                updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+            } else if (nextTask == null) {
+                long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, null);
+                updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+            } else {
+                long newOrder = taskOrderCalculationPolicy.calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
+                updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+            }
+        } else if (request.prevTaskId() == 0) {
+            nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
             // 해당 상태에서 바로 앞 있는 작업 찾기
-            Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
+            prevTask = loadTaskPort.findPrevOrderTaskByProcessorOrderAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
             long newOrder = taskOrderCalculationPolicy.calculateOrderForTop(prevTask, nextTask);
             updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
         } else if (request.nextTaskId() == 0) {
-            Task prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
+            prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
             // 해당 상태에서 바로 뒤에 있는 작업 찾기
-            Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
+            nextTask = loadTaskPort.findNextOrderTaskByProcessorOrderAndStatus(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);
+            prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
+            nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
             long newOrder = taskOrderCalculationPolicy.calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
             updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
         }
@@ -131,11 +160,6 @@ private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTas
      * 순서 변경 요청의 유효성을 검증하는 메서드
      */
     public 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 && !TaskPolicyConstants.TASK_BOARD_STATUS_FILTER.contains(targetStatus)) {
             throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);

From eb4d03db148f2e57d3d71df3e50a0b8b5b35c4d5 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 20:19:56 +0900
Subject: [PATCH 3/3] =?UTF-8?q?CLAP-267=20Feat:=20=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=8B=9C=EC=97=90=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EC=A0=84=EC=86=A1=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #302
---
 .../service/task/UpdateTaskBoardService.java  | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 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 215722d7..75d4f099 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -1,12 +1,14 @@
 package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
+import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 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.LoadTaskPort;
+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.Task;
@@ -19,6 +21,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Slf4j
 @ApplicationService
 @RequiredArgsConstructor
@@ -26,6 +30,7 @@ class UpdateTaskBoardService implements UpdateTaskBoardUsecase, UpdateTaskOrderA
     private final MemberService memberService;
     private final TaskService taskService;
     private final LoadTaskPort loadTaskPort;
+    private final SendNotificationService sendNotificationService;
 
     private final TaskOrderCalculationPolicy taskOrderCalculationPolicy;
     private final ProcessorValidationPolicy processorValidationPolicy;
@@ -98,6 +103,7 @@ public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest re
         Task targetTask = taskService.findById(request.targetTaskId());
         processorValidationPolicy.validateProcessor(processorId, targetTask);
 
+        Task updatedTask;
         Task prevTask;
         Task nextTask;
 
@@ -116,44 +122,47 @@ public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest re
             // 하나의 task만 존재할 경우 상태만 update
             if (prevTask == null && nextTask == null) {
                 targetTask.updateTaskStatus(targetStatus);
-                taskService.upsert(targetTask);
+                updatedTask = taskService.upsert(targetTask);
             } else if (prevTask == null) {
                 long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(null, nextTask);
-                updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+                updatedTask = updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
             } else if (nextTask == null) {
                 long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, null);
-                updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+                updatedTask = updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
             } else {
                 long newOrder = taskOrderCalculationPolicy.calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
-                updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+                updatedTask = updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
             }
         } else if (request.prevTaskId() == 0) {
             nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
             // 해당 상태에서 바로 앞 있는 작업 찾기
             prevTask = loadTaskPort.findPrevOrderTaskByProcessorOrderAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
             long newOrder = taskOrderCalculationPolicy.calculateOrderForTop(prevTask, nextTask);
-            updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+            updatedTask = updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
         } else if (request.nextTaskId() == 0) {
             prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
             // 해당 상태에서 바로 뒤에 있는 작업 찾기
             nextTask = loadTaskPort.findNextOrderTaskByProcessorOrderAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
             long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, nextTask);
-            updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+            updatedTask = updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
         } else {
             prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
             nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
             long newOrder = taskOrderCalculationPolicy.calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
-            updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
+            updatedTask = updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
         }
+
+        //TODO: 최종 단계에서 주석 처리 해제
+        //publishNotification(targetTask, NotificationType.STATUS_SWITCHED, String.valueOf(updatedTask.getTaskStatus()));
     }
 
     /**
      * 작업의 상태와 순서를 업데이트하는 메서드
      */
-    private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, long newOrder) {
+    private Task updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, long newOrder) {
         targetTask.updateProcessorOrder(newOrder);
         targetTask.updateTaskStatus(targetStatus);
-        taskService.upsert(targetTask);
+        return taskService.upsert(targetTask);
     }
 
     /**
@@ -166,5 +175,15 @@ public void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetSta
         }
     }
 
+    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);
+        });
+        sendNotificationService.sendAgitNotification(notificationType,
+                task, message, null);
+    }
+
 }