Skip to content

Commit efcc81b

Browse files
committed
♻️ refactor : 게임 종료 시 방장 레디 풀림 이슈, PLAYER_LIST 메세지 누락 이슈
1 parent 6cb182c commit efcc81b

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,12 @@ public void gameEnd(Room room) {
176176
room.initializePlayers();
177177

178178
List<Player> disconnectedPlayers = room.getDisconnectedPlayers();
179-
roomService.handleDisconnectedPlayers(room, disconnectedPlayers);
179+
if(!disconnectedPlayers.isEmpty()) {
180+
roomService.handleDisconnectedPlayers(room, disconnectedPlayers);
181+
} else {
182+
messageSender.sendBroadcast(
183+
destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
184+
}
180185

181186
room.updateRoomState(RoomState.WAITING);
182187

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ public void initializePlayers() {
138138
.forEach(
139139
player -> {
140140
player.initializeCorrectCount();
141-
player.toggleReady();
142141
});
142+
resetAllPlayerReadyStates();
143143
}
144144

145145
public String getSessionIdByUserId(Long userId) {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ class RoomServiceTests {
4747

4848
@Mock private RoomRepository roomRepository;
4949
@Mock private QuizService quizService;
50-
@Mock private GameService gameService;
51-
@Mock private TimerService timerService;
5250
@Mock private ApplicationEventPublisher eventPublisher;
5351
@Mock private MessageSender messageSender;
5452

@@ -58,7 +56,7 @@ void setUp() {
5856

5957
roomService =
6058
new RoomService(
61-
timerService, quizService, roomRepository, eventPublisher, messageSender);
59+
quizService, roomRepository, eventPublisher, messageSender);
6260

6361
SecurityContextHolder.clearContext();
6462
}

0 commit comments

Comments
 (0)