[DDING-000] 이메일 전송 로직 리팩토링 (#347)

Author: KoSeonJe

…cture/SesFormApplicationEmailSender.java …astructure/SesFormResultEmailSender.javasrc/main/java/ddingdong/ddingdongBE/domain/formapplication/infrastructure/SesFormApplicationEmailSender.java renamed to src/main/java/ddingdong/ddingdongBE/domain/form/infrastructure/SesFormResultEmailSender.java src/main/java/ddingdong/ddingdongBE/domain/formapplication/infrastructure/SesFormApplicationEmailSender.java renamed to src/main/java/ddingdong/ddingdongBE/domain/form/infrastructure/SesFormResultEmailSender.java

@@ -1,7 +1,6 @@
-package ddingdong.ddingdongBE.domain.formapplication.infrastructure;
+package ddingdong.ddingdongBE.domain.form.infrastructure;
 
-import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
-import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplicationEmailSender;
+import ddingdong.ddingdongBE.domain.form.service.FormResultEmailSender;
 import ddingdong.ddingdongBE.email.entity.EmailContent;
 import ddingdong.ddingdongBE.email.infrastructure.SesEmailSender;
 import lombok.RequiredArgsConstructor;
@@ -15,25 +14,24 @@
 
 @RequiredArgsConstructor
 @Component
-public class SesFormApplicationEmailSender implements FormApplicationEmailSender {
+public class SesFormResultEmailSender implements FormResultEmailSender {
 
     @Value("${cloud.aws.ses.sender-email}")
     private String senderEmail;
 
     private final SesEmailSender sesEmailSender;
 
     @Override
-    public void sendResult(final FormApplication formApplication, final EmailContent emailContent,
-            final Long emailSendHistoryId) {
-        SendEmailRequest sendEmailRequest = createSendEmailRequest(formApplication, emailContent);
-        sesEmailSender.sendResult(sendEmailRequest, emailSendHistoryId);
+    public void sendResult(String destinationEmail, String destinationName, Long emailHistoryId, EmailContent emailContent) {
+        SendEmailRequest sendEmailRequest = createSendEmailRequest(destinationEmail, destinationName, emailContent);
+        sesEmailSender.sendResult(sendEmailRequest, emailHistoryId);
     }
 
-    private SendEmailRequest createSendEmailRequest(FormApplication formApplication, EmailContent emailContent) {
+    private SendEmailRequest createSendEmailRequest( String destinationEmail, String destinationName, EmailContent emailContent) {
         return SendEmailRequest.builder()
                 .source(senderEmail)
                 .destination(Destination.builder()
-                        .toAddresses(formApplication.getEmail())
+                        .toAddresses(destinationEmail)
                         .build())
                 .configurationSetName("ddingdong-form-application-result-set")
                 .message(Message.builder()
@@ -45,12 +43,12 @@ private SendEmailRequest createSendEmailRequest(FormApplication formApplication,
                                 .html(Content.builder()
                                         .charset("UTF-8")
                                         .data(emailContent.htmlContent()
-                                                .replace("{지원자명}", formApplication.getName()))
+                                                .replace("{지원자명}", destinationName))
                                         .build())
                                 .text(Content.builder()
                                         .charset("UTF-8")
                                         .data(emailContent.textContent()
-                                                .replace("{지원자명}", formApplication.getName()))
+                                                .replace("{지원자명}", destinationName))
                                         .build())
                                 .build())
                         .build())

src/main/java/ddingdong/ddingdongBE/domain/form/service/FacadeCentralFormServiceImpl.java

@@ -29,18 +29,21 @@
 import ddingdong.ddingdongBE.domain.form.service.dto.query.MultipleFieldStatisticsQuery.OptionStatisticQuery;
 import ddingdong.ddingdongBE.domain.form.service.dto.query.SingleFieldStatisticsQuery;
 import ddingdong.ddingdongBE.domain.form.service.dto.query.SingleFieldStatisticsQuery.SingleStatisticsQuery;
-import ddingdong.ddingdongBE.email.entity.EmailContent;
+import ddingdong.ddingdongBE.domain.form.service.event.SendFormResultEmailEvent;
 import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
 import ddingdong.ddingdongBE.domain.formapplication.service.FormAnswerService;
-import ddingdong.ddingdongBE.domain.formapplication.service.FormApplicationEmailService;
 import ddingdong.ddingdongBE.domain.formapplication.service.FormApplicationService;
 import ddingdong.ddingdongBE.domain.user.entity.User;
+import ddingdong.ddingdongBE.email.entity.EmailContent;
+import ddingdong.ddingdongBE.email.entity.EmailSendHistory;
+import ddingdong.ddingdongBE.email.service.EmailSendHistoryService;
 import java.time.LocalDate;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Caching;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -58,7 +61,8 @@ public class FacadeCentralFormServiceImpl implements FacadeCentralFormService {
     private final FormAnswerService formAnswerService;
     private final FileMetaDataService fileMetaDataService;
     private final ClubMemberService clubMemberService;
-    private final FormApplicationEmailService formApplicationEmailService;
+    private final EmailSendHistoryService emailSendHistoryService;
+    private final ApplicationEventPublisher applicationEventPublisher;
 
     @Transactional
     @Override
@@ -187,7 +191,11 @@ public void sendApplicationResultEmail(SendApplicationResultEmailCommand command
                 command.target()
         );
         EmailContent emailContent = EmailContent.of(command.title(), command.message(), club);
-        formApplicationEmailService.sendBulkResult(formApplications, emailContent);
+        formApplications.forEach(application -> {
+                    EmailSendHistory emailSendHistory = emailSendHistoryService.save(EmailSendHistory.createPending(application));
+                    applicationEventPublisher.publishEvent(new SendFormResultEmailEvent(
+                            emailSendHistory.getId(), application.getEmail(), application.getName(), emailContent));
+                });
     }
 
     @Transactional

src/main/java/ddingdong/ddingdongBE/domain/form/service/FormResultEmailSender.java

@@ -0,0 +1,8 @@
+package ddingdong.ddingdongBE.domain.form.service;
+
+import ddingdong.ddingdongBE.email.entity.EmailContent;
+
+public interface FormResultEmailSender {
+
+    void sendResult(String destinationEmail, String destinationName, Long emailHistoryId, EmailContent emailContent);
+}

src/main/java/ddingdong/ddingdongBE/domain/form/service/event/FormApplicationSendEmailEventHandler.java

@@ -0,0 +1,29 @@
+package ddingdong.ddingdongBE.domain.form.service.event;
+
+import ddingdong.ddingdongBE.domain.form.service.FormResultEmailSender;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class FormApplicationSendEmailEventHandler {
+
+    private final FormResultEmailSender formResultEmailSender;
+
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    @Async("emailAsyncExecutor")
+    public void sendBulkResult(SendFormResultEmailEvent event) {
+        log.info("지원 결과 이메일 전송 이벤트 핸들링 성공 : {} : {}", event.destinationEmail(), event.destinationName());
+        formResultEmailSender.sendResult(
+                event.destinationEmail(),
+                event.destinationName(),
+                event.emailSendHistoryId(),
+                event.emailContent()
+        );
+    }
+}

src/main/java/ddingdong/ddingdongBE/domain/form/service/event/SendFormResultEmailEvent.java

@@ -0,0 +1,10 @@
+package ddingdong.ddingdongBE.domain.form.service.event;
+
+import ddingdong.ddingdongBE.email.entity.EmailContent;
+
+public record SendFormResultEmailEvent(
+        Long emailSendHistoryId,
+        String destinationEmail,
+        String destinationName,
+        EmailContent emailContent) {
+}

src/main/java/ddingdong/ddingdongBE/domain/formapplication/entity/FormApplicationEmailSender.java

@@ -48,6 +48,11 @@ public void updateEmailSendStatus(String eventType, String messageId) {
         emailSendHistory.updateStatusTo(eventType);
     }
 
+    @Transactional
+    public EmailSendHistory save(EmailSendHistory emailSendHistory) {
+        return emailSendHistoryRepository.save(emailSendHistory);
+    }
+
     private EmailSendHistory getById(Long emailSendHistoryId) {
         return emailSendHistoryRepository.findById(emailSendHistoryId)
                 .orElseThrow(() -> new ResourceNotFound(

src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/FormApplicationEmailService.java

@@ -1,12 +1,12 @@
-package ddingdong.ddingdongBE.domain.formapplication.infrastructure;
+package ddingdong.ddingdongBE.domain.form.infrastructure;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import ddingdong.ddingdongBE.common.fixture.ClubFixture;
 import ddingdong.ddingdongBE.common.fixture.FormApplicationFixture;
 import ddingdong.ddingdongBE.common.support.TestContainerSupport;
 import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
-import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplicationEmailSender;
+import ddingdong.ddingdongBE.domain.form.service.FormResultEmailSender;
 import ddingdong.ddingdongBE.domain.formapplication.repository.EmailSendHistoryRepository;
 import ddingdong.ddingdongBE.domain.formapplication.repository.FormApplicationRepository;
 import ddingdong.ddingdongBE.email.entity.EmailContent;
@@ -18,10 +18,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class SesFormApplicationEmailSenderTest extends TestContainerSupport {
+class SesFormResultEmailSenderTest extends TestContainerSupport {
 
     @Autowired
-    private FormApplicationEmailSender formApplicationEmailSender;
+    private FormResultEmailSender formResultEmailSender;
 
     @Autowired
     private EmailSendHistoryRepository emailSendHistoryRepository;
@@ -38,7 +38,7 @@ void setUp() {
         formApplication = FormApplicationFixture.pendingFormApplication();
         FormApplication savedFormApplication = formApplicationRepository.save(formApplication);
         emailContent = EmailContent.of("테스트 제목", "테스트 내용입니다. 안녕하세요 {지원자명}님", ClubFixture.createClub());
-        
+
         // 실제 EmailSendHistory 엔티티 생성
         emailSendHistory = EmailSendHistory.createPending(savedFormApplication);
         emailSendHistory = emailSendHistoryRepository.save(emailSendHistory);
@@ -48,7 +48,8 @@ void setUp() {
     @Test
     void sendResult_success() {
         // when
-        formApplicationEmailSender.sendResult(formApplication, emailContent, emailSendHistory.getId());
+        formResultEmailSender.sendResult(formApplication.getEmail(), formApplication.getName(), emailSendHistory.getId(),
+                emailContent);
 
         // then
         EmailSendHistory updatedHistory = emailSendHistoryRepository.findById(emailSendHistory.getId()).orElseThrow();