Merge pull request #273 from prgrms-aibe-devcourse/refector/smtp

refector: 알림 리팩토링

Author: soheeGit

src/main/java/store/lastdance/config/MailConfig.java

@@ -3,10 +3,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
-import org.springframework.util.StringUtils;
 
 import java.util.Properties;
 
@@ -33,60 +30,36 @@ public class MailConfig {
     @Value("${spring.mail.naver.password}")
     private String naverPassword;
 
-    @Bean("gmailSender")
-    public JavaMailSender gmailSender() {
-        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-        mailSender.setHost(gmailHost);
-        mailSender.setPort(gmailPort);
-        mailSender.setUsername(gmailUsername);
-        mailSender.setPassword(gmailPassword);
-
-        Properties props = mailSender.getJavaMailProperties();
+    @Bean("gmailSenderConfig")
+    public MailSenderConfig gmailSenderConfig() {
+        Properties props = new Properties();
         props.put("mail.transport.protocol", "smtp");
         props.put("mail.smtp.auth", "true");
         props.put("mail.smtp.starttls.enable", "true");
         props.put("mail.smtp.ssl.enable", "false");
         props.put("mail.debug", "false");
 
-        return mailSender;
+        return buildConfig(gmailHost, gmailPort, gmailUsername, gmailPassword, props);
     }
 
-    @Bean("naverSender")
-    public JavaMailSender naverSender() {
-        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-        mailSender.setHost(naverHost);
-        mailSender.setPort(naverPort);
-        mailSender.setUsername(naverUsername);
-        mailSender.setPassword(naverPassword);
-
-        Properties props = mailSender.getJavaMailProperties();
+    @Bean("naverSenderConfig")
+    public MailSenderConfig naverSenderConfig() {
+        Properties props = new Properties();
         props.put("mail.transport.protocol", "smtp");
         props.put("mail.smtp.auth", "true");
         props.put("mail.smtp.ssl.enable", "true");
         props.put("mail.debug", "false");
 
-        return mailSender;
-    }
-
-    @Bean("gmailFromEmail")
-    public String gmailFromEmail() {
-        return StringUtils.hasText(gmailUsername) ? gmailUsername : "lastdance857@gmail.com";
-    }
-
-    @Bean("naverFromEmail")
-    public String naverFromEmail() {
-        return StringUtils.hasText(naverUsername) ? naverUsername : "lastdance857@naver.com";
+        return buildConfig(naverHost, naverPort, naverUsername, naverPassword, props);
     }
 
-    @Bean
-    @Primary
-    public JavaMailSender defaultMailSender() {
-        if (StringUtils.hasText(gmailUsername)) {
-            return gmailSender();
-        } else if (StringUtils.hasText(naverUsername)) {
-            return naverSender();
-        } else {
-            throw new IllegalStateException("메일 설정이 없습니다.");
-        }
+    private MailSenderConfig buildConfig(String host, int port, String username, String password, Properties props) {
+        JavaMailSenderImpl sender = new JavaMailSenderImpl();
+        sender.setHost(host);
+        sender.setPort(port);
+        sender.setUsername(username);
+        sender.setPassword(password);
+        sender.setJavaMailProperties(props);
+        return new MailSenderConfig(sender, username);
     }
 }

src/main/java/store/lastdance/config/MailSenderConfig.java

@@ -0,0 +1,5 @@
+package store.lastdance.config;
+
+import org.springframework.mail.javamail.JavaMailSender;
+
+public record MailSenderConfig(JavaMailSender sender, String fromEmail) {}

src/main/java/store/lastdance/config/SSEConfig.java

@@ -5,9 +5,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.context.event.EventListener;
-import store.lastdance.exception.CustomException;
-import store.lastdance.exception.ErrorCode;
-import store.lastdance.service.notification.SSENotificationV2Service;
+import store.lastdance.service.notification.sse.SSENotificationV2Service;
 
 @Slf4j
 @Configuration

src/main/java/store/lastdance/controller/notification/SSEV2Controller.java

@@ -10,10 +10,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 import store.lastdance.security.oauth.CustomOAuth2User;
-import store.lastdance.service.notification.NotificationV2Service;
-import store.lastdance.service.notification.SSENotificationV2Service;
+import store.lastdance.service.notification.sse.SSENotificationV2Service;
 
-import java.util.Map;
 import java.util.UUID;
 
 @Tag(name = "SSE 실시간 알림", description = "Server-Sent Events 기반 실시간 알림 API")
@@ -23,7 +21,6 @@
 public class SSEV2Controller {
 
     private final SSENotificationV2Service sseService;
-    private final NotificationV2Service notificationService;
 
     @Operation(summary = "실시간 알림 스트림 연결", description = "SSE를 통한 실시간 알림 수신 연결을 생성합니다. 응답 헤더 X-Connection-Id로 연결 ID를 확인할 수 있습니다.")
     @ApiResponse(responseCode = "200", description = "스트림 연결 성공")
@@ -39,36 +36,4 @@ public ResponseEntity<SseEmitter> streamNotifications(@AuthenticationPrincipal C
                 .header("X-Connection-Id", connectionId)
                 .body(emitter);
     }
-
-    @Operation(summary = "알림 읽음 처리", description = "특정 알림을 읽음 상태로 처리합니다.")
-    @ApiResponse(responseCode = "200", description = "읽음 처리 성공")
-    @PostMapping("/read/{notificationId}")
-    public ResponseEntity<Map<String, String>> markAsRead(
-            @AuthenticationPrincipal CustomOAuth2User user,
-            @PathVariable String notificationId) {
-
-        notificationService.markNotificationAsRead(user.getUserId(), notificationId);
-
-        return ResponseEntity.ok(Map.of(
-                "message", "알림이 읽음 처리되었습니다.",
-                "notificationId", notificationId,
-                "userId", user.getUserId().toString()
-        ));
-    }
-
-    @Operation(summary = "알림 읽음 상태 확인", description = "특정 알림의 읽음 상태를 확인합니다.")
-    @ApiResponse(responseCode = "200", description = "읽음 상태 확인 성공")
-    @GetMapping("/read/{notificationId}")
-    public ResponseEntity<Map<String, Object>> checkReadStatus(
-            @AuthenticationPrincipal CustomOAuth2User user,
-            @PathVariable String notificationId) {
-
-        boolean isRead = notificationService.isNotificationRead(user.getUserId(), notificationId);
-
-        return ResponseEntity.ok(Map.of(
-                "notificationId", notificationId,
-                "userId", user.getUserId().toString(),
-                "isRead", isRead
-        ));
-    }
 }

src/main/java/store/lastdance/domain/notification/NotificationRead.java

@@ -19,7 +19,7 @@ public class NotificationSetting {
 
     @Column(name = "user_id", unique = true, nullable = false)
     private UUID userId;
-    
+
     @Column(name = "email_enabled", nullable = false)
     private boolean emailEnabled = false;
 
@@ -45,6 +45,12 @@ public class NotificationSetting {
     @Builder
     public NotificationSetting(@NonNull UUID userId) {
         this.userId = userId;
+        this.emailEnabled = false;
+        this.scheduleReminder = false;
+        this.paymentReminder = false;
+        this.checklistReminder = false;
+        this.sseEnabled = false;
+        this.createdAt = LocalDateTime.now();
     }
 
     public void updateEmailEnabled(boolean emailEnabled) {

src/main/java/store/lastdance/domain/notification/NotificationSetting.java

@@ -1,25 +1,22 @@
 package store.lastdance.domain.notification;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 
 @Getter
+@RequiredArgsConstructor
 public enum NotificationType {
-    SCHEDULE("일정"),
-    PAYMENT("납부일"),
-    CHECKLIST("할일");
 
-    private final String description;
+    SCHEDULE("일정", "📅", "일정",    "📌", "잊지 마시고 준비해 주세요!"),
+    PAYMENT ("납부일", "💳", "지출 항목", "📊", "그룹 지출에 대한 정산이 요청되었습니다.\n앱에서 확인해 주세요!"),
+    CHECKLIST("할일", "✅", "할일",   "📝", "완료하는 것을 잊지 마세요!");
+
+    private final String description;   // 한글 설명 (기존 유지)
+    private final String icon;          // 제목용 이모지
+    private final String label;         // 항목 유형명
+    private final String bodyIcon;      // 본문 항목 이모지
+    private final String closingMessage; // 본문 마무리 문구
 
-    NotificationType(String description) {
-        this.description = description;
-    }
 
-    // 아이콘 반환
-    public String getIcon() {
-        return switch (this) {
-            case SCHEDULE -> "📅";
-            case PAYMENT -> "💳";
-            case CHECKLIST -> "✅";
-        };
-    }
-}
+}

src/main/java/store/lastdance/domain/notification/NotificationType.java

@@ -3,5 +3,9 @@
 public enum OAuthProvider {
     KAKAO,
     GOOGLE,
-    NAVER
+    NAVER;
+
+    public boolean isNaverMail() {
+        return this == NAVER;
+    }
 }