Skip to content

Commit 9239461

Browse files
committed
🔀 dev merge
1 parent ae77da3 commit 9239461

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
3030

3131
String destination = getDestination(roomId);
3232

33-
messageSender.send(destination, MessageType.CHAT, chatMessage);
33+
messageSender.sendBroadcast(destination, MessageType.CHAT, chatMessage);
3434

3535
if (!room.isPlaying()) {
3636
return;

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package io.f1.backend.domain.game.app;
22

3+
import static io.f1.backend.domain.game.mapper.RoomMapper.ofPlayerEvent;
4+
import static io.f1.backend.domain.game.mapper.RoomMapper.toGameResultListResponse;
35
import static io.f1.backend.domain.game.mapper.RoomMapper.toGameSettingResponse;
46
import static io.f1.backend.domain.game.mapper.RoomMapper.toPlayerListResponse;
7+
import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionResultResponse;
58
import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionStartResponse;
69
import static io.f1.backend.domain.game.mapper.RoomMapper.toRankUpdateResponse;
10+
import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomSettingResponse;
11+
import static io.f1.backend.domain.game.websocket.WebSocketUtils.getDestination;
712
import static io.f1.backend.domain.quiz.mapper.QuizMapper.toGameStartResponse;
813

914
import io.f1.backend.domain.game.dto.ChatMessage;
@@ -159,7 +164,7 @@ public void gameEnd(Room room) {
159164
Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
160165

161166
// TODO : 랭킹 정보 업데이트
162-
messageSender.send(
167+
messageSender.sendBroadcast(
163168
destination,
164169
MessageType.GAME_RESULT,
165170
toGameResultListResponse(playerSessionMap, room.getGameSetting().getRound()));
@@ -172,13 +177,13 @@ public void gameEnd(Room room) {
172177

173178
room.updateRoomState(RoomState.WAITING);
174179

175-
messageSender.send(
180+
messageSender.sendBroadcast(
176181
destination,
177182
MessageType.GAME_SETTING,
178183
toGameSettingResponse(
179184
room.getGameSetting(),
180185
quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId())));
181-
messageSender.send(destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
186+
messageSender.sendBroadcast(destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
182187
}
183188

184189
public void handlePlayerReady(Long roomId, String sessionId) {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ public void reconnectSession(
203203
room.reconnectSession(oldSessionId, newSessionId);
204204

205205
String destination = getDestination(roomId);
206+
String userDestination = getUserDestination();
206207

207208
messageSender.sendBroadcast(
208209
destination,
@@ -337,8 +338,8 @@ public void exitRoomForDisconnectedPlayer(Long roomId, Player player, String ses
337338
SystemNoticeResponse systemNoticeResponse =
338339
ofPlayerEvent(player.nickname, RoomEventType.EXIT);
339340

340-
messageSender.send(destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
341-
messageSender.send(destination, MessageType.SYSTEM_NOTICE, systemNoticeResponse);
341+
messageSender.sendBroadcast(destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
342+
messageSender.sendBroadcast(destination, MessageType.SYSTEM_NOTICE, systemNoticeResponse);
342343
}
343344
}
344345

0 commit comments

Comments
 (0)