From 0ed897e6cd611cebc8d1f50de090f57644c7abca Mon Sep 17 00:00:00 2001 From: andrew Date: Fri, 14 Feb 2025 13:16:20 +0900 Subject: [PATCH 1/4] =?UTF-8?q?CLAP-431=20Feat=20:=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=88=98=EC=8B=A0=EC=9E=90=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C?= =?UTF-8?q?=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 --- .../application/service/task/ApprovalTaskService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 7478fecb..94d9a92b 100644 --- a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java +++ b/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 receivers = List.of(task.getRequester(), processor); + List receivers = Stream.of(task.getRequester(), processor) + .distinct() + .collect(Collectors.toList()); String processorName = processor.getNickname(); publishNotification(receivers, task, processorName); From 5e8e0f6b5f801230bf3ac650929ff6f7580b2f58 Mon Sep 17 00:00:00 2001 From: andrew Date: Fri, 14 Feb 2025 13:17:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?CLAP-431=20Fix=20:=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/application/service/task/TerminateTaskService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/clap/server/application/service/task/TerminateTaskService.java b/src/main/java/clap/server/application/service/task/TerminateTaskService.java index d0d3700d..dda3758c 100644 --- a/src/main/java/clap/server/application/service/task/TerminateTaskService.java +++ b/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); } From 8ae1792239f9719f8fb8155d37afc19bb99f2036 Mon Sep 17 00:00:00 2001 From: andrew Date: Fri, 14 Feb 2025 14:04:08 +0900 Subject: [PATCH 3/4] =?UTF-8?q?CLAP-431=20Fix=20:=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=20=EB=A9=94=EC=8B=9C=EC=A7=80=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/server/application/service/task/UpdateTaskService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bb6242ee..15db332f 100644 --- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java +++ b/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 receivers = List.of(task.getRequester()); - publishNotification(receivers, updatedTask, NotificationType.STATUS_SWITCHED, String.valueOf(updatedTask.getTaskStatus())); + publishNotification(receivers, updatedTask, NotificationType.STATUS_SWITCHED, targetTaskStatus.getDescription()); } } From 7f8a698cf90cead363678efeea6f240c4d53314c Mon Sep 17 00:00:00 2001 From: andrew Date: Fri, 14 Feb 2025 14:10:24 +0900 Subject: [PATCH 4/4] =?UTF-8?q?CLAP-431=20Fix=20:=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=20=EB=A9=94=EC=8B=9C=EC=A7=80=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 --- .../service/task/UpdateTaskOrderAndStstusService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskOrderAndStstusService.java b/src/main/java/clap/server/application/service/task/UpdateTaskOrderAndStstusService.java index fac7a7f0..91179f93 100644 --- a/src/main/java/clap/server/application/service/task/UpdateTaskOrderAndStstusService.java +++ b/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()); } /**