Merge branch 'dev' into refactor/126

Author: LimKangHyun

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

@@ -176,7 +176,13 @@ public void gameEnd(Room room) {
         room.initializePlayers();
 
         List<Player> disconnectedPlayers = room.getDisconnectedPlayers();
-        roomService.handleDisconnectedPlayers(room, disconnectedPlayers);
+
+        if (!disconnectedPlayers.isEmpty()) {
+            roomService.handleDisconnectedPlayers(room, disconnectedPlayers);
+        } else {
+            messageSender.sendBroadcast(
+                    destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
+        }
 
         room.updateRoomState(RoomState.WAITING);
 

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

@@ -339,10 +339,10 @@ public void exitRoomForDisconnectedPlayer(Long roomId, Player player, String ses
             SystemNoticeResponse systemNoticeResponse =
                     ofPlayerEvent(player.nickname, RoomEventType.EXIT);
 
-            messageSender.sendBroadcast(
-                    destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
             messageSender.sendBroadcast(
                     destination, MessageType.SYSTEM_NOTICE, systemNoticeResponse);
+            messageSender.sendBroadcast(
+                    destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
         }
     }
 

backend/src/main/java/io/f1/backend/domain/game/dto/response/PlayerListResponse.java

@@ -2,4 +2,4 @@
 
 import java.util.List;
 
-public record PlayerListResponse(String host, List<PlayerResponse> players) {}
+public record PlayerListResponse(String host, List<PlayerResponse> players, int currentUserCount) {}

backend/src/main/java/io/f1/backend/domain/game/dto/response/RoomSettingResponse.java

@@ -1,4 +1,3 @@
 package io.f1.backend.domain.game.dto.response;
 
-public record RoomSettingResponse(
-        String roomName, int maxUserCount, int currentUserCount, boolean locked) {}
+public record RoomSettingResponse(String roomName, int maxUserCount, boolean locked) {}

backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java

@@ -63,7 +63,8 @@ public static PlayerListResponse toPlayerListResponse(Room room) {
                         .map(player -> new PlayerResponse(player.getNickname(), player.isReady()))
                         .toList();
 
-        return new PlayerListResponse(room.getHost().getNickname(), playerResponseList);
+        return new PlayerListResponse(
+                room.getHost().getNickname(), playerResponseList, playerResponseList.size());
     }
 
     public static RoomResponse toRoomResponse(Room room, Quiz quiz) {

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

@@ -138,8 +138,8 @@ public void initializePlayers() {
                 .forEach(
                         player -> {
                             player.initializeCorrectCount();
-                            player.toggleReady();
                         });
+        resetAllPlayerReadyStates();
     }
 
     public String getSessionIdByUserId(Long userId) {

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

@@ -47,18 +47,14 @@ 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;
 
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this); // @Mock 어노테이션이 붙은 필드들을 초기화합니다.
 
-        roomService =
-                new RoomService(
-                        timerService, quizService, roomRepository, eventPublisher, messageSender);
+        roomService = new RoomService(quizService, roomRepository, eventPublisher, messageSender);
 
         SecurityContextHolder.clearContext();
     }