Feature/#4 : 게임 Feign 추가, Socket 관련 코드 추가

src/main/java/urdego/io/urdego_notification_service/common/enums/MessageType.java

@@ -0,0 +1,20 @@
+package urdego.io.urdego_notification_service.common.enums;
+
+public enum MessageType {
+    // 알림
+    NOTIFICATION,
+    // 대기방
+    PLAYER_JOINED,
+    PLAYER_REMOVED,
+    PLAYER_READY,
+    CONTENT_SELECTED,
+    // 게임
+    SCORE_UPDATED,
+    GAME_ENDED,
+    // 라운드 진행
+    QUESTION_GIVEN,
+    ANSWER_SUBMITTED
+
+
+
+}

src/main/java/urdego/io/urdego_notification_service/controller/NotificationController.java

@@ -11,8 +11,8 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import urdego.io.urdego_notification_service.controller.dto.request.NotificationRequest;
-import urdego.io.urdego_notification_service.controller.dto.response.WebSocketMessageResponse;
+import urdego.io.urdego_notification_service.controller.dto.request.notification.NotificationRequest;
+import urdego.io.urdego_notification_service.controller.dto.WebSocketMessage;
 import urdego.io.urdego_notification_service.domain.entity.Notification;
 import urdego.io.urdego_notification_service.domain.service.NotificationService;
 
