diff --git a/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/controller/MailController.java b/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/controller/MailController.java index b08c815..1bc9988 100644 --- a/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/controller/MailController.java +++ b/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/controller/MailController.java @@ -5,6 +5,8 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.benchmarker.bmcontroller.mail.common.factory.EmailBodyGenerator; +import org.benchmarker.bmcontroller.mail.common.factory.EmailVerificationFactory; import org.benchmarker.bmcontroller.mail.controller.dto.*; import org.benchmarker.bmcontroller.mail.service.IMailSender; import org.springframework.http.ResponseEntity; @@ -28,7 +30,8 @@ public class MailController { public ResponseEntity mailSend(HttpServletRequest request, @Valid @RequestBody EmailCertificationDto emailCertification) { - EmailResDto mailResDto = mailSender.sendMail(emailCertification); + EmailBodyGenerator emailBodyGenerator = new EmailVerificationFactory(); + EmailResDto mailResDto = mailSender.sendMail(emailCertification, emailBodyGenerator); HttpSession session = request.getSession(); diff --git a/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/service/IMailSender.java b/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/service/IMailSender.java index cc1bb21..3e3b395 100644 --- a/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/service/IMailSender.java +++ b/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/service/IMailSender.java @@ -1,9 +1,10 @@ package org.benchmarker.bmcontroller.mail.service; +import org.benchmarker.bmcontroller.mail.common.factory.EmailBodyGenerator; import org.benchmarker.bmcontroller.mail.controller.dto.EmailCertificationDto; import org.benchmarker.bmcontroller.mail.controller.dto.EmailResDto; public interface IMailSender { - EmailResDto sendMail(EmailCertificationDto emailCertificationDto); + EmailResDto sendMail(EmailCertificationDto emailCertificationDto, EmailBodyGenerator emailBodyGenerator); } diff --git a/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/service/impl/MailSenderImpl.java b/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/service/impl/MailSenderImpl.java index 0e4461b..d6264af 100644 --- a/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/service/impl/MailSenderImpl.java +++ b/bm-controller/src/main/java/org/benchmarker/bmcontroller/mail/service/impl/MailSenderImpl.java @@ -4,6 +4,8 @@ import jakarta.mail.internet.MimeMessage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.benchmarker.bmcontroller.mail.common.factory.EmailBodyGenerator; +import org.benchmarker.bmcontroller.mail.common.factory.EmailVerificationFactory; import org.benchmarker.bmcontroller.mail.controller.dto.EmailCertificationDto; import org.benchmarker.bmcontroller.mail.controller.dto.EmailResDto; import org.benchmarker.bmcontroller.mail.service.IMailSender; @@ -22,12 +24,11 @@ public class MailSenderImpl implements IMailSender { private final IRandomCodeGenerator randomNumber; @Override - public EmailResDto sendMail(EmailCertificationDto emailCertificationDto) { + public EmailResDto sendMail(EmailCertificationDto emailCertificationDto, EmailBodyGenerator emailBodyGenerator) { String authNum = randomNumber.generateVerificationCode(); String subject = "회원 가입 인증 코드"; - String body = "안녕하세요!\n\n회원 가입을 위한 인증 코드를 안내드립니다. 아래의 인증 코드를 입력하여 계정을 활성화하세요:\n\n" - + "인증 코드: " + authNum; + String body = emailBodyGenerator.createBody(authNum); log.info("Start mail sender!!"); try {