fix: AttributeConverter 분리

snack-game · Aug 23, 2024 · 48425dc · 48425dc
1 parent fbd1563
commit 48425dc
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 54 deletions.
diff --git a/src/main/java/com/snackgame/server/applegame/domain/game/AppleGame.java b/src/main/java/com/snackgame/server/applegame/domain/game/AppleGame.java
@@ -6,6 +6,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
+import javax.persistence.Convert;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -37,46 +38,47 @@ public class AppleGame extends BaseEntity {
     private Long sessionId;
     private Long ownerId;
     @Lob
-    private Board board;
+    @Convert(converter = AppleGameBoardConverter.class)
+    private AppleGameBoard appleGameBoard;
     private int score = 0;
     private LocalDateTime finishedAt;
 
-    public AppleGame(Board board, Long ownerId) {
-        this.board = board;
+    public AppleGame(AppleGameBoard appleGameBoard, Long ownerId) {
+        this.appleGameBoard = appleGameBoard;
         this.ownerId = ownerId;
         this.finishedAt = willFinishAt();
     }
 
-    public AppleGame(Board board, Long ownerId, LocalDateTime finishedAt) {
-        this.board = board;
+    public AppleGame(AppleGameBoard appleGameBoard, Long ownerId, LocalDateTime finishedAt) {
+        this.appleGameBoard = appleGameBoard;
         this.ownerId = ownerId;
         this.finishedAt = finishedAt;
     }
 
-    public AppleGame(Board board, Long ownerId, LocalDateTime finishedAt, int score) {
-        this.board = board;
+    public AppleGame(AppleGameBoard appleGameBoard, Long ownerId, LocalDateTime finishedAt, int score) {
+        this.appleGameBoard = appleGameBoard;
         this.ownerId = ownerId;
         this.finishedAt = finishedAt;
         this.score = score;
     }
 
     public static AppleGame ofRandomized(Long ownerId) {
-        return new AppleGame(new Board(DEFAULT_HEIGHT, DEFAULT_WIDTH), ownerId);
+        return new AppleGame(new AppleGameBoard(DEFAULT_HEIGHT, DEFAULT_WIDTH), ownerId);
     }
 
     public void restart() {
         validateOngoing();
-        this.board = board.reset();
+        this.appleGameBoard = appleGameBoard.reset();
         this.score = 0;
         this.createdAt = now();
         this.finishedAt = willFinishAt();
     }
 
     public void removeApplesIn(Range range) {
         validateOngoing();
-        List<Apple> removed = board.removeApplesIn(range);
+        List<Apple> removed = appleGameBoard.removeApplesIn(range);
         if (removed.stream().anyMatch(Apple::isGolden)) {
-            board = board.reset();
+            appleGameBoard = appleGameBoard.reset();
         }
         score += removed.size();
     }
@@ -102,7 +104,7 @@ private LocalDateTime willFinishAt() {
     }
 
     public List<List<Apple>> getApples() {
-        return board.getApples();
+        return appleGameBoard.getApples();
     }
 
     public void increase(int amount) {

diff --git a/...e/server/applegame/domain/game/Board.java → ...applegame/domain/game/AppleGameBoard.java b/...e/server/applegame/domain/game/Board.java → ...applegame/domain/game/AppleGameBoard.java
@@ -16,20 +16,20 @@
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Board {
+public class AppleGameBoard {
 
     private static final int REMOVABLE_SUM = 10;
 
     private List<List<Apple>> apples;
 
-    public Board(List<List<Apple>> apples) {
+    public AppleGameBoard(List<List<Apple>> apples) {
         validateSquared(apples);
         this.apples = apples.stream()
                 .map(ArrayList::new)
                 .collect(Collectors.toList());
     }
 
-    public Board(int height, int width) {
+    public AppleGameBoard(int height, int width) {
         this(ApplesFactory.createRandomized(height, width));
     }
 
@@ -39,8 +39,8 @@ private void validateSquared(List<List<Apple>> apples) {
         }
     }
 
-    public Board reset() {
-        return new Board(this.getHeight(), this.getWidth());
+    public AppleGameBoard reset() {
+        return new AppleGameBoard(this.getHeight(), this.getWidth());
     }
 
     protected List<Apple> removeApplesIn(Range range) {

diff --git a/...applegame/domain/game/BoardConverter.java → .../domain/game/AppleGameBoardConverter.java b/...applegame/domain/game/BoardConverter.java → .../domain/game/AppleGameBoardConverter.java
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Converter(autoApply = true)
-public class BoardConverter implements AttributeConverter<Board, String> {
+public class AppleGameBoardConverter implements AttributeConverter<AppleGameBoard, String> {
 
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
@@ -19,18 +19,18 @@ public class BoardConverter implements AttributeConverter<Board, String> {
     }
 
     @Override
-    public String convertToDatabaseColumn(Board board) {
+    public String convertToDatabaseColumn(AppleGameBoard appleGameBoard) {
         try {
-            return OBJECT_MAPPER.writeValueAsString(board);
+            return OBJECT_MAPPER.writeValueAsString(appleGameBoard);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
     }
 
     @Override
-    public Board convertToEntityAttribute(String dbJson) {
+    public AppleGameBoard convertToEntityAttribute(String dbJson) {
         try {
-            return OBJECT_MAPPER.readValue(dbJson, Board.class);
+            return OBJECT_MAPPER.readValue(dbJson, AppleGameBoard.class);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }

diff --git a/src/main/java/com/snackgame/server/applegame/service/AppleGameService.java b/src/main/java/com/snackgame/server/applegame/service/AppleGameService.java
@@ -10,8 +10,8 @@
 import com.snackgame.server.applegame.controller.dto.GameResultResponse;
 import com.snackgame.server.applegame.controller.dto.RangeRequest;
 import com.snackgame.server.applegame.domain.game.AppleGame;
+import com.snackgame.server.applegame.domain.game.AppleGameBoard;
 import com.snackgame.server.applegame.domain.game.AppleGames;
-import com.snackgame.server.applegame.domain.game.Board;
 import com.snackgame.server.game.metadata.Metadata;
 import com.snackgame.server.game.session.event.SessionEndEvent;
 
@@ -32,11 +32,11 @@ public AppleGame startGameFor(Long memberId) {
 
     public Optional<AppleGame> placeMoves(Long memberId, Long sessionId, List<RangeRequest> rangeRequests) {
         AppleGame game = appleGames.getBy(memberId, sessionId);
-        Board previous = game.getBoard();
+        AppleGameBoard previous = game.getAppleGameBoard();
 
         rangeRequests.forEach(request -> game.removeApplesIn(request.toRange()));
 
-        if (!game.getBoard().equals(previous)) {
+        if (!game.getAppleGameBoard().equals(previous)) {
             return Optional.of(game);
         }
         return Optional.empty();

diff --git a/src/main/java/com/snackgame/server/game/snackgame/controller/SnackgameController.kt b/src/main/java/com/snackgame/server/game/snackgame/controller/SnackgameController.kt
@@ -62,7 +62,7 @@ class SnackgameController(
     fun placeMoves(
         @Authenticated member: Member,
         @PathVariable sessionId: Long,
-        @RequestBody @Valid requests: List<StreakRequest>
+        @RequestBody requests: List<StreakRequest>
     ): ResponseEntity<SnackgameResponse> = snackgameService.placeMoves(member.id, sessionId, requests)
         .map { game ->
             ResponseEntity

diff --git a/src/main/java/com/snackgame/server/game/snackgame/domain/Board.kt b/src/main/java/com/snackgame/server/game/snackgame/domain/Board.kt
@@ -7,6 +7,7 @@ import com.snackgame.server.game.snackgame.snack.EmptySnack
 import com.snackgame.server.game.snackgame.snack.Snack
 import java.util.stream.Collectors
 
+
 class Board() {
     private var snacks: MutableList<MutableList<Snack>> = arrayListOf()
 

diff --git a/src/main/java/com/snackgame/server/game/snackgame/domain/BoardConverter.kt b/src/main/java/com/snackgame/server/game/snackgame/domain/BoardConverter.kt
@@ -5,9 +5,8 @@ import com.fasterxml.jackson.annotation.PropertyAccessor
 import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.ObjectMapper
 import javax.persistence.AttributeConverter
-import javax.persistence.Converter
 
-@Converter(autoApply = true)
+
 class BoardConverter : AttributeConverter<Board, String> {
 
     override fun convertToDatabaseColumn(board: Board): String {

diff --git a/src/main/java/com/snackgame/server/game/snackgame/domain/Snackgame.kt b/src/main/java/com/snackgame/server/game/snackgame/domain/Snackgame.kt
@@ -5,13 +5,15 @@ import com.snackgame.server.game.metadata.Metadata.SNACK_GAME
 import com.snackgame.server.game.session.domain.Session
 import com.snackgame.server.game.snackgame.snack.Snack
 import java.time.Duration
+import javax.persistence.Convert
 import javax.persistence.Entity
 import javax.persistence.Lob
 
 @Entity
 class Snackgame(
     ownerId: Long,
     @Lob
+    @Convert(converter = BoardConverter::class)
     val board: Board,
     timeLimit: Duration = SESSION_TIME + SPARE_TIME,
     score: Int = 0

diff --git a/src/main/java/com/snackgame/server/game/snackgame/service/dto/SnackgameResponse.kt b/src/main/java/com/snackgame/server/game/snackgame/service/dto/SnackgameResponse.kt
@@ -4,8 +4,9 @@ import com.snackgame.server.game.session.domain.Session
 import com.snackgame.server.game.session.service.dto.SessionResponse
 import com.snackgame.server.game.snackgame.domain.Snackgame
 
-class SnackgameResponse(
-    session: Session,
+
+data class SnackgameResponse(
+    val session: Session,
     val board: List<List<SnackResponse>>
 ) : SessionResponse(session) {
 

diff --git a/...egame/domain/game/BoardConverterTest.java → ...ain/game/AppleGameBoardConverterTest.java b/...egame/domain/game/BoardConverterTest.java → ...ain/game/AppleGameBoardConverterTest.java
@@ -10,31 +10,31 @@
 
 @SuppressWarnings("NonAsciiCharacters")
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-class BoardConverterTest {
+class AppleGameBoardConverterTest {
 
-    private final BoardConverter converter = new BoardConverter();
+    private final AppleGameBoardConverter converter = new AppleGameBoardConverter();
 
     @Test
     void 게임판을_JSON으로_변환한다() {
-        Board board = TestFixture.TWO_BY_FOUR();
+        AppleGameBoard appleGameBoard = TestFixture.TWO_BY_FOUR();
 
-        String serialized = converter.convertToDatabaseColumn(board);
+        String serialized = converter.convertToDatabaseColumn(appleGameBoard);
 
         assertThat(serialized).isEqualTo(TestFixture.TWO_BY_FOUR_AS_JSON);
     }
 
     @Test
     void 황금사과를_포함한_게임판을_JSON으로_변환한다() {
-        Board board = TestFixture.TWO_BY_TWO_WITH_GOLDEN_APPLE();
+        AppleGameBoard appleGameBoard = TestFixture.TWO_BY_TWO_WITH_GOLDEN_APPLE();
 
-        String serialized = converter.convertToDatabaseColumn(board);
+        String serialized = converter.convertToDatabaseColumn(appleGameBoard);
 
         assertThat(serialized).isEqualTo(TestFixture.TWO_BY_TWO_WITH_GOLDEN_APPLE_AS_JSON);
     }
 
     @Test
     void JSON_게임판을_사과객체들로_변환한다() {
-        Board expected = TestFixture.TWO_BY_FOUR();
+        AppleGameBoard expected = TestFixture.TWO_BY_FOUR();
 
         var deserialized = converter.convertToEntityAttribute(TestFixture.TWO_BY_FOUR_AS_JSON);
 
@@ -45,7 +45,7 @@ class BoardConverterTest {
 
     @Test
     void 황금사과를_포함한_게임판을_역직렬화한다() {
-        Board expected = TestFixture.TWO_BY_TWO_WITH_GOLDEN_APPLE();
+        AppleGameBoard expected = TestFixture.TWO_BY_TWO_WITH_GOLDEN_APPLE();
 
         var deserialized = converter.convertToEntityAttribute(TestFixture.TWO_BY_TWO_WITH_GOLDEN_APPLE_AS_JSON);
 

diff --git a/...rver/applegame/domain/game/BoardTest.java → ...egame/domain/game/AppleGameBoardTest.java b/...rver/applegame/domain/game/BoardTest.java → ...egame/domain/game/AppleGameBoardTest.java
@@ -20,14 +20,14 @@
 
 @SuppressWarnings("NonAsciiCharacters")
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-class BoardTest {
+class AppleGameBoardTest {
 
     @Test
     void 게임판_높이는_1이상이어야_한다() {
         int height = 0;
         int width = 8;
 
-        assertThatThrownBy(() -> new Board(height, width))
+        assertThatThrownBy(() -> new AppleGameBoard(height, width))
                 .isInstanceOf(InvalidBoardSizeException.class)
                 .hasMessage("잘못된 크기의 게임판입니다");
     }
@@ -37,7 +37,7 @@ class BoardTest {
         int height = 1;
         int width = 0;
 
-        assertThatThrownBy(() -> new Board(height, width))
+        assertThatThrownBy(() -> new AppleGameBoard(height, width))
                 .isInstanceOf(InvalidBoardSizeException.class)
                 .hasMessage("잘못된 크기의 게임판입니다");
     }
@@ -47,7 +47,7 @@ class BoardTest {
         int height = 4;
         int width = 8;
 
-        var board = new Board(height, width);
+        var board = new AppleGameBoard(height, width);
 
         assertThat(board.getApples()).hasSize(height);
         assertThat(board.getApples()).allSatisfy(
@@ -59,7 +59,7 @@ class BoardTest {
     void 게임판을_초기화해도_같은_크기를_가진다() {
         int height = 4;
         int width = 8;
-        var board = new Board(height, width);
+        var board = new AppleGameBoard(height, width);
 
         var reset = board.reset();
 
@@ -73,7 +73,7 @@ class BoardTest {
     void 게임판을_초기화하면_사과들이_바뀐다() {
         int height = 4;
         int width = 8;
-        var board = new Board(height, width);
+        var board = new AppleGameBoard(height, width);
 
         var reset = board.reset();
 
@@ -132,7 +132,7 @@ class BoardTest {
 
     @Test
     void 하나를_황금사과로_만든다() {
-        var board = new Board(10, 8);
+        var board = new AppleGameBoard(10, 8);
 
         long goldenAppleCount = board.getApples().stream()
                 .flatMap(Collection::stream)

diff --git a/src/test/java/com/snackgame/server/applegame/domain/game/AppleGameTest.java b/src/test/java/com/snackgame/server/applegame/domain/game/AppleGameTest.java
@@ -47,12 +47,12 @@ class AppleGameTest {
                 new Coordinate(1, 3)
         );
         game.removeApplesIn(range);
-        var previousBoard = game.getBoard();
+        var previousBoard = game.getAppleGameBoard();
         var previousCreatedAt = game.getCreatedAt();
 
         game.restart();
 
-        assertThat(game.getBoard()).isNotEqualTo(previousBoard);
+        assertThat(game.getAppleGameBoard()).isNotEqualTo(previousBoard);
         assertThat(game.getScore()).isZero();
         assertThat(game.getCreatedAt()).isAfter(previousCreatedAt);
     }

diff --git a/src/test/java/com/snackgame/server/applegame/fixture/TestFixture.java b/src/test/java/com/snackgame/server/applegame/fixture/TestFixture.java
@@ -4,7 +4,7 @@
 
 import com.snackgame.server.applegame.domain.apple.EmptyApple;
 import com.snackgame.server.applegame.domain.apple.PlainApple;
-import com.snackgame.server.applegame.domain.game.Board;
+import com.snackgame.server.applegame.domain.game.AppleGameBoard;
 
 public class TestFixture {
 
@@ -15,8 +15,8 @@ public class TestFixture {
      * <p>[1, 1, _, 5]</p>
      * <p>[9, 2, _, 2]</p>
      */
-    public static Board TWO_BY_FOUR() {
-        return new Board(List.of(
+    public static AppleGameBoard TWO_BY_FOUR() {
+        return new AppleGameBoard(List.of(
                 List.of(PlainApple.of(1), PlainApple.of(1), EmptyApple.get(), PlainApple.of(5)),
                 List.of(PlainApple.of(9), PlainApple.of(2), EmptyApple.get(), PlainApple.of(2))
         ));
@@ -27,8 +27,8 @@ public static Board TWO_BY_FOUR() {
      * <p>[<b>9</b>, 2]</p>
      * 9는 황금사과이다.
      */
-    public static Board TWO_BY_TWO_WITH_GOLDEN_APPLE() {
-        return new Board(List.of(
+    public static AppleGameBoard TWO_BY_TWO_WITH_GOLDEN_APPLE() {
+        return new AppleGameBoard(List.of(
                 List.of(PlainApple.of(1), PlainApple.of(8)),
                 List.of(PlainApple.of(9).golden(), PlainApple.of(2))
         ));

diff --git a/src/test/java/com/snackgame/server/applegame/service/AppleGameServiceTest.java b/src/test/java/com/snackgame/server/applegame/service/AppleGameServiceTest.java
@@ -101,9 +101,9 @@ void setUp() {
 
         AppleGame current = appleGames.getBy(땡칠().getId(), previous.getSessionId());
         assertThat(current.getCreatedAt()).isAfter(previous.getCreatedAt());
-        assertThat(current.getBoard())
+        assertThat(current.getAppleGameBoard())
                 .usingRecursiveComparison()
-                .isNotEqualTo(previous.getBoard());
+                .isNotEqualTo(previous.getAppleGameBoard());
     }
 
     @Test