Merge pull request #136 from CommitField/feat/#81-1

feat : 알림 웹소켓 연결 및 프론트 연동 완료

Author: seoyeonson

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

@@ -7,10 +7,11 @@
 import cmf.commitField.global.error.ErrorCode;
 import cmf.commitField.global.exception.CustomException;
 import cmf.commitField.global.globalDto.GlobalResponse;
-import cmf.commitField.global.websocket.NotiWebSocketHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.user.OAuth2User;
@@ -30,24 +31,14 @@ public class ApiV1NotiController {
     private final NotiService notiService;
     private final UserRepository userRepository;
     private final NotiWebSocketHandler notiWebSocketHandler;
+    private final ApplicationEventPublisher eventPublisher;
 
     @GetMapping("")
-    public GlobalResponse<List<NotiDto>> getNoti() {
-        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));
-            List<NotiDto> notis = notiService.getNotReadNoti(user);
-            // 웹소켓으로 알림 전송
-            notiWebSocketHandler.sendNotification(user, notis);
-
-            return GlobalResponse.success(notis);
-        }
-
-        return GlobalResponse.error(ErrorCode.LOGIN_REQUIRED);
+    public GlobalResponse<List<NotiDto>> getNoti(@AuthenticationPrincipal OAuth2User oAuth2User) {
+        String username = oAuth2User.getName();
+        User user = userRepository.findByUsername(username).orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
+        List<NotiDto> notis = notiService.getNotReadNoti(user);
+        return GlobalResponse.success(notis);
     }
 
     @PostMapping("")

src/main/java/cmf/commitField/domain/noti/noti/event/NotiEvent.java

@@ -1,16 +1,21 @@
 package cmf.commitField.domain.noti.noti.event;
 
+import cmf.commitField.domain.noti.noti.dto.NotiDto;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 
+import java.util.List;
+
 @Getter
 public class NotiEvent extends ApplicationEvent {
     private final String username;
+    private final List<NotiDto> notis;
     private final String message;
 
-    public NotiEvent(Object source, String username, String message) {
+    public NotiEvent(Object source, String username, List<NotiDto> notis, String message) {
         super(source);
         this.username = username;
+        this.notis = notis;
         this.message = message;
     }
 }

src/main/java/cmf/commitField/domain/noti/noti/event/NotiListener.java

@@ -2,13 +2,17 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class NotiListener {
+    private final SimpMessagingTemplate messagingTemplate;
     @EventListener
     public void handleNotiEvent(NotiEvent event) {
+        String username = event.getUsername();
         System.out.println("NotiEvent: " + event.getMessage());
+        messagingTemplate.convertAndSend("/topic/notifications/" + username, event.getNotis());
     }
 }

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

@@ -5,6 +5,7 @@
 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.event.NotiEvent;
 import cmf.commitField.domain.noti.noti.repository.NotiRepository;
 import cmf.commitField.domain.season.entity.Season;
 import cmf.commitField.domain.user.entity.User;
@@ -13,10 +14,12 @@
 import cmf.commitField.global.exception.CustomException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -26,6 +29,7 @@
 public class NotiService {
     private final NotiRepository notiRepository;
     private final UserRepository userRepository;
+    private final ApplicationEventPublisher eventPublisher;
 
     // 알림 메시지 생성
     public static String generateMessage(NotiDetailType type, Object... params) {
@@ -46,7 +50,12 @@ public void createNoti(User receiver) {
                 .isRead(false)
                 .message(message)
                 .build();
-        notiRepository.save(noti);
+
+        List<NotiDto> notis = new ArrayList<>();
+        Noti savedNoti = notiRepository.save(noti);
+        notis.add(new NotiDto(savedNoti.getId(), savedNoti.getMessage(), savedNoti.getCreatedAt()));
+        NotiEvent event = new NotiEvent(this, receiver.getUsername(), notis, "새로운 알림이 생성되었습니다.");
+        eventPublisher.publishEvent(event);
     }
 
 

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

@@ -17,12 +17,11 @@ public class NotiTestScheduler {
     private final UserRepository userRepository;
     private final ApplicationEventPublisher eventPublisher;
 
-    @Scheduled(cron = "30 14 * * * *")
+//    @Scheduled(cron = "30 2 * * * *")
     public void test() {
         System.out.println("test 실행");
 
         User user = userRepository.findById(1L).orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
         notiService.createNoti(user);
-//        eventPublisher.publishEvent();
         }
 }

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

@@ -12,16 +12,11 @@
 public class WebSocketConfig implements WebSocketConfigurer {
 
     private final ChatWebSocketHandler chatWebSocketHandler;
-    private final NotiWebSocketHandler notiWebSocketHandler;
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         // 채팅 웹소켓 핸들러 등록
         registry.addHandler(chatWebSocketHandler, "/chat-rooms")
                 .setAllowedOrigins("*"); // CORS 설정, 실제 환경에서는 보안을 위해 제한적으로 설정해야 함
-
-        // 알림 웹소켓 핸들러 등록
-        registry.addHandler(notiWebSocketHandler, "/notifications")
-                .setAllowedOrigins("*");
     }
 }