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 @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public record ReportInfoResponse(
@Schema(description = "공모전 팀원", example = "[\"김철수\", \"주정빈\", \"강수진\"]")
List<String> workMembers,

@Schema(description = "피드백 여부", example = "false")
boolean hasFeedback
) {
public static ReportInfoResponse from(Work work, boolean hasFeedback) {
Expand Down
Loading