[DDING-000] 이메일 전송 신뢰성 확보를 위한 정책 도입 (#345)

Author: KoSeonJe

build.gradle

@@ -33,6 +33,7 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.12'
     implementation 'org.springframework.boot:spring-boot-configuration-processor'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'org.springframework.retry:spring-retry'
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

src/main/java/ddingdong/ddingdongBE/common/config/AsyncConfig.java

@@ -1,32 +1,23 @@
 package ddingdong.ddingdongBE.common.config;
 
 import java.util.concurrent.Executor;
-import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
-import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.AsyncConfigurer;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @Configuration
 @EnableAsync
-public class AsyncConfig implements AsyncConfigurer {
+public class AsyncConfig {
 
-    @Override
-    public Executor getAsyncExecutor() {
+    @Bean
+    public Executor emailAsyncExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(5);
+        executor.setCorePoolSize(10);
         executor.setMaxPoolSize(10);
         executor.setQueueCapacity(500);
         executor.setThreadNamePrefix("EmailAsync-");
         executor.initialize();
         return executor;
     }
-
-    @Override
-    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
-        return new SimpleAsyncUncaughtExceptionHandler();
-    }
-
-
 }

src/main/java/ddingdong/ddingdongBE/common/config/RetryConfig.java

@@ -0,0 +1,10 @@
+package ddingdong.ddingdongBE.common.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.retry.annotation.EnableRetry;
+
+@Configuration
+@EnableRetry
+public class RetryConfig {
+
+}

src/main/java/ddingdong/ddingdongBE/domain/form/controller/dto/request/SendApplicationResultEmailRequest.java

@@ -1,6 +1,7 @@
 package ddingdong.ddingdongBE.domain.form.controller.dto.request;
 
 import ddingdong.ddingdongBE.domain.form.service.dto.command.SendApplicationResultEmailCommand;
+import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplicationStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 
@@ -15,7 +16,7 @@ public record SendApplicationResultEmailRequest(
                 allowableValues = {"FIRST_PASS", "FIRST_FAIL", "FINAL_PASS", "FINAL_FAIL"}
         )
         @NotNull(message = "전송 대상은 필수입니다.")
-        String target,
+        FormApplicationStatus target,
 
         @Schema(description = "내용", example = "내용")
         @NotNull(message = "메일 내용은 필수입니다.")

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

@@ -29,17 +29,14 @@
 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.domain.formapplication.entity.EmailContent;
 import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
-import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplicationStatus;
 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.SesEmailService;
-import ddingdong.ddingdongBE.email.dto.EmailContent;
 import java.time.LocalDate;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
@@ -58,10 +55,10 @@ public class FacadeCentralFormServiceImpl implements FacadeCentralFormService {
     private final ClubService clubService;
     private final FormStatisticService formStatisticService;
     private final FormApplicationService formApplicationService;
-    private final SesEmailService sesEmailService;
     private final FormAnswerService formAnswerService;
     private final FileMetaDataService fileMetaDataService;
     private final ClubMemberService clubMemberService;
+    private final FormApplicationEmailService formApplicationEmailService;
 
     @Transactional
     @Override
@@ -181,22 +178,16 @@ public SingleFieldStatisticsQuery getTextFieldStatistics(Long fieldId) {
         return new SingleFieldStatisticsQuery(type, textStatisticsQueries);
     }
 
+    @Transactional
     @Override
     public void sendApplicationResultEmail(SendApplicationResultEmailCommand command) {
         Club club = clubService.getByUserId(command.userId());
         List<FormApplication> formApplications = formApplicationService.getAllByFormIdAndFormApplicationStatus(
                 command.formId(),
-                FormApplicationStatus.findStatus(command.target())
+                command.target()
         );
         EmailContent emailContent = EmailContent.of(command.title(), command.message(), club);
-        CompletableFuture<Void> future = sesEmailService.sendBulkResultEmails(formApplications, emailContent);
-
-        try {
-            future.get(5, TimeUnit.MINUTES);  // 최대 5분 대기
-        } catch (Exception e) {
-            log.error("Failed to send bulk emails", e);
-            throw new RuntimeException("이메일 전송 중 오류가 발생했습니다.", e);
-        }
+        formApplicationEmailService.sendBulkResult(formApplications, emailContent);
     }
 
     @Transactional

src/main/java/ddingdong/ddingdongBE/domain/form/service/dto/command/SendApplicationResultEmailCommand.java

@@ -1,10 +1,12 @@
 package ddingdong.ddingdongBE.domain.form.service.dto.command;
 
+import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplicationStatus;
+
 public record SendApplicationResultEmailCommand(
         Long userId,
         Long formId,
         String title,
-        String target,
+        FormApplicationStatus target,
         String message
 ) {
 

…/ddingdongBE/email/dto/EmailContent.java …formapplication/entity/EmailContent.javasrc/main/java/ddingdong/ddingdongBE/email/dto/EmailContent.java renamed to src/main/java/ddingdong/ddingdongBE/domain/formapplication/entity/EmailContent.java src/main/java/ddingdong/ddingdongBE/email/dto/EmailContent.java renamed to src/main/java/ddingdong/ddingdongBE/domain/formapplication/entity/EmailContent.java

@@ -1,4 +1,4 @@
-package ddingdong.ddingdongBE.email.dto;
+package ddingdong.ddingdongBE.domain.formapplication.entity;
 
 import ddingdong.ddingdongBE.domain.club.entity.Club;
 
@@ -21,3 +21,4 @@ public static EmailContent of(String subject, String content, Club club) {
         return new EmailContent(subject, htmlContent, plainContent);
     }
 }
+

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

@@ -0,0 +1,88 @@
+package ddingdong.ddingdongBE.domain.formapplication.entity;
+
+import static ddingdong.ddingdongBE.domain.formapplication.entity.EmailSendStatus.PENDING;
+import static ddingdong.ddingdongBE.domain.formapplication.entity.EmailSendStatus.PERMANENT_FAILURE;
+import static ddingdong.ddingdongBE.domain.formapplication.entity.EmailSendStatus.SENDING;
+import static ddingdong.ddingdongBE.domain.formapplication.entity.EmailSendStatus.TEMPORARY_FAILURE;
+
+import ddingdong.ddingdongBE.common.BaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import java.time.LocalDateTime;
+import jakarta.annotation.Nullable;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+public class EmailSendHistory extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "form_application_id")
+    private FormApplication formApplication;
+
+    @Enumerated(EnumType.STRING)
+    private EmailSendStatus status;
+
+    private int retryCount;
+
+    @Nullable
+    @Column(name = "message_tracking_id")
+    private String messageTrackingId;
+
+    @Nullable
+    private LocalDateTime sentAt;
+
+    @Builder
+    public EmailSendHistory(FormApplication formApplication, EmailSendStatus status,
+            int retryCount, LocalDateTime sentAt) {
+        this.formApplication = formApplication;
+        this.status = status;
+        this.retryCount = retryCount;
+        this.sentAt = sentAt;
+    }
+
+    public EmailSendHistory(FormApplication formApplication, EmailSendStatus status) {
+        this(formApplication, status, 0, null);
+    }
+
+    public static EmailSendHistory createPending(FormApplication formApplication) {
+        return new EmailSendHistory(formApplication, PENDING);
+    }
+
+    public void trySend() {
+        this.sentAt = LocalDateTime.now();
+        if (this.status == SENDING) {
+            retryCount++;
+            return;
+        }
+        this.status = SENDING;
+    }
+
+    public void markRetryFail() {
+        this.status = TEMPORARY_FAILURE;
+    }
+
+    public void markNonRetryFail() {
+        this.status = PERMANENT_FAILURE;
+    }
+
+    public void updateMessageTrackingId(String messageId) {
+        this.messageTrackingId = messageId;
+    }
+}

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

@@ -0,0 +1,13 @@
+package ddingdong.ddingdongBE.domain.formapplication.entity;
+
+public enum EmailSendStatus {
+
+    PENDING,
+    SENDING,
+    TEMPORARY_FAILURE,
+    PERMANENT_FAILURE,
+    DELIVERY_SUCCESS,
+    BOUNCE_REJECT,
+    COMPLAINT_REJECT,
+    ;
+}

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

@@ -0,0 +1,6 @@
+package ddingdong.ddingdongBE.domain.formapplication.entity;
+
+public interface FormApplicationEmailSender {
+
+    void sendResult(FormApplication formApplication, EmailContent emailContent, Long emailSendHistoryId);
+}