♻️ 리뷰 반영 수정

Author: sehee123

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

@@ -2,6 +2,7 @@
 
 import io.f1.backend.domain.game.app.RoomService;
 import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
+import io.f1.backend.domain.game.dto.response.RoomCreateResponse;
 import jakarta.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +24,7 @@ public class RoomController {
 
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
-    public Long saveRoom(@RequestBody @Valid RoomCreateRequest request) {
+    public RoomCreateResponse saveRoom(@RequestBody @Valid RoomCreateRequest request) {
 
         Map<String, Object> loginUser = new HashMap<>();
         loginUser.put("id", 1L);

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

@@ -3,11 +3,14 @@
 import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomSetting;
 
 import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
+import io.f1.backend.domain.game.dto.response.RoomCreateResponse;
 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.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;
 
@@ -16,16 +19,21 @@
 public class RoomService {
 
     private final RoomRepository roomRepository;
+    private final AtomicLong roomIdGenerator = new AtomicLong(0);
 
-    public Long saveRoom(RoomCreateRequest request, Map<String, Object> loginUser) {
+    public RoomCreateResponse saveRoom(RoomCreateRequest request, Map<String, Object> loginUser) {
 
-        //todo 제일 작은 index quizId 가져와서 gameSetting
+        //todo 제일 작은 index quizId 가져와서 gameSetting(round 설정)
         GameSetting gameSetting = new GameSetting(1L, 10, 60);
         //todo security에서 가져오는걸로 변경
         Player host = new Player((Long) loginUser.get("id"), loginUser.get("nickname").toString());
         RoomSetting roomSetting = toRoomSetting(request);
 
-        return roomRepository.saveRoom(gameSetting, host, roomSetting);
+        Long newId = roomIdGenerator.incrementAndGet();
+
+        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

@@ -1,11 +1,13 @@
 package io.f1.backend.domain.game.dto.request;
 
+import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
-public record RoomCreateRequest(@NotNull(message = "방 제목은 필수입니다.") String roomName,
-                                @NotNull(message = "인원 수 입력은 필수입니다.") @Min(value = 2, message = "방 인원 수는 최소 2명 이상이어야합니다.") Integer maxUserCount,
-                                String password,
-                                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

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

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

@@ -1,31 +1,7 @@
 package io.f1.backend.domain.game.store;
 
-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.model.RoomSetting;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import org.springframework.stereotype.Repository;
 
-@Repository
-public class RoomRepository {
-
-    private final Map<Long, Room> rooms = new ConcurrentHashMap<>();
-    private final AtomicLong roomIdGenerator = new AtomicLong(0);
-
-    public Long saveRoom(GameSetting gameSetting, Player host, RoomSetting roomSetting) {
-        Long newId = roomIdGenerator.incrementAndGet();
-
-        rooms.put(newId, new Room(newId,roomSetting,gameSetting,host));
-
-        return newId;
-    }
-
-    //테스트 전용 메소드
-    public Room getRoomForTest(Long roomId) {
-        return rooms.get(roomId);
-    }
-
-}
+public interface RoomRepository {
+    void saveRoom(Room room);
+}

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

@@ -0,0 +1,23 @@
+package io.f1.backend.domain.game.store;
+
+import io.f1.backend.domain.game.model.Room;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class RoomRepositoryImpl implements RoomRepository {
+
+    private final Map<Long, Room> roomMap = new ConcurrentHashMap<>();
+
+    @Override
+    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

@@ -15,11 +15,11 @@
 
 class RoomRepositoryTests {
 
-    RoomRepository roomRepository;
+    RoomRepositoryImpl roomRepository;
 
     @BeforeEach
     void setUp() {
-        roomRepository = new RoomRepository();
+        roomRepository = new RoomRepositoryImpl();
     }
 
     @Test
@@ -40,9 +40,13 @@ void saveRoom_test() {
         RoomSetting roomSetting = new RoomSetting(request.roomName(), request.maxUserCount(),
             request.locked(), request.password());
 
-        Long savedId = roomRepository.saveRoom(gameSetting,host,roomSetting);
+        Long newId = 1L;
 
-        Room savedRoom = roomRepository.getRoomForTest(savedId);
+        Room newRoom = new Room(newId, roomSetting, gameSetting, host);
+
+        roomRepository.saveRoom(newRoom);
+
+        Room savedRoom = roomRepository.getRoomForTest(newId);
 
         assertThat(savedRoom.getHost().getId()).isEqualTo(loginUser.get("id"));
         assertThat(savedRoom.getHost().getNickname()).isEqualTo(loginUser.get("nickname"));