Skip to content

Commit 4ffea60

Browse files
committed
Merge remote-tracking branch 'origin/feat/20' into feat/20
# Conflicts: # backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java # backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java
2 parents cae5121 + 754a82b commit 4ffea60

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class Room {
2727

2828
private Map<String, Player> playerSessionMap = new ConcurrentHashMap<>();
2929

30-
private Map<Long,String> userIdSessionMap = new ConcurrentHashMap<>();
30+
private Map<Long, String> userIdSessionMap = new ConcurrentHashMap<>();
3131

3232
private final LocalDateTime createdAt = LocalDateTime.now();
3333

@@ -36,7 +36,6 @@ public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player ho
3636
this.roomSetting = roomSetting;
3737
this.gameSetting = gameSetting;
3838
this.host = host;
39-
4039
}
4140

4241
public boolean isHost(Long id){

backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public void initializeRoomSocket(@DestinationVariable Long roomId, Message<?> me
2525

2626
String websocketSessionId = getSessionId(message);
2727

28-
RoomInitialData roomInitialData = roomService.initializeRoomSocket(roomId, websocketSessionId);
28+
RoomInitialData roomInitialData =
29+
roomService.initializeRoomSocket(roomId, websocketSessionId);
2930
String destination = roomInitialData.destination();
3031

3132
messageSender.send(

0 commit comments

Comments
 (0)