refactor: 이메일의 기수 항목을 하드코딩이 아닌 GenerationService 의 값을 읽어서 적용 하도록 수정 및 테스트 코드에 반영 (DASOMBE-16)

junjinyun · junjinyun · commit c10f80b6a239 · 2025-08-25T00:07:58.000+09:00
diff --git a/src/main/java/dmu/dasom/api/domain/email/service/EmailService.java b/src/main/java/dmu/dasom/api/domain/email/service/EmailService.java
@@ -3,6 +3,7 @@
 import dmu.dasom.api.domain.common.exception.CustomException;
 import dmu.dasom.api.domain.common.exception.ErrorCode;
 import dmu.dasom.api.domain.email.enums.MailType;
+import dmu.dasom.api.global.generation.service.GenerationService;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import lombok.RequiredArgsConstructor;
@@ -19,6 +20,7 @@ public class EmailService {
 
     private final TemplateEngine templateEngine;
     private final JavaMailSender javaMailSender;
+    private final GenerationService generationService;
 
     @Value("${spring.mail.username}")
     private String from;
@@ -28,6 +30,8 @@ public void sendEmail(String to, String name, MailType mailType) throws Messagin
             throw new CustomException(ErrorCode.MAIL_TYPE_NOT_VALID);
         }
 
+        String currentGeneration = generationService.getCurrentGeneration();
+
         // 메일 제목 및 템플릿 설정
         String subject;
         String emailContent;
@@ -36,8 +40,8 @@ public void sendEmail(String to, String name, MailType mailType) throws Messagin
 
         switch (mailType) {
             case DOCUMENT_RESULT -> {
-                subject = "동양미래대학교 컴퓨터소프트웨어공학과 전공 동아리 DASOM 서류 결과 안내";
-                emailContent = "먼저 다솜 34기에 많은 관심을 두고 지원해 주셔서 감사드리며,<br>" +
+                subject = "동양미래대학교 컴퓨터소프트웨어공학과 전공 동아리 DASOM " + currentGeneration +" 서류 결과 안내";
+                emailContent = "먼저 다솜 " + currentGeneration +"에 많은 관심을 두고 지원해 주셔서 감사드리며,<br>" +
                         "내부 서류 평가 결과 및 추후 일정에 관해 안내해드리고자 이메일을 발송하게 되었습니다.<br>" +
                         "서류 전형 결과는 아래 버튼 혹은 홈페이지를 통해 확인이 가능합니다.";
                 buttonText = "서류 결과 확인하기";
@@ -58,6 +62,7 @@ public void sendEmail(String to, String name, MailType mailType) throws Messagin
         context.setVariable("emailContent", emailContent); // 이메일 내용 전달
         context.setVariable("buttonUrl", buttonUrl); // 버튼 링크 전달
         context.setVariable("buttonText", buttonText);
+        context.setVariable("generation", currentGeneration);//기수 정보 전달
 
         // HTML 템플릿 처리
         String htmlBody = templateEngine.process("email-template", context);
diff --git a/src/test/java/dmu/dasom/api/domain/email/EmailServiceTest.java b/src/test/java/dmu/dasom/api/domain/email/EmailServiceTest.java
@@ -4,6 +4,7 @@
 import dmu.dasom.api.domain.common.exception.ErrorCode;
 import dmu.dasom.api.domain.email.enums.MailType;
 import dmu.dasom.api.domain.email.service.EmailService;
+import dmu.dasom.api.global.generation.service.GenerationService;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import org.junit.jupiter.api.BeforeEach;
@@ -29,6 +30,9 @@ class EmailServiceTest {
     @Mock
     private TemplateEngine templateEngine;
 
+    @Mock
+    private GenerationService generationService;
+
     @InjectMocks
     private EmailService emailService;
 
@@ -42,6 +46,9 @@ void setUp() {
 
         // 테스트 환경에서 from 값을 설정
         ReflectionTestUtils.setField(emailService, "from", "test_email@example.com");
+
+        // generationService Mock 반환값 설정
+        when(generationService.getCurrentGeneration()).thenReturn("34기");
     }
 
     @Test
@@ -52,9 +59,8 @@ void sendEmail_documentResult() throws MessagingException {
         String name = "지원자";
         MailType mailType = MailType.DOCUMENT_RESULT;
 
-        String expectedTemplate = "email-template";
-        String expectedHtmlBody = "<html><body>Document Pass</body></html>";
-        when(templateEngine.process(eq(expectedTemplate), any(Context.class))).thenReturn(expectedHtmlBody);
+        when(templateEngine.process(eq("email-template"), any(Context.class)))
+                .thenReturn("<html><body>Document Pass - 34기</body></html>");
 
         // when
         emailService.sendEmail(to, name, mailType);
@@ -65,7 +71,8 @@ void sendEmail_documentResult() throws MessagingException {
 
         MimeMessage sentMessage = messageCaptor.getValue();
         assertNotNull(sentMessage);
-        verify(templateEngine).process(eq(expectedTemplate), any(Context.class));
+        verify(templateEngine).process(eq("email-template"), any(Context.class));
+        verify(generationService).getCurrentGeneration();
     }
 
     @Test
@@ -76,9 +83,8 @@ void sendEmail_finalResult() throws MessagingException {
         String name = "지원자";
         MailType mailType = MailType.FINAL_RESULT;
 
-        String expectedTemplate = "email-template";
-        String expectedHtmlBody = "<html><body>Final Pass</body></html>";
-        when(templateEngine.process(eq(expectedTemplate), any(Context.class))).thenReturn(expectedHtmlBody);
+        when(templateEngine.process(eq("email-template"), any(Context.class)))
+                .thenReturn("<html><body>Final Pass - 36기</body></html>");
 
         // when
         emailService.sendEmail(to, name, mailType);
@@ -89,7 +95,8 @@ void sendEmail_finalResult() throws MessagingException {
 
         MimeMessage sentMessage = messageCaptor.getValue();
         assertNotNull(sentMessage);
-        verify(templateEngine).process(eq(expectedTemplate), any(Context.class));
+        verify(templateEngine).process(eq("email-template"), any(Context.class));
+        verify(generationService).getCurrentGeneration();
     }
 
     @Test
