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

# Conflicts:
#	backend/src/main/java/io/f1/backend/domain/game/api/RoomController.java

Author: sehee123

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

@@ -9,11 +9,14 @@
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.model.RoomSetting;
 import io.f1.backend.domain.game.store.RoomRepository;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
+
 import lombok.RequiredArgsConstructor;
+
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+
 @Service
 @RequiredArgsConstructor
 public class RoomService {
@@ -23,17 +26,16 @@ public class RoomService {
 
     public RoomCreateResponse saveRoom(RoomCreateRequest request, Map<String, Object> loginUser) {
 
-        //todo 제일 작은 index quizId 가져와서 gameSetting(round 설정)
+        // todo 제일 작은 index quizId 가져와서 gameSetting(round 설정)
         GameSetting gameSetting = new GameSetting(1L, 10, 60);
-        //todo security에서 가져오는걸로 변경
+        // todo security에서 가져오는걸로 변경
         Player host = new Player((Long) loginUser.get("id"), loginUser.get("nickname").toString());
         RoomSetting roomSetting = toRoomSetting(request);
 
         Long newId = roomIdGenerator.incrementAndGet();
 
-        roomRepository.saveRoom(new Room(newId,roomSetting,gameSetting,host));
+        roomRepository.saveRoom(new Room(newId, roomSetting, gameSetting, host));
 
         return new RoomCreateResponse(newId);
     }
-
 }

backend/src/main/java/io/f1/backend/domain/game/dto/request/RoomCreateRequest.java

@@ -5,9 +5,11 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
-public record RoomCreateRequest(@NotBlank(message = "방 제목은 필수입니다.") String roomName,
-                                @NotNull(message = "인원 수 입력은 필수입니다.") @Min(value = 2, message = "방 인원 수는 최소 2명입니다.") @Max(value = 8, message = "방 인원 수는 최대 8명 입니다.") Integer maxUserCount,
-                                @NotNull String password,
-                                @NotNull boolean locked) {
-
-}
+public record RoomCreateRequest(
+        @NotBlank(message = "방 제목은 필수입니다.") String roomName,
+        @NotNull(message = "인원 수 입력은 필수입니다.")
+                @Min(value = 2, message = "방 인원 수는 최소 2명입니다.")
+                @Max(value = 8, message = "방 인원 수는 최대 8명 입니다.")
+                Integer maxUserCount,
+        @NotNull String password,
+        @NotNull boolean locked) {}

backend/src/main/java/io/f1/backend/domain/game/dto/response/RoomCreateResponse.java

@@ -1,6 +1,3 @@
 package io.f1.backend.domain.game.dto.response;
 
-public record RoomCreateResponse(Long roomId) {
-
-}
-
+public record RoomCreateResponse(Long roomId) {}

backend/src/main/java/io/f1/backend/domain/game/store/RoomRepositoryImpl.java

@@ -1,9 +1,11 @@
 package io.f1.backend.domain.game.store;
 
 import io.f1.backend.domain.game.model.Room;
+
+import org.springframework.stereotype.Repository;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.springframework.stereotype.Repository;
 
 @Repository
 public class RoomRepositoryImpl implements RoomRepository {
@@ -15,9 +17,8 @@ public void saveRoom(Room room) {
         roomMap.put(room.getId(), room);
     }
 
-    //테스트 전용 메소드
+    // 테스트 전용 메소드
     public Room getRoomForTest(Long roomId) {
         return roomMap.get(roomId);
     }
-
-}
+}

backend/src/test/java/io/f1/backend/domain/game/store/RoomRepositoryTests.java

@@ -2,17 +2,19 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
 import io.f1.backend.domain.game.model.GameSetting;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
-import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
 import io.f1.backend.domain.game.model.RoomSetting;
-import java.util.HashMap;
-import java.util.Map;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 class RoomRepositoryTests {
 
     RoomRepositoryImpl roomRepository;
@@ -32,13 +34,16 @@ void saveRoom_test() {
         loginUser.put("id", 1L);
         loginUser.put("nickname", "빵야빵야");
 
-
         GameSetting gameSetting = new GameSetting(1L, 10, 60);
 
         Player host = new Player((Long) loginUser.get("id"), loginUser.get("nickname").toString());
 
-        RoomSetting roomSetting = new RoomSetting(request.roomName(), request.maxUserCount(),
-            request.locked(), request.password());
+        RoomSetting roomSetting =
+                new RoomSetting(
+                        request.roomName(),
+                        request.maxUserCount(),
+                        request.locked(),
+                        request.password());
 
         Long newId = 1L;
 
@@ -56,5 +61,4 @@ void saveRoom_test() {
         assertThat(savedRoom.getRoomSetting().locked()).isEqualTo(request.locked());
         assertThat(savedRoom.getRoomSetting().password()).isEqualTo(request.password());
     }
-
-}
+}