From f6c0cc11ab4b6a83f526172d3dc0967c79f862f3 Mon Sep 17 00:00:00 2001 From: andrew Date: Wed, 12 Feb 2025 16:21:40 +0900 Subject: [PATCH 1/3] =?UTF-8?q?CLAP-403=20Fix=20:=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=8A=B9=EC=9D=B8=EC=97=90=20=EB=8C=80=ED=95=9C=20agit=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EC=83=9D=EC=84=B1=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/adapter/outbound/api/agit/AgitTemplateBuilder.java | 4 ++-- .../server/application/service/webhook/SendAgitService.java | 2 ++ .../application/service/webhook/SendNotificationService.java | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java index cac0c9f1..aaf6fb00 100644 --- a/src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java +++ b/src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java @@ -52,8 +52,8 @@ public String createMessage(PushNotificationTemplate request, String taskDetailU case PROCESSOR_CHANGED -> "담당자가 " + "*" + request.message() + "*" + "으로 변경되었습니다."; - case PROCESSOR_ASSIGNED -> "작업이 *승인*되었습니다.*\n" - + "\\t\\t*• 👤 담당자:* " + "*" + request.message() + "*"; + case PROCESSOR_ASSIGNED -> "*작업*이 *승인*되었습니다.\\n" + + "\\t\\t*•담당자:* " + "*" + request.message() + "*"; default -> null; }; diff --git a/src/main/java/clap/server/application/service/webhook/SendAgitService.java b/src/main/java/clap/server/application/service/webhook/SendAgitService.java index 4b004702..bdcb34ba 100644 --- a/src/main/java/clap/server/application/service/webhook/SendAgitService.java +++ b/src/main/java/clap/server/application/service/webhook/SendAgitService.java @@ -7,6 +7,7 @@ import clap.server.domain.model.task.Task; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @@ -15,6 +16,7 @@ public class SendAgitService { private final SendAgitPort agitPort; private final TaskService taskService; + @Transactional public void sendAgit(PushNotificationTemplate request, Task task, String taskDetailUrl) { Long agitPostId = agitPort.sendAgit(request, task, taskDetailUrl); diff --git a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java index f28c4852..1957bfd9 100644 --- a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java +++ b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java @@ -86,7 +86,6 @@ public void sendPushNotification(Member receiver, NotificationType notificationT } @Async("notificationExecutor") - @Transactional public void sendAgitNotification(NotificationType notificationType, Task task, String message, String commenterName) { PushNotificationTemplate pushNotificationTemplate = new PushNotificationTemplate( From 790e3dcbc8536f492f6d9ad00a15cec510c21e3d Mon Sep 17 00:00:00 2001 From: andrew Date: Wed, 12 Feb 2025 16:21:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?CLAP-403=20Fix=20:=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=9D=BD=EC=9D=8C=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/notification/NotificationRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java index b871a0cf..9a364a83 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java @@ -25,7 +25,7 @@ Slice findAllByReceiver_MemberIdOrderByCreatedAtDesc( @Query("SELECT n FROM NotificationEntity n " + "WHERE n.receiver.memberId = :receiverId " + "AND n.task.isDeleted = false") - List findAllByReceiver_MemberId(Long memberId); + List findAllByReceiver_MemberId(Long receiverId); List findByTask_TaskId(Long taskId); From e4ded770ce7ac11841698eee68532271e8532a3a Mon Sep 17 00:00:00 2001 From: andrew Date: Wed, 12 Feb 2025 16:22:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?CLAP-403=20Fix=20:=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=20=EA=B6=8C=ED=95=9C=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 ecb92333..8223e79f 100644 --- a/src/main/java/clap/server/application/service/task/TerminateTaskService.java +++ b/src/main/java/clap/server/application/service/task/TerminateTaskService.java @@ -28,7 +28,6 @@ public class TerminateTaskService implements TerminateTaskUsecase { @Override public void terminateTask(Long memberId, Long taskId, String reason) { - memberService.findReviewer(memberId); Task task = taskService.findById(taskId); task.terminateTask(); taskService.upsert(task); @@ -42,5 +41,6 @@ public void terminateTask(Long memberId, Long taskId, String reason) { private void publishNotification(Member receiver, Task task, String message, String reason) { sendNotificationService.sendPushNotification(receiver, NotificationType.STATUS_SWITCHED, task, message, reason, null, false); + sendNotificationService.sendAgitNotification(NotificationType.STATUS_SWITCHED, task, message, null); } }