fix : 시즌 알림 추가 로직 변경 (#81)

Author: seoyeonson

src/main/java/cmf/commitField/domain/noti/noti/service/NotiService.java

@@ -64,28 +64,23 @@ public List<Noti> getSeasonNotiCheck(User receiver, long seasonId) {
 
     // 새 시즌 알림 생성
     @Transactional
-    public void createNewSeason(Season season) {
+    public void createNewSeasonNoti(Season season, User user) {
         System.out.println("새 시즌 알림 생성");
         // 메시지 생성
         String message = NotiService.generateMessage(NotiDetailType.SEASON_START, season.getName());
 
-        // 모든 사용자 조회
-        Iterable<User> users = userRepository.findAll();
+        Noti noti = Noti.builder()
+                .typeCode(NotiType.SEASON)
+                .type2Code(NotiDetailType.SEASON_START)
+                .receiver(user)
+                .isRead(false)
+                .message(message)
+                .relId(season.getId())
+                .relTypeCode(season.getModelName())
+                .build();
 
-        // 모든 유저 알림 객체 생성
-        users.forEach(user -> {
-            Noti noti = Noti.builder()
-                    .typeCode(NotiType.SEASON)
-                    .type2Code(NotiDetailType.SEASON_START)
-                    .receiver(user)
-                    .isRead(false)
-                    .message(message)
-                    .relId(season.getId())
-                    .relTypeCode(season.getModelName())
-                    .build();
+        notiRepository.save(noti);
 
-            notiRepository.save(noti);
-        });
         System.out.println("새 시즌 알림 생성 끝");
     }
 

src/main/java/cmf/commitField/domain/user/service/CustomOAuth2UserService.java

@@ -101,7 +101,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         if(notiService.getSeasonNotiCheck(user, season.getId()).isEmpty()){
             log.info("User {} does not have season noti", user.getUsername());
             // 가지고 있지 않다면 알림을 추가
-            notiService.createNewSeason(season);
+            notiService.createNewSeasonNoti(season, user);
 //            redisTemplate.opsForValue().set(season_key, String.valueOf(count), Duration.ofHours(3)); // 3시간 캐싱
         }
 

src/main/java/cmf/commitField/global/scheduler/SeasonScheduler.java

@@ -1,6 +1,7 @@
 // java/cmf/commitField/global/scheduler/SeasonScheduler.java
 package cmf.commitField.global.scheduler;
 
+import cmf.commitField.domain.noti.noti.service.NotiService;
 import cmf.commitField.domain.season.entity.Rank;
 import cmf.commitField.domain.season.entity.Season;
 import cmf.commitField.domain.season.entity.SeasonStatus;
@@ -29,6 +30,7 @@ public class SeasonScheduler {
     private final UserSeasonRepository userSeasonRepository;
     private final UserRepository userRepository;
     private final SeasonService seasonService;
+    private final NotiService notiService;
 
 //     매년 3, 6, 9, 12월 1일 자정마다 시즌 확인 및 생성
     @Scheduled(cron = "0 0 0 1 3,6,9,12 *")
@@ -53,6 +55,11 @@ public void checkAndCreateNewSeason() {
 
             Season newSeason = seasonService.createNewSeason(seasonName, startDate, endDate);
 
+            // 모든 유저에게 새 시즌 알림 생성
+            userRepository.findAll().forEach(user -> {
+                notiService.createNewSeasonNoti(newSeason, user);
+            });
+
             // 모든 유저의 랭크 초기화
             resetUserRanks(newSeason);
 

src/main/java/cmf/commitField/global/websocket/NotiWebsoketConfig.java

@@ -0,0 +1,24 @@
+package cmf.commitField.global.websocket;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class NotiWebsoketConfig implements WebSocketMessageBrokerConfigurer {
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/ws")  // WebSocket 엔드포인트 설정
+                .setAllowedOriginPatterns("*")  // CORS 허용
+                .withSockJS();  // SockJS 지원
+    }
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry registry) {
+        registry.enableSimpleBroker("/topic");  // 메시지 브로커 활성화
+        registry.setApplicationDestinationPrefixes("/app");  // 클라이언트에서 보낼 경로
+    }
+}