-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #185 from AppLinkers/feature/util
REFACTOR - 이메일 관련 기능 리팩토링
- Loading branch information
Showing
22 changed files
with
598 additions
and
252 deletions.
There are no files selected for viewing
80 changes: 80 additions & 0 deletions
80
src/main/java/com/laser/ordermanage/common/email/EmailService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package com.laser.ordermanage.common.email; | ||
|
|
||
| import com.laser.ordermanage.common.email.dto.EmailRequest; | ||
| import com.laser.ordermanage.common.email.dto.EmailWithButtonRequest; | ||
| import com.laser.ordermanage.common.email.dto.EmailWithCodeRequest; | ||
| import com.laser.ordermanage.common.exception.CommonErrorCode; | ||
| import com.laser.ordermanage.common.exception.CustomCommonException; | ||
| import jakarta.mail.MessagingException; | ||
| import jakarta.mail.internet.MimeMessage; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.mail.javamail.JavaMailSender; | ||
| import org.springframework.scheduling.annotation.Async; | ||
| import org.springframework.stereotype.Service; | ||
| import org.thymeleaf.TemplateEngine; | ||
| import org.thymeleaf.context.Context; | ||
|
|
||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class EmailService { | ||
|
|
||
| private final JavaMailSender emailSender; | ||
| private final TemplateEngine templateEngine; | ||
|
|
||
| public void sendEmail(EmailRequest emailRequest) { | ||
| try { | ||
| MimeMessage emailForm = createEmailForm(emailRequest); | ||
| emailSender.send(emailForm); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| throw new CustomCommonException(CommonErrorCode.UNABLE_TO_SEND_EMAIL); | ||
| } | ||
| } | ||
|
|
||
| // 발신할 이메일 데이터 세팅 | ||
| private MimeMessage createEmailForm(EmailRequest emailRequest) throws MessagingException { | ||
| MimeMessage message = emailSender.createMimeMessage(); | ||
| message.addRecipients(MimeMessage.RecipientType.TO, emailRequest.recipient()); | ||
| message.setSubject(emailRequest.subject()); | ||
| message.setText(emailRequest.text(), "utf-8", "html"); | ||
|
|
||
| return message; | ||
| } | ||
|
|
||
| @Async("mailExecutor") | ||
| public void sendEmailWithButton(EmailWithButtonRequest request) { | ||
| Context context = new Context(); | ||
| context.setVariable("title", request.title()); | ||
| context.setVariable("content", request.content()); | ||
| context.setVariable("buttonText", request.buttonText()); | ||
| context.setVariable("buttonUrl", request.buttonUrl()); | ||
| String text = templateEngine.process("email-with-button", context); | ||
|
|
||
| EmailRequest emailRequest = EmailRequest.builder() | ||
| .recipient(request.recipient()) | ||
| .subject(request.subject()) | ||
| .text(text) | ||
| .build(); | ||
|
|
||
| sendEmail(emailRequest); | ||
| } | ||
|
|
||
| @Async("mailExecutor") | ||
| public void sendEmailWithCode(EmailWithCodeRequest request) { | ||
| Context context = new Context(); | ||
| context.setVariable("title", request.title()); | ||
| context.setVariable("content", request.content()); | ||
| context.setVariable("code", request.code()); | ||
| String text = templateEngine.process("email-with-code", context); | ||
|
|
||
| EmailRequest emailRequest = EmailRequest.builder() | ||
| .recipient(request.recipient()) | ||
| .subject(request.subject()) | ||
| .text(text) | ||
| .build(); | ||
|
|
||
| sendEmail(emailRequest); | ||
| } | ||
|
|
||
| } |
10 changes: 10 additions & 0 deletions
10
src/main/java/com/laser/ordermanage/common/email/dto/EmailRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package com.laser.ordermanage.common.email.dto; | ||
|
|
||
| import lombok.Builder; | ||
|
|
||
| @Builder | ||
| public record EmailRequest( | ||
| String recipient, | ||
| String subject, | ||
| String text | ||
| ) { } |
14 changes: 14 additions & 0 deletions
14
src/main/java/com/laser/ordermanage/common/email/dto/EmailWithButtonRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.laser.ordermanage.common.email.dto; | ||
|
|
||
| import lombok.Builder; | ||
|
|
||
| @Builder | ||
| public record EmailWithButtonRequest( | ||
| String recipient, | ||
| String subject, | ||
| String title, | ||
| String content, | ||
| String buttonText, | ||
| String buttonUrl | ||
| ) { | ||
| } |
13 changes: 13 additions & 0 deletions
13
src/main/java/com/laser/ordermanage/common/email/dto/EmailWithCodeRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.laser.ordermanage.common.email.dto; | ||
|
|
||
| import lombok.Builder; | ||
|
|
||
| @Builder | ||
| public record EmailWithCodeRequest( | ||
| String recipient, | ||
| String subject, | ||
| String title, | ||
| String content, | ||
| String code | ||
| ) { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 0 additions & 50 deletions
50
src/main/java/com/laser/ordermanage/common/mail/MailService.java
This file was deleted.
Oops, something went wrong.
23 changes: 0 additions & 23 deletions
23
src/main/java/com/laser/ordermanage/common/mail/dto/MailRequest.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.