From 756fa3f922775799f917ef1abeda4c3ecf5ca4c5 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 18:22:51 +0900
Subject: [PATCH 1/2] =?UTF-8?q?CLAP-266=20Fix:=20=EC=BB=B4=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/clap/server/application/mapper/NotificationMapper.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/clap/server/application/mapper/NotificationMapper.java b/src/main/java/clap/server/application/mapper/NotificationMapper.java
index fdacb40f..4cc1b150 100644
--- a/src/main/java/clap/server/application/mapper/NotificationMapper.java
+++ b/src/main/java/clap/server/application/mapper/NotificationMapper.java
@@ -17,6 +17,7 @@ public static FindNotificationListResponse toFindNoticeListResponse(Notification
                 notification.getReceiver().getMemberId(),
                 notification.getTask().getTitle(),
                 notification.getMessage() != null ? notification.getMessage() : null,
+                notification.isRead(),
                 notification.getCreatedAt()
         );
     }

From fe31d1086b02aae6315bf943b2a5d2bdb035865e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 18:23:14 +0900
Subject: [PATCH 2/2] =?UTF-8?q?CLAP-266=20Fix:=20=EC=9E=98=EB=AA=BB=20?=
 =?UTF-8?q?=EB=A7=A4=ED=95=91=EB=90=9C=20=EC=98=A4=EB=A5=98=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>
- 관련: #299
---
 .../service/task/UpdateTaskBoardService.java         | 12 ++++++------
 .../policy/task/TaskOrderCalculationPolicy.java      | 10 ++++------
 2 files changed, 10 insertions(+), 12 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 8cd7a74d..59fdc353 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -7,11 +7,11 @@
 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.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;
+import clap.server.domain.policy.task.ProcessorValidationPolicy;
+import clap.server.domain.policy.task.TaskOrderCalculationPolicy;
 import clap.server.domain.policy.task.TaskPolicyConstants;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.TaskErrorCode;
@@ -51,7 +51,7 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
 
         // 가장 상위로 이동
         if (request.prevTaskId() == 0) {
-            Task nextTask = findByIdAndStatus(request.targetTaskId(), targetTask.getTaskStatus());
+            Task nextTask = findByIdAndStatus(request.nextTaskId(), targetTask.getTaskStatus());
             // 해당 상태에서 바로 앞에 있는 작업 찾기
             Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
             long newOrder = taskOrderCalculationPolicy.calculateOrderForTop(targetTask, nextTask);
@@ -59,7 +59,7 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
         }
         // 가장 하위로 이동
         else if (request.nextTaskId() == 0) {
-            Task prevTask = findByIdAndStatus(request.targetTaskId(), targetTask.getTaskStatus());
+            Task prevTask = findByIdAndStatus(request.prevTaskId(), targetTask.getTaskStatus());
             // 해당 상태에서 바로 뒤에 있는 작업 찾기
             Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
             long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, nextTask);
@@ -99,13 +99,13 @@ public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest re
         processorValidationPolicy.validateProcessor(processorId, targetTask);
 
         if (request.prevTaskId() == 0) {
-            Task nextTask = findByIdAndStatus(request.targetTaskId(), targetStatus);
+            Task nextTask = findByIdAndStatus(request.nextTaskId(), 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) {
-            Task prevTask = findByIdAndStatus(request.targetTaskId(), targetStatus);
+            Task prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
             // 해당 상태에서 바로 뒤에 있는 작업 찾기
             Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
             long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, nextTask);
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 c059b21a..3bce8e73 100644
--- a/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
@@ -12,18 +12,16 @@ public class TaskOrderCalculationPolicy {
 
     public long calculateOrderForTop(Task prevTask, Task nextTask) {
         Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
-        if (prevTaskOrder == null){
+        if (prevTaskOrder == null) {
             return nextTask.getProcessorOrder() - DEFAULT_PROCESSOR_ORDER_GAP;
-        }
-        return calculateNewProcessorOrder(prevTaskOrder, nextTask.getProcessorOrder());
+        } else return calculateNewProcessorOrder(prevTaskOrder, nextTask.getProcessorOrder());
     }
 
     public long calculateOrderForBottom(Task prevTask, Task nextTask) {
         Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
-        if (nextTaskOrder == null){
+        if (nextTaskOrder == null) {
             return prevTask.getProcessorOrder() + DEFAULT_PROCESSOR_ORDER_GAP;
-        }
-        return calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTaskOrder);
+        } else return calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTaskOrder);
     }
 
     public long calculateNewProcessorOrder(Long prevTaskOrder, Long nextTaskOrder) {