Merge pull request #564 from TaskFlow-CLAP/CLAP-431

CLAP-431 작업 상태 변경 알림 내용 수정 및 알림 대상자 검증 logic 추가

Author: joowojr

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

@@ -26,6 +26,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @ApplicationService
 @RequiredArgsConstructor
@@ -59,7 +61,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 = List.of(task.getRequester(), processor);
+        List<Member> receivers = Stream.of(task.getRequester(), processor)
+                .distinct()
+                .collect(Collectors.toList());
         String processorName = processor.getNickname();
         publishNotification(receivers, task, processorName);
 

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

@@ -34,7 +34,7 @@ public void terminateTask(Long memberId, Long taskId, String reason) {
         TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.TASK_TERMINATED, task, reason, null, null);
         commandTaskHistoryPort.save(taskHistory);
 
-        publishNotification(task.getRequester(), task, String.valueOf(task.getTaskStatus()), reason);
+        publishNotification(task.getRequester(), task, task.getTaskStatus().getDescription(), reason);
 
     }
 

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

@@ -83,7 +83,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, String.valueOf(updatedTask.getTaskStatus()));
+        publishNotification(targetTask, NotificationType.STATUS_SWITCHED, updatedTask.getDescription());
     }
 
     /**

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

@@ -55,7 +55,7 @@ public void updateTaskStatus(Long memberId, Long taskId, TaskStatus targetTaskSt
             saveTaskHistory(TaskHistory.createTaskHistory(TaskHistoryType.STATUS_SWITCHED, task, targetTaskStatus.getDescription(), null, null));
 
             List<Member> receivers = List.of(task.getRequester());
-            publishNotification(receivers, updatedTask, NotificationType.STATUS_SWITCHED, String.valueOf(updatedTask.getTaskStatus()));
+            publishNotification(receivers, updatedTask, NotificationType.STATUS_SWITCHED, targetTaskStatus.getDescription());
         }
     }