feat: domain 의 game 을 gameId 를 통해서 관리

woowacourse-code-review-study · Apr 21, 2023 · c03a82a · c03a82a
1 parent 40a329e
commit c03a82a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/domain-h2/src/main/java/racingcar/repositoryImpl/RacingGameMapper.java b/domain-h2/src/main/java/racingcar/repositoryImpl/RacingGameMapper.java
@@ -16,7 +16,7 @@ private RacingGameMapper() {
     }
 
     public static GameEntity toGameEntity(final RacingGame racingGame) {
-        return new GameEntity(racingGame.getGameId(), racingGame.getCount().getTargetCount());
+        return new GameEntity(racingGame.getGameId().getValue(), racingGame.getCount().getTargetCount());
     }
 
     public static List<CarEntity> toCarEntities(final List<Car> cars, final GameId gameId) {
@@ -28,7 +28,7 @@ public static List<CarEntity> toCarEntities(final List<Car> cars, final GameId g
     public static List<WinnerEntity> toWinnerEntity(final RacingGame racingGame) {
         return racingGame.findWinner()
                 .stream()
-                .map(car -> WinnerEntity.fromDomain(car, racingGame.getGameId()))
+                .map(car -> WinnerEntity.fromDomain(car, racingGame.getGameId().getValue()))
                 .collect(Collectors.toList());
     }
 

diff --git a/domain-h2/src/test/java/racingcar/repositoryImpl/RacingGameMapperTest.java b/domain-h2/src/test/java/racingcar/repositoryImpl/RacingGameMapperTest.java
@@ -63,7 +63,7 @@ class RacingGameMapperTest {
                 List.of(new CarEntity(1, "ㅁㄴㅇㄹ", 3, 3)));
 
         assertAll(
-                () -> assertThat(result.getGameId()).isEqualTo(3),
+                () -> assertThat(result.getGameId().getValue()).isEqualTo(3),
                 () -> assertThat(result.getCount().getTargetCount()).isEqualTo(5),
                 () -> assertThat(result.getCars()).hasSize(1),
                 () -> assertThat(result.getCars().get(0).getCarName()).isEqualTo("ㅁㄴㅇㄹ"),
@@ -85,7 +85,7 @@ class RacingGameMapperTest {
 
         assertAll(
                 () -> assertThat(result).hasSize(2),
-                () -> assertThat(result.get(0).getGameId()).isEqualTo(1),
+                () -> assertThat(result.get(0).getGameId().getValue()).isEqualTo(1),
                 () -> assertThat(result.get(0).getCount().getTargetCount()).isEqualTo(5),
                 () -> assertThat(result.get(0).getCars()).hasSize(2),
                 () -> assertThat(result.get(0).getCars().get(0).getCarName()).isEqualTo("ㅁㄴㅇㄹ"),
@@ -94,7 +94,7 @@ class RacingGameMapperTest {
                 () -> assertThat(result.get(0).getCars().get(1).getCarName()).isEqualTo("asdf"),
                 () -> assertThat(result.get(0).getCars().get(1).getPosition()).isEqualTo(4),
                 () -> assertThat(result.get(0).getCars().get(1).getCarId().getValue()).isEqualTo(2),
-                () -> assertThat(result.get(1).getGameId()).isEqualTo(2),
+                () -> assertThat(result.get(1).getGameId().getValue()).isEqualTo(2),
                 () -> assertThat(result.get(1).getCount().getTargetCount()).isEqualTo(5),
                 () -> assertThat(result.get(1).getCars()).hasSize(2),
                 () -> assertThat(result.get(1).getCars().get(0).getCarName()).isEqualTo("ㅁㄴㅇㄹ"),

diff --git a/domain/src/main/java/racingcar/domain/GameId.java b/domain/src/main/java/racingcar/domain/GameId.java
@@ -0,0 +1,14 @@
+package racingcar.domain;
+
+public class GameId {
+
+    private final Integer value;
+
+    public GameId(final Integer value) {
+        this.value = value;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}
diff --git a/domain/src/main/java/racingcar/domain/RacingGame.java b/domain/src/main/java/racingcar/domain/RacingGame.java
@@ -6,15 +6,15 @@ public class RacingGame {
 
     private final Cars cars;
     private final Count count;
-    private Integer gameId;
+    private GameId gameId;
 
     public RacingGame(final List<String> carsName, final int count) {
         cars = Cars.from(carsName);
         this.count = new Count(count);
     }
 
     public RacingGame(final Integer gameId, final List<Car> cars, final int count) {
-        this.gameId = gameId;
+        this.gameId = new GameId(gameId);
         this.cars = new Cars(cars);
         this.count = new Count(count);
     }
@@ -35,7 +35,7 @@ public List<Car> getCars() {
         return cars.getCars();
     }
 
-    public Integer getGameId() {
+    public GameId getGameId() {
         return gameId;
     }
 }