Merge remote-tracking branch 'origin/feat/20' into feat/20

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

Author: sehee123

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

@@ -31,17 +31,20 @@
 import io.f1.backend.domain.game.store.RoomRepository;
 import io.f1.backend.domain.quiz.app.QuizService;
 import io.f1.backend.domain.quiz.entity.Quiz;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import org.hibernate.boot.model.naming.IllegalIdentifierException;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
@@ -69,7 +72,7 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request) {
 
         Room room = new Room(newId, roomSetting, gameSetting, host);
 
-        room.getUserIdSessionMap().put(host.id,PENDING_SESSION_ID);
+        room.getUserIdSessionMap().put(host.id, PENDING_SESSION_ID);
 
         roomRepository.saveRoom(room);
 
@@ -85,7 +88,6 @@ public void enterRoom(RoomValidationRequest request) {
         Object lock = roomLocks.computeIfAbsent(roomId, k -> new Object());
 
         synchronized (lock) {
-
             Room room = findRoom(request.roomId());
 
             if (room.getState().equals(RoomState.PLAYING)) {
@@ -99,7 +101,7 @@ public void enterRoom(RoomValidationRequest request) {
             }
 
             if (room.getRoomSetting().locked()
-                && !room.getRoomSetting().password().equals(request.password())) {
+                    && !room.getRoomSetting().password().equals(request.password())) {
                 throw new IllegalArgumentException("401 비밀번호가 일치하지 않습니다.");
             }
 
@@ -116,7 +118,7 @@ public RoomInitialData initializeRoomSocket(Long roomId, String sessionId) {
         Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
         Map<Long, String> userIdSessionMap = room.getUserIdSessionMap();
 
-        if(room.isHost(player.getId())) {
+        if (room.isHost(player.getId())) {
             player.toggleReady();
         }
 
@@ -133,47 +135,46 @@ public RoomInitialData initializeRoomSocket(Long roomId, String sessionId) {
         Quiz quiz = quizService.getQuizById(quizId);
 
         GameSettingResponse gameSettingResponse =
-            toGameSettingResponse(room.getGameSetting(), quiz);
+                toGameSettingResponse(room.getGameSetting(), quiz);
 
         PlayerListResponse playerListResponse = toPlayerListResponse(room);
 
         SystemNoticeResponse systemNoticeResponse = ofPlayerEvent(player, RoomEventType.ENTER);
 
         return new RoomInitialData(
-            getDestination(roomId),
-            roomSettingResponse,
-            gameSettingResponse,
-            playerListResponse,
-            systemNoticeResponse);
+                getDestination(roomId),
+                roomSettingResponse,
+                gameSettingResponse,
+                playerListResponse,
+                systemNoticeResponse);
     }
 
     public RoomExitData exitRoom(Long roomId, String sessionId) {
 
         Object lock = roomLocks.computeIfAbsent(roomId, k -> new Object());
 
         synchronized (lock) {
-
             Room room = findRoom(roomId);
 
             String destination = getDestination(roomId);
 
-            Player removePlayer = getRemovePlayer(room,sessionId);
+            Player removePlayer = getRemovePlayer(room, sessionId);
 
             /* 방 삭제 */
-            if (isLastPlayer(room,sessionId)) {
-                return removeRoom(room,destination);
+            if (isLastPlayer(room, sessionId)) {
+                return removeRoom(room, destination);
             }
 
             /* 방장 변경 */
             if (room.isHost(removePlayer.getId())) {
-                changeHost(room,sessionId);
+                changeHost(room, sessionId);
             }
 
             /* 플레이어 삭제 */
-            removePlayer(room,sessionId,removePlayer);
+            removePlayer(room, sessionId, removePlayer);
 
             SystemNoticeResponse systemNoticeResponse =
-                ofPlayerEvent(removePlayer, RoomEventType.EXIT);
+                    ofPlayerEvent(removePlayer, RoomEventType.EXIT);
 
             PlayerListResponse playerListResponse = toPlayerListResponse(room);
 
@@ -184,15 +185,15 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
     public RoomListResponse getAllRooms() {
         List<Room> rooms = roomRepository.findAll();
         List<RoomResponse> roomResponses =
-            rooms.stream()
-                .map(
-                    room -> {
-                        Long quizId = room.getGameSetting().getQuizId();
-                        Quiz quiz = quizService.getQuizById(quizId);
-
-                        return toRoomResponse(room, quiz);
-                    })
-                .toList();
+                rooms.stream()
+                        .map(
+                                room -> {
+                                    Long quizId = room.getGameSetting().getQuizId();
+                                    Quiz quiz = quizService.getQuizById(quizId);
+
+                                    return toRoomResponse(room, quiz);
+                                })
+                        .toList();
         return new RoomListResponse(roomResponses);
     }
 
@@ -215,8 +216,8 @@ private Player createPlayer() {
 
     private Room findRoom(Long roomId) {
         return roomRepository
-            .findRoom(roomId)
-            .orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
+                .findRoom(roomId)
+                .orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
     }
 
     private boolean isLastPlayer(Room room, String sessionId) {
@@ -235,15 +236,17 @@ private RoomExitData removeRoom(Room room, String destination) {
     private void changeHost(Room room, String hostSessionId) {
         Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
 
-        Optional<String> nextHostSessionId = playerSessionMap.keySet().stream()
-            .filter(key -> !key.equals(hostSessionId)).findFirst();
+        Optional<String> nextHostSessionId =
+                playerSessionMap.keySet().stream()
+                        .filter(key -> !key.equals(hostSessionId))
+                        .findFirst();
 
         Player nextHost =
-            playerSessionMap.get(
-                nextHostSessionId.orElseThrow(
-                    () ->
-                        new IllegalArgumentException(
-                            "방장 교체 불가 - 404 해당 세션 플레이어는 존재하지않습니다.")));
+                playerSessionMap.get(
+                        nextHostSessionId.orElseThrow(
+                                () ->
+                                        new IllegalArgumentException(
+                                                "방장 교체 불가 - 404 해당 세션 플레이어는 존재하지않습니다.")));
 
         room.updateHost(nextHost);
         log.info("user_id:{} 방장 변경 완료 ", nextHost.getId());
@@ -253,5 +256,4 @@ private void removePlayer(Room room, String sessionId, Player removePlayer) {
         room.removeUserId(removePlayer.getId());
         room.removeSessionId(sessionId);
     }
-
 }

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

@@ -38,19 +38,19 @@ public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player ho
         this.host = host;
     }
 
-    public boolean isHost(Long id){
+    public boolean isHost(Long id) {
         return this.host.getId().equals(id);
     }
 
     public void updateHost(Player nextHost) {
         this.host = nextHost;
     }
 
-    public void removeUserId(Long id){
+    public void removeUserId(Long id) {
         this.userIdSessionMap.remove(id);
     }
 
-    public void removeSessionId(String sessionId){
+    public void removeSessionId(String sessionId) {
         this.playerSessionMap.remove(sessionId);
     }
 }