CLAP-440 Fix : 작업 상태 변경 알림 중복 전송 에러 해결

Author: starboxxxx

src/main/java/clap/server/application/service/task/ApprovalTaskService.java

@@ -25,6 +25,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -61,11 +62,8 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.PROCESSOR_ASSIGNED, task, null, processor, null);
         commandTaskHistoryPort.save(taskHistory);
 
-        List<Member> receivers = Stream.of(task.getRequester(), processor)
-                .distinct()
-                .collect(Collectors.toList());
         String processorName = processor.getNickname();
-        publishNotification(receivers, task, processorName);
+        publishNotification(task, processorName);
 
         return TaskResponseMapper.toApprovalTaskResponse(taskService.upsert(task));
     }
@@ -78,7 +76,14 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
         return TaskResponseMapper.toFindApprovalFormResponse(task);
     }
 
-    private void publishNotification(List<Member> receivers, Task task, String processorName) {
+    private void publishNotification(Task task, String processorName) {
+        List<Member> receivers = new ArrayList<>();
+        receivers.add(task.getRequester());
+
+        if (!task.getRequester().getMemberId().equals(task.getProcessor().getMemberId())) {
+            receivers.add(task.getProcessor());
+        }
+
         receivers.forEach(receiver -> {
             boolean isManager = receiver.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER;
             sendNotificationService.sendPushNotification(receiver, NotificationType.PROCESSOR_ASSIGNED,

src/main/java/clap/server/application/service/task/UpdateTaskOrderAndStstusService.java

@@ -24,6 +24,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -83,7 +84,7 @@ public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest re
 
         TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.STATUS_SWITCHED, updatedTask, targetStatus.getDescription(), null,null);
         commandTaskHistoryPort.save(taskHistory);
-        publishNotification(targetTask, NotificationType.STATUS_SWITCHED, updatedTask.getDescription());
+        publishNotification(targetTask);
     }
 
     /**
@@ -139,14 +140,14 @@ public void validateRequest(TaskStatus targetStatus) {
         }
     }
 
-    private void publishNotification(Task task, NotificationType notificationType, String message) {
-        List<Member> receivers = List.of(task.getRequester(), task.getProcessor());
+    private void publishNotification(Task task) {
+        List<Member> receivers = List.of(task.getRequester());
         receivers.forEach(receiver -> {
             boolean isManager = receiver.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER;
-            sendNotificationService.sendPushNotification(receiver, notificationType, task, message, null, null, isManager);
+            sendNotificationService.sendPushNotification(receiver, NotificationType.STATUS_SWITCHED, task, task.getTaskStatus().getDescription(), null, null, isManager);
         });
-        sendNotificationService.sendAgitNotification(notificationType,
-                task, message, null);
+        sendNotificationService.sendAgitNotification(NotificationType.STATUS_SWITCHED,
+                task, task.getTaskStatus().getDescription(), null);
     }
 
 }