✨ feat: 게임 종료 후 disconnected 참여자 정리

Author: silver-eunjoo

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

@@ -10,6 +10,7 @@
 
 import io.f1.backend.domain.game.dto.MessageType;
 import io.f1.backend.domain.game.event.RoomUpdatedEvent;
+import io.f1.backend.domain.game.model.ConnectionState;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.model.RoomState;
@@ -38,9 +39,10 @@ public class GameService {
 
     private static final int START_DELAY = 5;
 
-    private final MessageSender messageSender;
-    private final TimerService timerService;
     private final QuizService quizService;
+    private final RoomService roomService;
+    private final TimerService timerService;
+    private final MessageSender messageSender;
     private final RoomRepository roomRepository;
     private final ApplicationEventPublisher eventPublisher;
 
@@ -82,23 +84,29 @@ public void gameEnd(Room room) {
 
         Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
 
-        messageSender.send(
-                destination,
-                MessageType.GAME_SETTING,
-                toGameSettingResponse(room.getGameSetting(), room.getCurrentQuestion().getQuiz()));
-        messageSender.send(destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
-        messageSender.send(destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
-        messageSender.send(
-                destination,
-                MessageType.GAME_RESULT,
-                toGameResultListResponse(playerSessionMap, room.getGameSetting().getRound()));
+        messageSender.send(destination, MessageType.GAME_RESULT, toGameResultListResponse(playerSessionMap, room.getGameSetting().getRound()));
+
+        List<Player> disconnectedPlayers = new ArrayList<>();
 
         room.initializeRound();
         for (Player player : playerSessionMap.values()) {
+            if(player.getState().equals(ConnectionState.DISCONNECTED)) {
+                disconnectedPlayers.add(player);
+            }
             player.initializeCorrectCount();
             player.toggleReady();
         }
+
+        for(Player player : disconnectedPlayers) {
+            String sessionId = room.getUserIdSessionMap().get(player.id);
+            roomService.exitRoomForDisconnectedPlayer(roomId, player, sessionId);
+        }
+
         room.updateRoomState(RoomState.WAITING);
+        messageSender.send(destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
+        messageSender.send(destination, MessageType.GAME_SETTING, toGameSettingResponse(room.getGameSetting(), room.getCurrentQuestion()
+            .getQuiz()));
+        messageSender.send(destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
     }
 
     private boolean validateReadyStatus(Room room) {

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

@@ -336,4 +336,31 @@ private void removePlayer(Room room, String sessionId, Player removePlayer) {
         room.removeUserId(removePlayer.getId());
         room.removeSessionId(sessionId);
     }
+
+    public void exitRoomForDisconnectedPlayer(Long roomId, Player player, String sessionId) {
+
+        // 연결 끊긴 플레이어 exit 로직 타게 해주기
+        Room room = findRoom(roomId);
+
+        /* 방 삭제 */
+        if (isLastPlayer(room, sessionId)) {
+            removeRoom(room);
+            return;
+        }
+
+        /* 방장 변경 */
+        if (room.isHost(player.getId())) {
+            changeHost(room, sessionId);
+        }
+
+        /* 플레이어 삭제 */
+        removePlayer(room, sessionId, player);
+
+        SystemNoticeResponse systemNoticeResponse =
+            ofPlayerEvent(player.nickname, RoomEventType.EXIT);
+
+        String destination = getDestination(roomId);
+
+        messageSender.send(destination, MessageType.SYSTEM_NOTICE, systemNoticeResponse);
+    }
 }

backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java

@@ -45,6 +45,7 @@ class RoomServiceTests {
 
     @Mock private RoomRepository roomRepository;
     @Mock private QuizService quizService;
+    @Mock private GameService gameService;
     @Mock private TimerService timerService;
     @Mock private ApplicationEventPublisher eventPublisher;
     @Mock private MessageSender messageSender;
@@ -54,7 +55,7 @@ void setUp() {
         MockitoAnnotations.openMocks(this); // @Mock 어노테이션이 붙은 필드들을 초기화합니다.
         roomService =
                 new RoomService(
-                        timerService, quizService, roomRepository, eventPublisher, messageSender);
+                        gameService ,timerService, quizService, roomRepository, eventPublisher, messageSender);
 
         SecurityContextHolder.clearContext();
     }