feat : 알림 웹 소켓 구현 (#18)

Author: seoyeonson

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

@@ -4,7 +4,6 @@
 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;
@@ -15,6 +14,7 @@
 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;
 
@@ -27,7 +27,6 @@
 @Slf4j
 public class ApiV1NotiController {
     private final NotiService notiService;
-    private final CustomOAuth2UserService customOAuth2UserService;
     private final UserRepository userRepository;
 
     @GetMapping("")
@@ -45,4 +44,9 @@ public GlobalResponse<List<NotiDto>> getNoti() {
 
         return GlobalResponse.error(ErrorCode.LOGIN_REQUIRED);
     }
+
+    @PostMapping("")
+    public void createNoti() {
+
+    }
 }

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

@@ -8,11 +8,13 @@
 
 @Getter
 public class NotiDto {
+    private Long id;
     private String message;
     private String formattedCreatedAt; // 변환된 날짜를 저장할 필드
 
     // JPQL에서 사용할 수 있도록 필드 값 직접 받는 생성자 추가
-    public NotiDto(String message, LocalDateTime createdAt) {
+    public NotiDto(Long id, String message, LocalDateTime createdAt) {
+        this.id = id;
         this.message = message;
         this.formattedCreatedAt = formatCreatedAt(createdAt); // 변환된 날짜 저장
     }

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

@@ -14,7 +14,7 @@
 @Repository
 public interface NotiRepository extends JpaRepository<Noti, Long> {
     Optional<List<Noti>> findNotiByReceiverAndRelId(User receiver, long season);
-    @Query("SELECT new cmf.commitField.domain.noti.noti.dto.NotiDto(n.message, n.createdAt) " +
+    @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

@@ -34,6 +34,21 @@ public static String generateMessage(NotiDetailType type, Object... params) {
         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<NotiDto> getNotReadNoti(User receiver) {
         System.out.println("알림 조회");

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

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

@@ -12,11 +12,9 @@
 public class WebSocketConfig implements WebSocketConfigurer {
 
     private final ChatWebSocketHandler chatWebSocketHandler;
-    private final NotiWebSocketHandler notiWebSocketHandler;
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry.addHandler(chatWebSocketHandler, "/chat").setAllowedOrigins("*");
-        registry.addHandler(notiWebSocketHandler, "/notifications").setAllowedOrigins("*");  // 알림 엔드포인트 추가
     }
 }