♻️ refactor : 게임 종료 시 로직 변경

Author: silver-eunjoo

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

@@ -162,20 +162,6 @@ public void gameEnd(Room room) {
                 destination,
                 MessageType.GAME_RESULT,
                 toGameResultListResponse(playerSessionMap, room.getGameSetting().getRound()));
-
-        room.initializeRound();
-        room.initializePlayers();
-
-        room.updateRoomState(RoomState.WAITING);
-
-        messageSender.send(
-                destination,
-                MessageType.GAME_SETTING,
-                toGameSettingResponse(room.getGameSetting(), room.getCurrentQuestion().getQuiz()));
-        messageSender.send(destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
-
-        List<Player> disconnectedPlayers = room.getDisconnectedPlayers();
-        roomService.handleDisconnectedPlayers(room, disconnectedPlayers);
     }
 
     private boolean validateReadyStatus(Room room) {

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

@@ -62,8 +62,6 @@ public class RoomService {
 
     private final MessageSender messageSender;
 
-    private static final int CONTINUE_DELAY = 3;
-
     private static final String PENDING_SESSION_ID = "PENDING_SESSION_ID";
 
     public RoomCreateResponse saveRoom(RoomCreateRequest request) {
@@ -169,19 +167,7 @@ public void exitRoom(Long roomId, String sessionId, UserPrincipal principal) {
 
             Player removePlayer = getRemovePlayer(room, sessionId, principal);
 
-            /* 방 삭제 */
-            if (isLastPlayer(room, sessionId)) {
-                removeRoom(room);
-                return;
-            }
-
-            /* 방장 변경 */
-            if (room.isHost(removePlayer.getId())) {
-                changeHost(room, sessionId);
-            }
-
-            /* 플레이어 삭제 */
-            removePlayer(room, sessionId, removePlayer);
+            cleanRoom(room, sessionId, removePlayer);
 
             SystemNoticeResponse systemNoticeResponse =
                     ofPlayerEvent(removePlayer.nickname, RoomEventType.EXIT);
@@ -195,6 +181,26 @@ public void exitRoom(Long roomId, String sessionId, UserPrincipal principal) {
         }
     }
 
+    public void backToRoom(Long roomId, String sessionId) {
+        Room room = findRoom(roomId);
+        String destination = getDestination(roomId);
+
+        room.initializeRound();
+        room.initializePlayers();
+
+        List<Player> disconnectedPlayers = room.getDisconnectedPlayers();
+        handleDisconnectedPlayers(room, disconnectedPlayers);
+
+        room.updateRoomState(RoomState.WAITING);
+
+        messageSender.send(
+            destination,
+            MessageType.GAME_SETTING,
+            toGameSettingResponse(room.getGameSetting(), room.getCurrentQuestion().getQuiz()));
+        messageSender.send(destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
+
+    }
+
     public void handlePlayerReady(Long roomId, String sessionId) {
         Player player =
                 roomRepository
@@ -290,19 +296,7 @@ public void exitRoomForDisconnectedPlayer(Long roomId, Player player, String ses
             // 연결 끊긴 플레이어 exit 로직 타게 해주기
             Room room = findRoom(roomId);
 
-            /* 방 삭제 */
-            if (isLastPlayer(room, sessionId)) {
-                removeRoom(room);
-                return;
-            }
-
-            /* 방장 변경 */
-            if (room.isHost(player.getId())) {
-                changeHost(room, sessionId);
-            }
-
-            /* 플레이어 삭제 */
-            removePlayer(room, sessionId, player);
+            cleanRoom(room, sessionId, player);
 
             String destination = getDestination(roomId);
 
@@ -314,6 +308,22 @@ public void exitRoomForDisconnectedPlayer(Long roomId, Player player, String ses
         }
     }
 
+    private void cleanRoom(Room room, String sessionId, Player player) {
+        /* 방 삭제 */
+        if (isLastPlayer(room, sessionId)) {
+            removeRoom(room);
+            return;
+        }
+
+        /* 방장 변경 */
+        if (room.isHost(player.getId())) {
+            changeHost(room, sessionId);
+        }
+
+        /* 플레이어 삭제 */
+        removePlayer(room, sessionId, player);
+    }
+
     public void handleDisconnectedPlayers(Room room, List<Player> disconnectedPlayers) {
         for (Player player : disconnectedPlayers) {
             String sessionId = room.getSessionIdByUserId(player.getId());

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

@@ -65,4 +65,9 @@ public void playerReady(@DestinationVariable Long roomId, Message<?> message) {
 
         roomService.handlePlayerReady(roomId, getSessionId(message));
     }
+
+    @MessageMapping("/room/init/{roomId}")
+    public void backToRoom(@DestinationVariable Long roomId, Message<?> message) {
+        roomService.backToRoom(roomId, getSessionId(message));
+    }
 }