Merge pull request #104 from CommitField/feat/#81

feat : 알림 웹 소켓 구현

Author: seoyeonson

src/main/java/cmf/commitField/domain/noti/noti/controller/ApiV1NotiController.java

@@ -1,11 +1,9 @@
 package cmf.commitField.domain.noti.noti.controller;
 
 import cmf.commitField.domain.noti.noti.dto.NotiDto;
-import cmf.commitField.domain.noti.noti.entity.Noti;
 import cmf.commitField.domain.noti.noti.service.NotiService;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
-import cmf.commitField.domain.user.service.CustomOAuth2UserService;
 import cmf.commitField.global.error.ErrorCode;
 import cmf.commitField.global.exception.CustomException;
 import cmf.commitField.global.globalDto.GlobalResponse;
@@ -16,40 +14,39 @@
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/api/notifications")
 @RequiredArgsConstructor
 @Slf4j
 public class ApiV1NotiController {
     private final NotiService notiService;
-    private final CustomOAuth2UserService customOAuth2UserService;
     private final UserRepository userRepository;
 
     @GetMapping("")
     public GlobalResponse<List<NotiDto>> getNoti() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        log.info("getNoti - userRequest: {}", authentication);
 
         if (authentication instanceof OAuth2AuthenticationToken) {
             OAuth2User principal = (OAuth2User) authentication.getPrincipal();
             Map<String, Object> attributes = principal.getAttributes();
             String username = (String) attributes.get("login");  // GitHub ID
             User user = userRepository.findByUsername(username).orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
-            List<Noti> notis = notiService.getNotReadNoti(user);
-
-            List<NotiDto> notiDtos = notis.stream()
-                    .map(NotiDto::new)
-                    .collect(Collectors.toList());
-            return GlobalResponse.success(notiDtos);
+            List<NotiDto> notis = notiService.getNotReadNoti(user);
+            return GlobalResponse.success(notis);
         }
 
         return GlobalResponse.error(ErrorCode.LOGIN_REQUIRED);
     }
+
+    @PostMapping("")
+    public void createNoti() {
+
+    }
 }

src/main/java/cmf/commitField/domain/noti/noti/dto/NotiDto.java

@@ -1,6 +1,5 @@
 package cmf.commitField.domain.noti.noti.dto;
 
-import cmf.commitField.domain.noti.noti.entity.Noti;
 import lombok.Getter;
 
 import java.time.LocalDateTime;
