Ref: 이메일 서비스 개선

Author: joyewon0705

src/main/java/com/back/domain/user/service/EmailService.java

@@ -1,11 +1,15 @@
 package com.back.domain.user.service;
 
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
 
+// 이메일 전송 서비스
 @Service
 @RequiredArgsConstructor
 public class EmailService {
@@ -17,29 +21,41 @@ public class EmailService {
     @Value("${frontend.base-url}")
     private String FRONTEND_BASE_URL;
 
+    // 이메일 인증 메일 전송
     public void sendVerificationEmail(String toEmail, String token) {
         String subject = "[Catfe] 이메일 인증 안내";
         String verificationUrl = FRONTEND_BASE_URL + "/verify-email?token=" + token;
 
-        String text = """
-                안녕하세요, Catfe에 가입해 주셔서 감사합니다.
-
-                아래 링크를 클릭하여 이메일 인증을 완료해주세요:
-                %s
-
-                이 링크는 24시간 동안만 유효합니다.
+        String htmlContent = """
+                <p>안녕하세요, Catfe에 가입해 주셔서 감사합니다.</p>
+                <p>아래 버튼을 클릭하여 이메일 인증을 완료해주세요.</p>
+                <br>
+                <p>
+                    <a href="%s" style="display:inline-block;padding:10px 20px;
+                    background-color:#4CAF50;color:#fff;text-decoration:none;
+                    border-radius:5px;">이메일 인증하기</a>
+                </p>
+                <br>
+                <p>이 링크는 24시간 동안만 유효합니다.</p>
                 """.formatted(verificationUrl);
 
-        sendEmail(toEmail, subject, text);
+        sendHtmlEmail(toEmail, subject, htmlContent);
     }
 
-    private void sendEmail(String toEmail, String subject, String text) {
-        SimpleMailMessage message = new SimpleMailMessage();
-        message.setFrom(FROM_ADDRESS);
-        message.setTo(toEmail);
-        message.setSubject(subject);
-        message.setText(text);
-
-        mailSender.send(message);
+    // HTML 이메일 전송 공통 메서드
+    private void sendHtmlEmail(String toEmail, String subject, String htmlContent) {
+        try {
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+            helper.setFrom(FROM_ADDRESS);
+            helper.setTo(toEmail);
+            helper.setSubject(subject);
+            helper.setText(htmlContent, true); // true → HTML 모드
+
+            mailSender.send(message);
+        } catch (MessagingException e) {
+            throw new RuntimeException("이메일 전송 실패", e);
+        }
     }
-}
+}

src/test/java/com/back/domain/user/service/EmailServiceTest.java

@@ -1,13 +1,18 @@
 package com.back.domain.user.service;
 
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.Session;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.context.annotation.Profile;
 import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.SimpleMailMessage;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.mockito.Mockito.*;
 
@@ -20,17 +25,28 @@ class EmailServiceTest {
     @InjectMocks
     private EmailService emailService;
 
+    @BeforeEach
+    void setup() {
+        ReflectionTestUtils.setField(emailService, "FROM_ADDRESS", "[email protected]");
+        ReflectionTestUtils.setField(emailService, "FRONTEND_BASE_URL", "http://localhost:3000");
+    }
+
     @Test
     @DisplayName("이메일 인증 메일 전송 성공")
-    void sendVerificationEmail() {
+    void sendVerificationEmail_success() {
         // given
         String toEmail = "[email protected]";
         String token = "sample-token";
 
+        // MimeMessage Stub 반환하도록 설정
+        MimeMessage mimeMessage = new MimeMessage((Session) null);
+        when(mailSender.createMimeMessage()).thenReturn(mimeMessage);
+
         // when
         emailService.sendVerificationEmail(toEmail, token);
 
         // then
-        verify(mailSender, times(1)).send(any(SimpleMailMessage.class));
+        verify(mailSender, times(1)).createMimeMessage();
+        verify(mailSender, times(1)).send(any(MimeMessage.class));
     }
 }