✨ feat: repository, service 책임 분리, mapper추가

Author: sehee123

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

@@ -1,7 +1,12 @@
 package io.f1.backend.domain.game.app;
 
-import io.f1.backend.domain.game.store.RoomRepository;
+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.model.GameSetting;
+import io.f1.backend.domain.game.model.Player;
+import io.f1.backend.domain.game.model.RoomSetting;
+import io.f1.backend.domain.game.store.RoomRepository;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -12,8 +17,15 @@ public class RoomService {
 
     private final RoomRepository roomRepository;
 
-    public Long saveRoom(RoomCreateRequest request,Map<String, Object> loginUser) {
-        return roomRepository.saveRoom(request,loginUser);
+    public Long saveRoom(RoomCreateRequest request, Map<String, Object> loginUser) {
+
+        //todo 제일 작은 index quizId 가져와서 gameSetting
+        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);
     }
 
 }

backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java

@@ -0,0 +1,13 @@
+package io.f1.backend.domain.game.mapper;
+
+import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
+import io.f1.backend.domain.game.model.RoomSetting;
+
+public class RoomMapper {
+
+    public static RoomSetting toRoomSetting(RoomCreateRequest request) {
+        return new RoomSetting(request.roomName(), request.maxUserCount(),
+            request.locked(), request.password());
+    }
+
+}

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

@@ -4,7 +4,6 @@
 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.dto.request.RoomCreateRequest;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
@@ -16,20 +15,10 @@ public class RoomRepository {
     private final Map<Long, Room> rooms = new ConcurrentHashMap<>();
     private final AtomicLong roomIdGenerator = new AtomicLong(0);
 
-    public Long saveRoom(RoomCreateRequest request, Map<String, Object> loginUser) {
+    public Long saveRoom(GameSetting gameSetting, Player host, RoomSetting roomSetting) {
         Long newId = roomIdGenerator.incrementAndGet();
 
-        RoomSetting roomSetting = new RoomSetting(request.roomName(), request.maxUserCount(),
-            request.locked(), request.password());
-
-        //todo 제일 작은 index quizId 가져와서 gameSetting
-        GameSetting gameSetting = new GameSetting(1L, 10, 60);
-
-        Player host = new Player((Long) loginUser.get("id"), loginUser.get("nickname").toString());
-
-        Room newRoom = new Room(newId, roomSetting, gameSetting, host);
-
-        rooms.put(newId, newRoom);
+        rooms.put(newId, new Room(newId,roomSetting,gameSetting,host));
 
         return newId;
     }

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

@@ -2,8 +2,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+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;
@@ -29,7 +32,15 @@ void saveRoom_test() {
         loginUser.put("id", 1L);
         loginUser.put("nickname", "빵야빵야");
 
-        Long savedId = roomRepository.saveRoom(request, loginUser);
+
+        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());
+
+        Long savedId = roomRepository.saveRoom(gameSetting,host,roomSetting);
 
         Room savedRoom = roomRepository.getRoomForTest(savedId);