Merge remote-tracking branch 'origin/refactor/63' into refactor/63

Author: sehee123

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

@@ -151,10 +151,7 @@ public RoomInitialData initializeRoomSocket(
                 ofPlayerEvent(player.getNickname(), RoomEventType.ENTER);
 
         return new RoomInitialData(
-                roomSettingResponse,
-                gameSettingResponse,
-                playerListResponse,
-                systemNoticeResponse);
+                roomSettingResponse, gameSettingResponse, playerListResponse, systemNoticeResponse);
     }
 
     public RoomExitData exitRoom(Long roomId, String sessionId, UserPrincipal principal) {
@@ -252,8 +249,6 @@ private Player getRemovePlayer(Room room, String sessionId, UserPrincipal princi
         return removePlayer;
     }
 
-
-
     private Player createPlayer(UserPrincipal principal) {
         return new Player(principal.getUserId(), principal.getUserNickname());
     }
@@ -303,7 +298,7 @@ private void removePlayer(Room room, String sessionId, Player removePlayer) {
         room.removeSessionId(sessionId);
     }
 
-    private RoundResult buildResultOnlyChat( ChatMessage chatMessage) {
+    private RoundResult buildResultOnlyChat(ChatMessage chatMessage) {
         return RoundResult.builder().chat(chatMessage).build();
     }
 }

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

@@ -12,7 +12,9 @@
 import io.f1.backend.domain.game.dto.response.GameStartResponse;
 import io.f1.backend.domain.game.dto.response.PlayerListResponse;
 import io.f1.backend.domain.user.dto.UserPrincipal;
+
 import lombok.RequiredArgsConstructor;
+
 import org.springframework.messaging.Message;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
@@ -36,18 +38,18 @@ public void initializeRoomSocket(@DestinationVariable Long roomId, Message<?> me
         UserPrincipal principal = getSessionUser(message);
 
         RoomInitialData roomInitialData =
-            roomService.initializeRoomSocket(roomId, websocketSessionId, principal);
+                roomService.initializeRoomSocket(roomId, websocketSessionId, principal);
 
         String destination = getDestination(roomId);
 
         messageSender.send(
-            destination, MessageType.ROOM_SETTING, roomInitialData.roomSettingResponse());
+                destination, MessageType.ROOM_SETTING, roomInitialData.roomSettingResponse());
         messageSender.send(
-            destination, MessageType.GAME_SETTING, roomInitialData.gameSettingResponse());
+                destination, MessageType.GAME_SETTING, roomInitialData.gameSettingResponse());
         messageSender.send(
-            destination, MessageType.PLAYER_LIST, roomInitialData.playerListResponse());
+                destination, MessageType.PLAYER_LIST, roomInitialData.playerListResponse());
         messageSender.send(
-            destination, MessageType.SYSTEM_NOTICE, roomInitialData.systemNoticeResponse());
+                destination, MessageType.SYSTEM_NOTICE, roomInitialData.systemNoticeResponse());
     }
 
     @MessageMapping("/room/exit/{roomId}")
@@ -62,19 +64,19 @@ public void exitRoom(@DestinationVariable Long roomId, Message<?> message) {
 
         if (!roomExitData.isRemovedRoom()) {
             messageSender.send(
-                destination, MessageType.PLAYER_LIST, roomExitData.getPlayerListResponses());
+                    destination, MessageType.PLAYER_LIST, roomExitData.getPlayerListResponses());
             messageSender.send(
-                destination, MessageType.SYSTEM_NOTICE, roomExitData.getSystemNoticeResponse());
+                    destination, MessageType.SYSTEM_NOTICE, roomExitData.getSystemNoticeResponse());
         }
     }
 
     @MessageMapping("/room/start/{roomId}")
     public void gameStart(
-        @DestinationVariable Long roomId,
-        Message<DefaultWebSocketRequest<GameStartRequest>> message) {
+            @DestinationVariable Long roomId,
+            Message<DefaultWebSocketRequest<GameStartRequest>> message) {
 
-        GameStartResponse gameStartResponse = gameService.gameStart(roomId,
-            message.getPayload().getMessage());
+        GameStartResponse gameStartResponse =
+                gameService.gameStart(roomId, message.getPayload().getMessage());
 
         String destination = getDestination(roomId);
 
@@ -83,31 +85,31 @@ public void gameStart(
 
     @MessageMapping("room/chat/{roomId}")
     public void chat(
-        @DestinationVariable Long roomId,
-        Message<DefaultWebSocketRequest<ChatMessage>> message) {
+            @DestinationVariable Long roomId,
+            Message<DefaultWebSocketRequest<ChatMessage>> message) {
         RoundResult roundResult =
-            roomService.chat(roomId, getSessionId(message), message.getPayload().getMessage());
+                roomService.chat(roomId, getSessionId(message), message.getPayload().getMessage());
 
         String destination = getDestination(roomId);
 
         messageSender.send(destination, MessageType.CHAT, roundResult.getChat());
 
         if (!roundResult.hasOnlyChat()) {
             messageSender.send(
-                destination, MessageType.QUESTION_RESULT, roundResult.getQuestionResult());
+                    destination, MessageType.QUESTION_RESULT, roundResult.getQuestionResult());
             messageSender.send(destination, MessageType.RANK_UPDATE, roundResult.getRankUpdate());
             messageSender.send(
-                destination, MessageType.SYSTEM_NOTICE, roundResult.getSystemNotice());
+                    destination, MessageType.SYSTEM_NOTICE, roundResult.getSystemNotice());
         }
     }
 
     @MessageMapping("/room/ready/{roomId}")
     public void playerReady(@DestinationVariable Long roomId, Message<?> message) {
 
-        PlayerListResponse playerListResponse = roomService.handlePlayerReady(roomId, getSessionId(message));
+        PlayerListResponse playerListResponse =
+                roomService.handlePlayerReady(roomId, getSessionId(message));
 
-        messageSender.send(
-            getDestination(roomId), MessageType.PLAYER_LIST, playerListResponse);
+        messageSender.send(getDestination(roomId), MessageType.PLAYER_LIST, playerListResponse);
     }
 
     private static String getSessionId(Message<?> message) {