From 87f0feba2be336657927541df01d67debc32eb84 Mon Sep 17 00:00:00 2001 From: andrew Date: Fri, 7 Feb 2025 15:45:37 +0900 Subject: [PATCH] =?UTF-8?q?CLAP-322=20Fix=20:=20Email=20notification=20tem?= =?UTF-8?q?plate=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/outbound/api/EmailTemplateBuilder.java | 11 ++++++----- src/main/resources/templates/comment.html | 3 ++- src/main/resources/templates/processor-assigned.html | 4 ++-- src/main/resources/templates/status-switched.html | 4 ++-- src/main/resources/templates/task-request.html | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java index 43e906e3..37cf00fa 100644 --- a/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java +++ b/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java @@ -24,14 +24,14 @@ public EmailTemplate createWebhookTemplate(PushNotificationTemplate request, Str switch (request.notificationType()) { case TASK_REQUESTED: templateName = "task-request"; - subject = "[TaskFlow] 신규 작업"+ request.taskName()+ "요청되었습니다."; + subject = "[TaskFlow] 신규 작업 "+ request.taskName()+ "이 요청되었습니다."; context.setVariable("taskDetailUrl", taskDetailUrl); context.setVariable("receiverName", request.senderName()); context.setVariable("title", request.taskName()); break; case STATUS_SWITCHED: templateName = "status-switched"; - subject = "[TaskFlow] "+ request.taskName()+ " " + request.message()+ "으로 변경되었습니다."; + subject = "[TaskFlow] "+ request.taskName()+ " 작업의 상태가 " + request.message() + "으로 변경되었습니다."; context.setVariable("taskDetailUrl", taskDetailUrl); context.setVariable("receiverName", request.senderName()); context.setVariable("title", request.taskName()); @@ -39,22 +39,23 @@ public EmailTemplate createWebhookTemplate(PushNotificationTemplate request, Str break; case PROCESSOR_CHANGED: templateName = "processor-changed"; - subject = "[TaskFlow] "+ request.taskName()+ "담당자" + request.message() + " 변경되었습니다."; + subject = "[TaskFlow] "+ request.taskName()+ " 작업의 담당자가 " + request.message() + "으로 변경되었습니다."; context.setVariable("taskDetailUrl", taskDetailUrl); context.setVariable("processorName", request.message()); context.setVariable("title", request.taskName()); break; case PROCESSOR_ASSIGNED: templateName = "processor-assigned"; - subject = "[TaskFlow] "+ request.taskName()+ "담당자" + request.message() + " 지정되었습니다.."; + subject = "[TaskFlow] "+ request.taskName()+ " 작업의 담당자가 " + request.message() + "으로 선정되었습니다.."; context.setVariable("taskDetailUrl", taskDetailUrl); context.setVariable("processorName", request.message()); context.setVariable("title", request.taskName()); break; case COMMENT: templateName = "comment"; - subject = "[TaskFlow 알림] 댓글이 작성되었습니다."; + subject = "[TaskFlow] " + request.taskName() + " 작업에 " + request.commenterName() + "님이 댓글을 작성하였습니다"; context.setVariable("taskDetailUrl", taskDetailUrl); + context.setVariable("commenter", request.commenterName()); context.setVariable("comment", request.message()); context.setVariable("title", request.taskName()); break; diff --git a/src/main/resources/templates/comment.html b/src/main/resources/templates/comment.html index e059bb4b..83793cb3 100644 --- a/src/main/resources/templates/comment.html +++ b/src/main/resources/templates/comment.html @@ -69,8 +69,9 @@ TaskFlow 알림 서비스
-

"" 댓글이 작성되었습니다

+

"" 작업에 댓글이 작성되었습니다

diff --git a/src/main/resources/templates/processor-assigned.html b/src/main/resources/templates/processor-assigned.html index 9e8153d8..42970d2c 100644 --- a/src/main/resources/templates/processor-assigned.html +++ b/src/main/resources/templates/processor-assigned.html @@ -66,10 +66,10 @@