Merge pull request #156 from DevKor-github/hotfix/notification-setting

hotfix(notify): 알림 설정 미생성으로 인한 작성 리마인더 알림 미발송 수정

Author: coldsunn

src/main/java/com/devkor/ifive/nadab/domain/notification/application/NotificationSettingService.java

@@ -9,6 +9,7 @@
 import com.devkor.ifive.nadab.global.core.response.ErrorCode;
 import com.devkor.ifive.nadab.global.exception.NotFoundException;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,6 +25,7 @@
 @Service
 @RequiredArgsConstructor
 @Transactional
+@Slf4j
 public class NotificationSettingService {
 
     private final NotificationSettingRepository notificationSettingRepository;
@@ -67,6 +69,26 @@ public List<NotificationSetting> getSettings(Long userId) {
             .toList();
     }
 
+    /**
+     * 없는 그룹의 알림 설정을 기본값으로 생성(디바이스 등록 시)
+     */
+    public void ensureSettingsExist(User user) {
+        Set<NotificationGroup> existingGroups = notificationSettingRepository.findByUser(user)
+            .stream()
+            .map(NotificationSetting::getGroup)
+            .collect(Collectors.toSet());
+
+        for (NotificationGroup group : NotificationGroup.values()) {
+            if (!existingGroups.contains(group)) {
+                try {
+                    notificationSettingRepository.save(NotificationSetting.create(user, group));
+                } catch (DataIntegrityViolationException e) {
+                    log.debug("NotificationSetting already exists (race condition): userId={}, group={}", user.getId(), group);
+                }
+            }
+        }
+    }
+
     /**
      * 여러 그룹의 알림 설정 일괄 수정
      * - 1개 이상의 그룹 설정을 한 번에 수정

src/main/java/com/devkor/ifive/nadab/domain/notification/application/UserDeviceCommandService.java

@@ -23,6 +23,7 @@ public class UserDeviceCommandService {
 
     private final UserDeviceRepository userDeviceRepository;
     private final UserRepository userRepository;
+    private final NotificationSettingService notificationSettingService;
 
     /**
      * FCM 토큰 등록
@@ -62,13 +63,15 @@ public boolean registerDevice(
             UserDevice device = existingDevice.get();
             device.updateToken(fcmToken);
             log.debug("Device token updated: userId={}, platform={}", userId, platform);
+            notificationSettingService.ensureSettingsExist(user);
             return false; // 기존 디바이스 업데이트
         } else {
             // 새 디바이스 등록
             try {
                 UserDevice newDevice = UserDevice.create(user, fcmToken, deviceId, platform);
                 userDeviceRepository.save(newDevice);
                 log.debug("Device registered: userId={}, platform={}", userId, platform);
+                notificationSettingService.ensureSettingsExist(user);
                 return true; // 새 디바이스 등록
             } catch (DataIntegrityViolationException e) {
                 // 동시성으로 인해 이미 생성된 경우 (Race Condition)

src/main/java/com/devkor/ifive/nadab/domain/notification/application/scheduler/NotificationSettingBackfillRunner.java

@@ -0,0 +1,47 @@
+package com.devkor.ifive.nadab.domain.notification.application.scheduler;
+
+import com.devkor.ifive.nadab.domain.notification.application.NotificationSettingService;
+import com.devkor.ifive.nadab.domain.notification.core.repository.UserDeviceRepository;
+import com.devkor.ifive.nadab.domain.user.core.entity.User;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 알림 설정 백필 러너
+ * - FCM 디바이스가 등록된 유저 중 알림 설정이 없는 유저에게 기본값으로 생성
+ * - 백필 완료 후 삭제 예정
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class NotificationSettingBackfillRunner implements ApplicationRunner {
+
+    private final UserDeviceRepository userDeviceRepository;
+    private final NotificationSettingService notificationSettingService;
+
+    @Override
+    public void run(ApplicationArguments args) {
+        try {
+            List<User> usersWithDevices = userDeviceRepository.findDistinctActiveUsers();
+
+            int count = 0;
+            for (User user : usersWithDevices) {
+                try {
+                    notificationSettingService.ensureSettingsExist(user);
+                    count++;
+                } catch (Exception e) {
+                    log.error("Failed to initialize notification settings: userId={}", user.getId(), e);
+                }
+            }
+
+            log.info("NotificationSetting backfill completed: {}/{} users processed", count, usersWithDevices.size());
+        } catch (Exception e) {
+            log.error("NotificationSetting backfill runner failed", e);
+        }
+    }
+}

src/main/java/com/devkor/ifive/nadab/domain/notification/core/entity/NotificationSetting.java

@@ -56,7 +56,7 @@ public static NotificationSetting create(User user, NotificationGroup group) {
 
         // ACTIVITY_REMINDER 그룹이면 기본값 설정
         if (group == NotificationGroup.ACTIVITY_REMINDER) {
-            setting.dailyWriteTime = LocalTime.of(20, 0);
+            setting.dailyWriteTime = LocalTime.of(8, 0);
         }
 
         return setting;

src/main/java/com/devkor/ifive/nadab/domain/notification/core/repository/UserDeviceRepository.java

@@ -24,6 +24,9 @@ public interface UserDeviceRepository extends JpaRepository<UserDevice, Long> {
 
     void deleteByFcmToken(String fcmToken);
 
+    @Query("SELECT DISTINCT ud.user FROM UserDevice ud WHERE ud.user.deletedAt IS NULL")
+    List<User> findDistinctActiveUsers();
+
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("delete from UserDevice ud where ud.fcmToken in :fcmTokens")
     int deleteByFcmTokenIn(@Param("fcmTokens") List<String> fcmTokens);