♻️ 리뷰 반영 - util 추가, 메소드명 수정, 널세이프수정

Author: sehee123

backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java

@@ -90,7 +90,7 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request) {
 
         Room room = new Room(newId, roomSetting, gameSetting, host);
 
-        room.addValidatedUserIds(getCurrentUserId());
+        room.addValidatedUserId(getCurrentUserId());
 
         roomRepository.saveRoom(room);
 
@@ -123,7 +123,7 @@ public void enterRoom(RoomValidationRequest request) {
                 throw new CustomException(RoomErrorCode.WRONG_PASSWORD);
             }
 
-            room.addValidatedUserIds(getCurrentUserId());
+            room.addValidatedUserId(getCurrentUserId());
         }
     }
 

backend/src/main/java/io/f1/backend/domain/game/model/Room.java

@@ -51,8 +51,7 @@ public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player ho
         this.host = host;
     }
 
-    public boolean addValidatedUserIds(Long userId) {
-        return validatedUserIds.add(userId);
+    public void addValidatedUserId(Long userId) {validatedUserIds.add(userId);
     }
 
     public int getCurrentUserCnt() {

backend/src/main/java/io/f1/backend/domain/game/websocket/WebSocketUtils.java

@@ -22,4 +22,9 @@ public static UserPrincipal getSessionUser(Message<?> message) {
     public static String getDestination(Long roomId) {
         return "/sub/room/" + roomId;
     }
+
+    public static String getRoomSubscriptionDestination(Message<?> message) {
+        StompHeaderAccessor headerAccessor = StompHeaderAccessor.wrap(message);
+        return headerAccessor.getDestination();
+    }
 }

backend/src/main/java/io/f1/backend/domain/game/websocket/eventlistener/WebsocketEventListener.java

@@ -1,5 +1,6 @@
 package io.f1.backend.domain.game.websocket.eventlistener;
 
+import static io.f1.backend.domain.game.websocket.WebSocketUtils.getRoomSubscriptionDestination;
 import static io.f1.backend.domain.game.websocket.WebSocketUtils.getSessionId;
 import static io.f1.backend.domain.game.websocket.WebSocketUtils.getSessionUser;
 
@@ -39,18 +40,12 @@ public void handleSubscribeListener(SessionSubscribeEvent event) {
 
         Message<?> message = event.getMessage();
 
-        StompHeaderAccessor headerAccessor = StompHeaderAccessor.wrap(message);
-
         String sessionId = getSessionId(message);
         UserPrincipal principal = getSessionUser(message);
 
-        String destination = headerAccessor.getDestination();
-
-        if (destination == null) {
-            // todo 에러처리: 잘못된 구독 주소입니다
-            return;
-        }
+        String destination =  getRoomSubscriptionDestination(message);
 
+        //todo 인덱스 길이 유효성 추가
         String[] subscribeType = destination.split("/");
 
         if (subscribeType[2].equals("room")) {

backend/src/main/java/io/f1/backend/domain/game/websocket/service/SessionService.java

@@ -64,7 +64,7 @@ public void handleUserDisconnect(String sessionId, UserPrincipal principal) {
         scheduler.schedule(
                 () -> {
                     /* 재연결 실패  */
-                    if (userIdSession.get(userId).equals(sessionId)) {
+                    if (sessionId.equals(userIdSession.get(userId))){
                         roomService.exitIfNotPlaying(roomId, sessionId, principal);
                     }
                     removeSession(sessionId, userId);
@@ -75,7 +75,7 @@ public void handleUserDisconnect(String sessionId, UserPrincipal principal) {
 
     public void removeSession(String sessionId, Long userId) {
 
-        if (userIdSession.get(userId).equals(sessionId)) {
+        if (sessionId.equals(userIdSession.get(userId))) {
             userIdSession.remove(userId);
         }
         sessionIdUser.remove(sessionId);