diff --git a/src/main/java/com/susanghan_guys/server/mail/application/MailService.java b/src/main/java/com/susanghan_guys/server/mail/application/MailService.java index 316f4c50..403e6bb1 100644 --- a/src/main/java/com/susanghan_guys/server/mail/application/MailService.java +++ b/src/main/java/com/susanghan_guys/server/mail/application/MailService.java @@ -58,11 +58,11 @@ public void sendMail() { } private void sendWorkMembers(Work work, String template) { - personalizeMail(new MailRequest( + personalizeMail(MailRequest.of( work.getUser().getEmail(), work.getUser().getName(), work.getTitle(), - generateUserLink(work), + generateLink(work), work.getCode(), "[%s] 수상 리포트 완성 안내".formatted(work.getTitle()) ), template); @@ -71,11 +71,11 @@ private void sendWorkMembers(Work work, String template) { if (work.getUser().getEmail().equals(workMember.getTeamMember().getEmail())) { continue; } - personalizeMail(new MailRequest( + personalizeMail(MailRequest.of( workMember.getTeamMember().getEmail(), workMember.getTeamMember().getName(), work.getTitle(), - generateWorkMemberLink(work), + generateLink(work), work.getCode(), "[%s] 수상 리포트 완성 안내".formatted(work.getTitle()) ), template); @@ -104,14 +104,10 @@ private void personalizeMail(MailRequest request, String template) { } } - private String generateUserLink(Work work) { + private String generateLink(Work work) { return redirectUri + work.getId(); } - private String generateWorkMemberLink(Work work) { - return redirectUri + work.getId() + "/verify-code"; - } - private String generateCode() { return UUID.randomUUID().toString().substring(0, 6).toUpperCase(); } diff --git a/src/main/java/com/susanghan_guys/server/mail/dto/request/MailRequest.java b/src/main/java/com/susanghan_guys/server/mail/dto/request/MailRequest.java index 8396d6e7..426a56e5 100644 --- a/src/main/java/com/susanghan_guys/server/mail/dto/request/MailRequest.java +++ b/src/main/java/com/susanghan_guys/server/mail/dto/request/MailRequest.java @@ -11,4 +11,14 @@ public record MailRequest( String code, String subject ) { + public static MailRequest of(String mail, String name, String title, String link, String code, String subject) { + return MailRequest.builder() + .mail(mail) + .name(name) + .title(title) + .link(link) + .code(code) + .subject(subject) + .build(); + } } diff --git a/src/main/java/com/susanghan_guys/server/work/dto/response/ReportInfoResponse.java b/src/main/java/com/susanghan_guys/server/work/dto/response/ReportInfoResponse.java index 91a43ecc..8f6038e1 100644 --- a/src/main/java/com/susanghan_guys/server/work/dto/response/ReportInfoResponse.java +++ b/src/main/java/com/susanghan_guys/server/work/dto/response/ReportInfoResponse.java @@ -22,6 +22,7 @@ public record ReportInfoResponse( @Schema(description = "공모전 팀원", example = "[\"김철수\", \"주정빈\", \"강수진\"]") List workMembers, + @Schema(description = "피드백 여부", example = "false") boolean hasFeedback ) { public static ReportInfoResponse from(Work work, boolean hasFeedback) {