Skip to content

[fix] 게임 종료 시 PLAYER_LIST 메세지 누락, 방장 레디 풀림 이슈 해결 #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 27, 2025
Merged

[fix] 게임 종료 시 PLAYER_LIST 메세지 누락, 방장 레디 풀림 이슈 해결 #125

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
efcc81b
:recycle: refactor : 게임 종료 시 방장 레디 풀림 이슈, PLAYER_LIST 메세지 누락 이슈
silver-eunjoo Jul 27, 2025
1e6db3f
chore: Java 스타일 수정
Jul 27, 2025
a57c4e0
:recycle: refactor : PLAYER_LIST 여러번 브로드캐스팅 방지
silver-eunjoo Jul 27, 2025
879ca28
chore: Java 스타일 수정
Jul 27, 2025
39cdc3d
:recycle: refactor : PLAYER_LIST 브로드캐스팅 gameEnd로 빼기
silver-eunjoo Jul 27, 2025
6d97823
:recycle: refactor: PLAYER_LIST와 SYSTEM_NOTICE 동기화
silver-eunjoo Jul 27, 2025
6698116
chore: Java 스타일 수정
Jul 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion backend/src/main/java/io/f1/backend/domain/game/app/GameService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

messageSender.sendBroadcast(
destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
Copy link
Collaborator

@sehee123 sehee123 Jul 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SystemNotice 와 플레이어 리스트는 동기화가 되어야하지 않을까합니다!


room.updateRoomState(RoomState.WAITING);

Expand Down
2 changes: 0 additions & 2 deletions backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,6 @@ 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);
}
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/java/io/f1/backend/domain/game/model/Room.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ public void initializePlayers() {
.forEach(
player -> {
player.initializeCorrectCount();
player.toggleReady();
});
resetAllPlayerReadyStates();
}

public String getSessionIdByUserId(Long userId) {
Expand Down
6 changes: 1 addition & 5 deletions backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down