feat : 시즌 알림 기능 (#81)

Author: seoyeonson

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

@@ -7,6 +7,7 @@
 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.security.core.Authentication;
@@ -28,6 +29,7 @@
 public class ApiV1NotiController {
     private final NotiService notiService;
     private final UserRepository userRepository;
+    private final NotiWebSocketHandler notiWebSocketHandler;
 
     @GetMapping("")
     public GlobalResponse<List<NotiDto>> getNoti() {
@@ -39,6 +41,9 @@ public GlobalResponse<List<NotiDto>> getNoti() {
             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);
         }
 
@@ -49,4 +54,19 @@ public GlobalResponse<List<NotiDto>> getNoti() {
     public void createNoti() {
 
     }
-}
+
+    @PostMapping("/read")
+    public GlobalResponse<Object> readNoti() {
+        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.read(user);
+            return GlobalResponse.success("알림을 읽음 처리했습니다.");
+        }
+        return GlobalResponse.error(ErrorCode.LOGIN_REQUIRED);
+    }
+}

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

@@ -17,5 +17,5 @@ public interface NotiRepository extends JpaRepository<Noti, Long> {
     @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);
-
-}
+    Optional<List<Noti>> findNotiByReceiver(User receiver);
+}

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

@@ -88,4 +88,16 @@ public void createNewSeason(Season season) {
         });
         System.out.println("새 시즌 알림 생성 끝");
     }
-}
+
+    // 읽음 처리
+    @Transactional
+    public List<Noti> read(User receiver) {
+        System.out.println("알림 읽음 처리");
+        List<Noti> notis = notiRepository.findNotiByReceiver(receiver).orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
+        notis.forEach(noti -> {
+            noti.setRead(true);
+        });
+        System.out.println("알림 읽음 처리 끝");
+        return notis;
+    }
+}

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

@@ -1,53 +1,82 @@
 package cmf.commitField.global.websocket;
 
+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 com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.*;
 
 import java.io.IOException;
-import java.util.ArrayList;
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Component
+@RequiredArgsConstructor
 @Slf4j
 public class NotiWebSocketHandler implements WebSocketHandler {
-
-    private final List<WebSocketSession> sessions = new ArrayList<>();
+    private final NotiService notiService;
+    private final ObjectMapper objectMapper;
+    private final Map<Long, WebSocketSession> sessions = new ConcurrentHashMap<>();
 
     @Override
     public void afterConnectionEstablished(WebSocketSession session) throws Exception {
-        sessions.add(session);
-        log.info("알림 WebSocket 연결됨: " + session);
+        log.info("클라이언트 접속: {}", session.getId());
+
+        // 연결 성공 메시지 전송
+        Map<String, Object> connectMessage = new HashMap<>();
+        connectMessage.put("type", "SYSTEM");
+        connectMessage.put("connect", "알림 서버에 연결되었습니다.");
+        connectMessage.put("timestamp", LocalDateTime.now().toString());
+
+        try {
+            session.sendMessage(new TextMessage(objectMapper.writeValueAsString(connectMessage)));
+        } catch (Exception e) {
+            log.error("연결 메시지 전송 실패: {}", e.getMessage());
+        }
     }
 
     @Override
     public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exception {
-        // 알림 메시지 처리 로직 (필요 시 구현)
+        if (message instanceof TextMessage) {
+            String payload = ((TextMessage) message).getPayload();
+            log.info("Received message: {}", payload);
+        } else {
+            log.warn("Received unsupported message type: {}", message.getClass().getSimpleName());
+        }
     }
 
     @Override
     public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
-        log.error("알림 WebSocket 오류: " + exception.getMessage());
+        log.error("WebSocket error: ", exception);
+        session.close(CloseStatus.SERVER_ERROR);
     }
 
     @Override
-    public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception {
-        sessions.remove(session);
-        log.info("알림 WebSocket 연결 종료됨: " + session);
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
+        sessions.values().remove(session);
+        log.info("WebSocket disconnected: {}", status);
     }
 
     @Override
     public boolean supportsPartialMessages() {
         return false;
     }
 
-    // 모든 유저에게 알림 메시지 전송
-    public void sendNotificationToAllUsers(String message) {
-        for (WebSocketSession session : sessions) {
+    public void sendNotification(User receiver, List<NotiDto> noti) {
+        WebSocketSession session = sessions.get(receiver.getId());
+        if (session != null && session.isOpen()) {
             try {
-                session.sendMessage(new TextMessage(message));
+                String payload = objectMapper.writeValueAsString(noti);
+                session.sendMessage(new TextMessage(payload));
             } catch (IOException e) {
-                log.error("알림 메시지 전송 실패: " + e.getMessage());
+                log.error("Failed to send WebSocket notification", e);
             }
         }
     }