Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,38 @@ 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());
context.setVariable("status", request.message());
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;
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/templates/comment.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@
TaskFlow 알림 서비스
</div>
<div class="content">
<p>"<strong th:text="${title}"></strong>" 댓글이 작성되었습니다</p>
<p>"<strong th:text="${title}"></strong>" 작업에 댓글이 작성되었습니다</p>
<ul>
<li>작성자: <span th:text="${commenter}"></span></li>
<li>내용: <span th:text="${comment}"></span></li>
</ul>
<div class="cta-button">
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/processor-assigned.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
<body>
<div class="email-container">
<div class="header">
TaskFlow 업데이트 알림
TaskFlow 알림 서비스
</div>
<div class="content">
<p>"<strong th:text="${title}"></strong>" 작업의 담당자가 할당되었습니다.</p>
<p>"<strong th:text="${title}"></strong>" 작업의 담당자가 선정되었습니다.</p>
<ul>
<li>담당자: <span th:text="${processorName}"></span></li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/status-switched.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
<body>
<div class="email-container">
<div class="header">
TaskFlow 업데이트 알림
TaskFlow 알림 서비스
</div>
<div class="content">
<p><strong th:text="${title}"></strong> 작업 상태가 <strong><span th:text="${status}"></span></strong> 변경되었습니다.</p>
<p><strong th:text="${title}"></strong> 작업의 상태가 <strong><span th:text="${status}"></span></strong> 으로 변경되었습니다.</p>
<div class="cta-button">
<a href="https://example.com/task/1" target="_blank" th:href="${taskDetailUrl}">확인하기</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/task-request.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
TaskFlow 알림 서비스
</div>
<div class="content">
<p><strong th:text="${receiverName}"></strong>님이 작업을 요청하였습니다.</p>
<p><strong th:text="${receiverName}"></strong> 님이 작업을 요청하였습니다.</p>
<ul>
<li>제목: <span th:text="${title}"></span></li>
</ul>
Expand Down