@@ -24,10 +24,10 @@ public class NotificationController {
     private final NotificationService notificationService;
 
     @PostMapping("/send")
-    @ApiResponse(responseCode = "200", content = @Content(schema = @Schema(implementation = WebSocketMessageResponse.class)))
+    @ApiResponse(responseCode = "200", content = @Content(schema = @Schema(implementation = WebSocketMessage.class)))
     @Operation(summary = "게임초대 알림 전송",description = "userId로 게임초대 알림 전송")
-    public ResponseEntity<WebSocketMessageResponse<Notification>> sendNotification(@RequestBody NotificationRequest request) {
-        WebSocketMessageResponse<Notification> response = notificationService.publishNotification(request);
+    public ResponseEntity<WebSocketMessage<Notification>> sendNotification(@RequestBody NotificationRequest request) {
+        WebSocketMessage<Notification> response = notificationService.publishNotification(request);
         return ResponseEntity.ok().body(response);
 
     }

src/main/java/urdego/io/urdego_notification_service/controller/NotificationSocketController.java

@@ -1,46 +1,66 @@
 package urdego.io.urdego_notification_service.controller;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Controller;
+import urdego.io.urdego_notification_service.common.enums.MessageType;
 import urdego.io.urdego_notification_service.controller.client.GameServiceClient;
-import urdego.io.urdego_notification_service.controller.dto.request.ContentSelectReq;
-import urdego.io.urdego_notification_service.controller.dto.request.PlayerReq;
-import urdego.io.urdego_notification_service.controller.dto.response.RoomPlayersRes;
+import urdego.io.urdego_notification_service.controller.dto.WebSocketMessage;
+import urdego.io.urdego_notification_service.controller.dto.request.game.AnswerReq;
+import urdego.io.urdego_notification_service.controller.dto.request.game.QuestionReq;
+import urdego.io.urdego_notification_service.controller.dto.request.game.ScoreReq;
+import urdego.io.urdego_notification_service.controller.dto.request.room.ContentSelectReq;
+import urdego.io.urdego_notification_service.controller.dto.request.room.PlayerReq;
+import urdego.io.urdego_notification_service.controller.util.ReflectionUtil;
 
+@Slf4j
 @Controller
 @RequiredArgsConstructor
 public class NotificationSocketController {
 
     private final GameServiceClient gameServiceClient;
     private final SimpMessagingTemplate messagingTemplate;
 
-    // 플레이어 참여
-    @MessageMapping("/room/player/invite")
-    public void invitePlayer(PlayerReq request) {
-        RoomPlayersRes response = gameServiceClient.invitePlayer(request).getBody();
-        messagingTemplate.convertAndSend("/urdego/sub/" + response.roomId(), response);
+    @MessageMapping("/room/event")
+    public void handleRoomEvent(WebSocketMessage<?> request) {
+        Object response = null;
+        switch (request.messageType()) {
+            case PLAYER_JOINED -> response = gameServiceClient.invitePlayer((PlayerReq) request.payload()).getBody();
+            case PLAYER_REMOVED -> response = gameServiceClient.removePlayer((PlayerReq) request.payload()).getBody();
+            case PLAYER_READY -> response = gameServiceClient.readyPlayer((PlayerReq) request.payload()).getBody();
+            case CONTENT_SELECTED -> response = gameServiceClient.selectContent((ContentSelectReq) request.payload()).getBody();
+        }
+        sendMessage(response, request.messageType());
     }
 
-    // 플레이어 삭제
-    @MessageMapping("/room/player/remove")
-    public void removePlayer(PlayerReq request) {
-        RoomPlayersRes response = gameServiceClient.removePlayer(request).getBody();
-        messagingTemplate.convertAndSend("/urdego/sub/" + response.roomId(), response);
-    }
+    @MessageMapping("/game/event")
+    public void handleGameEvent(WebSocketMessage<?> request) {
+        Object response = null;
+        switch (request.messageType()) {
+            case SCORE_UPDATED -> response = gameServiceClient.giveScores((ScoreReq) request.payload()).getBody();
+            case GAME_ENDED -> response = gameServiceClient.endGame((String) request.payload()).getBody();
+            case QUESTION_GIVEN -> response = gameServiceClient.giveQuestion((QuestionReq) request.payload()).getBody();
+            case ANSWER_SUBMITTED -> response = gameServiceClient.submitAnswer((AnswerReq) request.payload()).getBody();
 
-    // 플레이어 준비
-    @MessageMapping("/room/player/ready")
-    public void readyPlayer(PlayerReq request) {
-        RoomPlayersRes response = gameServiceClient.readyPlayer(request).getBody();
-        messagingTemplate.convertAndSend("/urdego/sub/" + response.roomId(), response);
+        }
+        sendMessage(response, request.messageType());
     }
 
-    // 컨텐츠 선택
-    @MessageMapping("/room/select-content")
-    public void selectContent(ContentSelectReq request) {
-        gameServiceClient.selectContent(request);
+    private <T> void sendMessage(T response, MessageType messageType) {
+        if (response == null) {
+            log.info("빈 응답이므로 기본 메시지를 전송합니다.");
+            return;
+        }
+        try {
+            String roomId = ReflectionUtil.getRoomIdFromResponse(response);
+            messagingTemplate.convertAndSend(
+                    "/urdego/sub/" + roomId,
+                    new WebSocketMessage<>(messageType, response)
+            );
+        } catch (IllegalArgumentException e) {
+            log.error("roomId 조회 실패: {}", e.getMessage());
+        }
     }
-
 }

src/main/java/urdego/io/urdego_notification_service/controller/client/GameServiceClient.java

@@ -4,23 +4,42 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import urdego.io.urdego_notification_service.controller.dto.request.ContentSelectReq;
-import urdego.io.urdego_notification_service.controller.dto.request.PlayerReq;
-import urdego.io.urdego_notification_service.controller.dto.response.RoomPlayersRes;
+import org.springframework.web.bind.annotation.RequestMapping;
+import urdego.io.urdego_notification_service.controller.dto.request.game.AnswerReq;
+import urdego.io.urdego_notification_service.controller.dto.request.game.QuestionReq;
+import urdego.io.urdego_notification_service.controller.dto.request.game.ScoreReq;
+import urdego.io.urdego_notification_service.controller.dto.request.room.ContentSelectReq;
+import urdego.io.urdego_notification_service.controller.dto.request.room.PlayerReq;
+import urdego.io.urdego_notification_service.controller.dto.response.game.AnswerRes;
+import urdego.io.urdego_notification_service.controller.dto.response.game.GameEndRes;
+import urdego.io.urdego_notification_service.controller.dto.response.game.QuestionRes;
+import urdego.io.urdego_notification_service.controller.dto.response.game.ScoreRes;
+import urdego.io.urdego_notification_service.controller.dto.response.room.RoomPlayersRes;
 
-@FeignClient(name = "game-service", url = "${feign.client.config.service.url}")
+@FeignClient(name = "game-service")
+@RequestMapping("/api/game-service")
 public interface GameServiceClient {
-    @PostMapping("/player/invite")
+    @PostMapping("/room/player/invite")
     ResponseEntity<RoomPlayersRes> invitePlayer(@RequestBody PlayerReq request);
 
-    @PostMapping("/player/remove")
+    @PostMapping("/room/player/remove")
     ResponseEntity<RoomPlayersRes> removePlayer(@RequestBody PlayerReq request);
 
-    @PostMapping("/player/ready")
+    @PostMapping("/room/player/ready")
     ResponseEntity<RoomPlayersRes> readyPlayer(@RequestBody PlayerReq request);
 
-    @PostMapping("/select-content")
+    @PostMapping("/room/select-content")
     ResponseEntity<Void> selectContent(@RequestBody ContentSelectReq request);
 
+    @PostMapping("/game/score")
+    ResponseEntity<ScoreRes> giveScores(@RequestBody ScoreReq request);
 
+    @PostMapping("/game/end")
+    ResponseEntity<GameEndRes> endGame(@RequestBody String gameId);
+
+    @PostMapping("/round/question")
+    ResponseEntity<QuestionRes> giveQuestion(@RequestBody QuestionReq request);
+
+    @PostMapping("/round/answer")
+    ResponseEntity<AnswerRes> submitAnswer(@RequestBody AnswerReq request);
 }

src/main/java/urdego/io/urdego_notification_service/controller/dto/WebSocketMessage.java

@@ -0,0 +1,9 @@
+package urdego.io.urdego_notification_service.controller.dto;
+
+import urdego.io.urdego_notification_service.common.enums.MessageType;
+
+public record WebSocketMessage<T>(
+        MessageType messageType,
+        T payload
+) {
+}

src/main/java/urdego/io/urdego_notification_service/controller/dto/request/game/AnswerReq.java

@@ -0,0 +1,9 @@
+package urdego.io.urdego_notification_service.controller.dto.request.game;
+
+public record AnswerReq(
+        String questionId,
+        String userId,
+        double latitude,
+        double longitude
+) {
+}

src/main/java/urdego/io/urdego_notification_service/controller/dto/request/game/QuestionReq.java

@@ -0,0 +1,7 @@
+package urdego.io.urdego_notification_service.controller.dto.request.game;
+
+public record QuestionReq(
+        String roomId,
+        int roundNum
+) {
+}

src/main/java/urdego/io/urdego_notification_service/controller/dto/request/game/ScoreReq.java

@@ -0,0 +1,7 @@
+package urdego.io.urdego_notification_service.controller.dto.request.game;
+
+public record ScoreReq(
+        String gameId,
+        int roundNum
+) {
+}

src/main/java/urdego/io/urdego_notification_service/controller/dto/request/NotificationRequest.java → src/main/java/urdego/io/urdego_notification_service/controller/dto/request/notification/NotificationRequest.java

@@ -1,4 +1,4 @@
-package urdego.io.urdego_notification_service.controller.dto.request;
+package urdego.io.urdego_notification_service.controller.dto.request.notification;
 
 import lombok.Builder;
 import urdego.io.urdego_notification_service.domain.entity.Notification;

src/main/java/urdego/io/urdego_notification_service/controller/dto/request/ContentSelectReq.java → src/main/java/urdego/io/urdego_notification_service/controller/dto/request/room/ContentSelectReq.java

@@ -1,4 +1,4 @@
-package urdego.io.urdego_notification_service.controller.dto.request;
+package urdego.io.urdego_notification_service.controller.dto.request.room;
 
 import java.util.List;
 

src/main/java/urdego/io/urdego_notification_service/controller/dto/request/PlayerReq.java → src/main/java/urdego/io/urdego_notification_service/controller/dto/request/room/PlayerReq.java

@@ -1,4 +1,4 @@
-package urdego.io.urdego_notification_service.controller.dto.request;
+package urdego.io.urdego_notification_service.controller.dto.request.room;
 
 public record PlayerReq(
         String roomId,

src/main/java/urdego/io/urdego_notification_service/controller/dto/response/game/AnswerRes.java

@@ -0,0 +1,9 @@
+package urdego.io.urdego_notification_service.controller.dto.response.game;
+
+public record AnswerRes(
+        String questionId,
+        String userId,
+        double latitude,
+        double longitude
+) {
+}

src/main/java/urdego/io/urdego_notification_service/controller/dto/response/game/GameEndRes.java

@@ -0,0 +1,14 @@
+package urdego.io.urdego_notification_service.controller.dto.response.game;
+
+import urdego.io.urdego_notification_service.common.enums.Status;
+
+import java.util.Map;
+
+public record GameEndRes(
+        String gameId,
+        String roomId,
+        Status status,
+        Map<String, Integer> totalScores,
+        Map<String, Integer> exp
+) {
+}

src/main/java/urdego/io/urdego_notification_service/controller/dto/response/game/QuestionRes.java

@@ -0,0 +1,14 @@
+package urdego.io.urdego_notification_service.controller.dto.response.game;
+
+import java.util.List;
+
+public record QuestionRes(
+        String questionId,
+        String roomId,
+        int roundNum,
+        double latitude,
+        double longitude,
+        String hint,
+        List<String> contents
+) {
+}

src/main/java/urdego/io/urdego_notification_service/controller/dto/response/game/ScoreRes.java

@@ -0,0 +1,10 @@
+package urdego.io.urdego_notification_service.controller.dto.response.game;
+
+import java.util.Map;
+
+public record ScoreRes(
+        String roomId,
+        Map<Integer, Map<String, Integer>> roundScores,
+        Map<String, Integer> totalScores
+) {
+}

src/main/java/urdego/io/urdego_notification_service/controller/dto/response/NotificationResponse.java → src/main/java/urdego/io/urdego_notification_service/controller/dto/response/notification/NotificationResponse.java

@@ -1,4 +1,4 @@
-package urdego.io.urdego_notification_service.controller.dto.response;
+package urdego.io.urdego_notification_service.controller.dto.response.notification;
 
 import java.util.UUID;
 

src/main/java/urdego/io/urdego_notification_service/controller/dto/response/RoomPlayersRes.java → src/main/java/urdego/io/urdego_notification_service/controller/dto/response/room/RoomPlayersRes.java

@@ -1,4 +1,4 @@
-package urdego.io.urdego_notification_service.controller.dto.response;
+package urdego.io.urdego_notification_service.controller.dto.response.room;
 
 import urdego.io.urdego_notification_service.common.enums.Status;
 

src/main/java/urdego/io/urdego_notification_service/controller/util/ReflectionUtil.java

@@ -0,0 +1,33 @@
+package urdego.io.urdego_notification_service.controller.util;
+
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class ReflectionUtil {
+    private static final Map<Class<?>, Method> methodCache = new ConcurrentHashMap<>();
+
+    public static String getRoomIdFromResponse(Object response) {
+        if (response == null) {
+            throw new IllegalArgumentException("응답 객체가 null입니다.");
+        }
+
+        try {
+            Method method = methodCache.computeIfAbsent(response.getClass(), clazz -> {
+                try {
+                    return clazz.getMethod("roomId");
+                } catch (NoSuchMethodException e) {
+                    throw new IllegalArgumentException("roomId를 찾을 수 없는 응답 타입: " + clazz.getSimpleName(), e);
+                }
+            });
+
+            return (String) method.invoke(response);
+
+        } catch (Exception e) {
+            throw new IllegalArgumentException("roomId 호출 실패: " + response.getClass().getSimpleName(), e);
+        }
+    }
+}

src/main/java/urdego/io/urdego_notification_service/domain/entity/Notification.java

@@ -7,7 +7,7 @@
 import lombok.NoArgsConstructor;
 import org.springframework.stereotype.Component;
 import urdego.io.urdego_notification_service.common.enums.Action;
-import urdego.io.urdego_notification_service.controller.dto.request.NotificationRequest;
+import urdego.io.urdego_notification_service.controller.dto.request.notification.NotificationRequest;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;

src/main/java/urdego/io/urdego_notification_service/domain/service/NotificationService.java

@@ -1,17 +1,15 @@
 package urdego.io.urdego_notification_service.domain.service;
 
-import org.springframework.stereotype.Service;
-import urdego.io.urdego_notification_service.controller.dto.request.NotificationRequest;
-import urdego.io.urdego_notification_service.controller.dto.response.NotificationResponse;
-import urdego.io.urdego_notification_service.controller.dto.response.WebSocketMessageResponse;
+import urdego.io.urdego_notification_service.controller.dto.request.notification.NotificationRequest;
+import urdego.io.urdego_notification_service.controller.dto.WebSocketMessage;
 import urdego.io.urdego_notification_service.domain.entity.Notification;
 
 import java.util.List;
 
 public interface NotificationService {
 
     //메세지 발행
-    public WebSocketMessageResponse<Notification> publishNotification(NotificationRequest notificationRequest);
+    public WebSocketMessage<Notification> publishNotification(NotificationRequest notificationRequest);
 
     //사용자 별 메세지 확인
     List<Object> getUserNotifications(Long userId);