@@ -9,12 +8,15 @@
 
 @Getter
 public class NotiDto {
+    private Long id;
     private String message;
     private String formattedCreatedAt; // 변환된 날짜를 저장할 필드
 
-    public NotiDto(Noti noti) {
-        this.message = noti.getMessage();
-        this.formattedCreatedAt = formatCreatedAt(noti.getCreatedAt()); // 변환된 날짜 저장
+    // JPQL에서 사용할 수 있도록 필드 값 직접 받는 생성자 추가
+    public NotiDto(Long id, String message, LocalDateTime createdAt) {
+        this.id = id;
+        this.message = message;
+        this.formattedCreatedAt = formatCreatedAt(createdAt); // 변환된 날짜 저장
     }
 
     private String formatCreatedAt(LocalDateTime createdAt) {
@@ -25,12 +27,8 @@ private String formatCreatedAt(LocalDateTime createdAt) {
             return "오늘";
         } else if (daysBetween == 1) {
             return "어제";
-        } else if (daysBetween == 2) {
-            return "1일 전";
-        } else if (daysBetween == 3) {
-            return "2일 전";
-        } else if (daysBetween == 4) {
-            return "3일 전";
+        } else if (daysBetween <= 3) {
+            return (daysBetween - 1) + "일 전";
         } else {
             return createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         }

src/main/java/cmf/commitField/domain/noti/noti/repository/NotiRepository.java

@@ -1,8 +1,11 @@
 package cmf.commitField.domain.noti.noti.repository;
 
+import cmf.commitField.domain.noti.noti.dto.NotiDto;
 import cmf.commitField.domain.noti.noti.entity.Noti;
 import cmf.commitField.domain.user.entity.User;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,5 +14,8 @@
 @Repository
 public interface NotiRepository extends JpaRepository<Noti, Long> {
     Optional<List<Noti>> findNotiByReceiverAndRelId(User receiver, long season);
-    Optional<List<Noti>> findNotiByReceiverAndIsRead(User receiver, boolean read);
+    @Query("SELECT new cmf.commitField.domain.noti.noti.dto.NotiDto(n.id, n.message, n.createdAt) " +
+            "FROM Noti n JOIN n.receiver u WHERE u.id = :receiverId AND n.isRead = :isRead")
+    Optional<List<NotiDto>> findNotiDtoByReceiverId(@Param("receiverId") Long receiverId, @Param("isRead") boolean isRead);
+
 }

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

@@ -1,13 +1,12 @@
 package cmf.commitField.domain.noti.noti.service;
 
+import cmf.commitField.domain.noti.noti.dto.NotiDto;
 import cmf.commitField.domain.noti.noti.entity.Noti;
 import cmf.commitField.domain.noti.noti.entity.NotiDetailType;
 import cmf.commitField.domain.noti.noti.entity.NotiMessageTemplates;
 import cmf.commitField.domain.noti.noti.entity.NotiType;
 import cmf.commitField.domain.noti.noti.repository.NotiRepository;
 import cmf.commitField.domain.season.entity.Season;
-import cmf.commitField.domain.season.repository.SeasonRepository;
-import cmf.commitField.domain.season.service.SeasonService;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
 import cmf.commitField.global.error.ErrorCode;
@@ -27,40 +26,48 @@
 public class NotiService {
     private final NotiRepository notiRepository;
     private final UserRepository userRepository;
-    private final SeasonRepository seasonRepository;
-    private final SeasonService seasonService;
 
     // 알림 메시지 생성
     public static String generateMessage(NotiDetailType type, Object... params) {
         String template = NotiMessageTemplates.getTemplate(type);
-        log.info("generateMessage - params: {}", params);
-        log.info("generateMessage - template: {}", template);  // template 자체를 출력
         String message = MessageFormat.format(template, params);  // params 배열을 그대로 전달
-        log.info("generateMessage - message: {}", message);
         return message;
     }
 
+    @Transactional
+    public void createNoti(User receiver) {
+        System.out.println("알림 생성");
+        String message = NotiService.generateMessage(NotiDetailType.STREAK_BROKEN, receiver.getNickname());
+
+        Noti noti = Noti.builder()
+                .typeCode(NotiType.STREAK)
+                .type2Code(NotiDetailType.STREAK_BROKEN)
+                .receiver(receiver)
+                .isRead(false)
+                .message(message)
+                .build();
+        notiRepository.save(noti);
+    }
+
 
-    public List<Noti> getNotReadNoti(User receiver) {
-        log.info("getNotReadNoti - receiver: {}", receiver);
-        List<Noti> notis = notiRepository.findNotiByReceiverAndIsRead(receiver, false).orElse(null);
-        log.info("getNotReadNoti - notis: {}", notis);
+    public List<NotiDto> getNotReadNoti(User receiver) {
+        System.out.println("알림 조회");
+        List<NotiDto> notis = notiRepository.findNotiDtoByReceiverId(receiver.getId(), false).orElse(null);
+        System.out.println("알림 조회 끝");
         return notis;
     }
 
     public List<Noti> getSeasonNotiCheck(User receiver, long seasonId) {
-        log.info("getSeasonNotiCheck - receiver: {}, seasonId: {}", receiver, seasonId);
         return notiRepository.findNotiByReceiverAndRelId(receiver, seasonId)
                 .orElseThrow(() -> new CustomException(ErrorCode.ERROR_CHECK)); // 알림이 없을 경우 예외 발생
     }
 
     // 새 시즌 알림 생성
     @Transactional
     public void createNewSeason(Season season) {
-        log.info("createNewSeason - season: {}", season.getName());
+        System.out.println("새 시즌 알림 생성");
         // 메시지 생성
         String message = NotiService.generateMessage(NotiDetailType.SEASON_START, season.getName());
-        log.info("createNewSeason - message: {}", message);
 
         // 모든 사용자 조회
         Iterable<User> users = userRepository.findAll();
@@ -79,5 +86,6 @@ public void createNewSeason(Season season) {
 
             notiRepository.save(noti);
         });
+        System.out.println("새 시즌 알림 생성 끝");
     }
 }

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

@@ -92,6 +92,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         // 알림 테이블에서 Active인 시즌의 알림을 해당 유저가 가지고 있는지 체크
         String season_key = "season_active:" + user.getUsername();
         Season season = seasonService.getActiveSeason();
+        log.info("Active season: {}", season);
         if(notiService.getSeasonNotiCheck(user, season.getId()).isEmpty()){
             log.info("User {} does not have season noti", user.getUsername());
             // 가지고 있지 않다면 알림을 추가

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

@@ -0,0 +1,28 @@
+package cmf.commitField.global.scheduler;
+
+import cmf.commitField.domain.noti.noti.service.NotiService;
+import cmf.commitField.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class NotiTestScheduler {
+    private final NotiService notiService;
+    private final UserRepository userRepository;
+
+//    @Scheduled(cron = "0 44 * * * *")
+//    public void test() {
+//        System.out.println("test 실행");
+//        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+//
+//        if (authentication instanceof OAuth2AuthenticationToken) {
+//            OAuth2User principal = (OAuth2User) authentication.getPrincipal();
+//            Map<String, Object> attributes = principal.getAttributes();
+//            String username = (String) attributes.get("login");  // GitHub ID
+//            User user = userRepository.findByUsername(username).orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
+//            notiService.createNoti(user);
+//        }
+//
+//    }
+}

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");  // 클라이언트에서 보낼 경로
+    }
+}