[step2] refactor: 인접 지뢰 생성시 Move 클래스 사용 안함

next-step · Dec 31, 2023 · e352119 · e352119
1 parent 010aa66
commit e352119
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 38 deletions.
diff --git a/src/main/kotlin/minesweeper/domain/board/MineBoardBuilder.kt b/src/main/kotlin/minesweeper/domain/board/MineBoardBuilder.kt
@@ -1,9 +1,11 @@
 package minesweeper.domain.board
 
 import minesweeper.domain.cell.Cell
+import minesweeper.domain.cell.cells
 import minesweeper.domain.position.Position
 import minesweeper.domain.position.PositionPicker
 import minesweeper.domain.position.Positions
+import minesweeper.domain.position.positions
 
 fun mineBoard(
     minePicker: PositionPicker,
@@ -26,16 +28,16 @@ class MineBoardBuilder(
         mineCount = count
     }
 
-    fun build(): MineBoard = MineBoard(cells())
+    fun build(): MineBoard = MineBoard(createCells())
 
-    private fun cells(): Map<Position, Cell> =
-        minesweeper.domain.cell.cells {
-            positions(positions())
+    private fun createCells(): Map<Position, Cell> =
+        cells {
+            positions(createPositions())
         }
 
-    private fun positions(): Positions =
-        minesweeper.domain.position.positions(minePicker) {
-            allPositions(size.allPositionsOfRowAndColumns)
+    private fun createPositions(): Positions =
+        positions(minePicker) {
+            allPositions(size.allPositions)
             mineTotal(mineCount)
         }
 }
diff --git a/src/main/kotlin/minesweeper/domain/board/MineBoardSize.kt b/src/main/kotlin/minesweeper/domain/board/MineBoardSize.kt
@@ -6,7 +6,7 @@ data class MineBoardSize(
     val height: Height,
     val width: Width,
 ) {
-    val allPositionsOfRowAndColumns: Set<Position> by lazy {
+    val allPositions: Set<Position> by lazy {
         createAllPositions(height, width)
     }
 

diff --git a/src/main/kotlin/minesweeper/domain/cell/Move.kt b/src/main/kotlin/minesweeper/domain/cell/Move.kt
diff --git a/src/main/kotlin/minesweeper/domain/game/MinesweeperGame.kt b/src/main/kotlin/minesweeper/domain/game/MinesweeperGame.kt
@@ -32,9 +32,12 @@ data class MinesweeperGame(
         val cell = board.open(position)
 
         if (cell.isZeroMineCount()) {
-            position.adjacentPositions.forEach { adjacentPosition ->
-                if (board.isValidPosition(adjacentPosition)) doOpen(adjacentPosition)
-            }
+            openAdjacentPositions(cell.position)
         }
     }
+
+    private fun openAdjacentPositions(position: Position) {
+        val adjacentPositions = position.adjacentPositions.filter { board.isValidPosition(it) }
+        adjacentPositions.forEach { doOpen(it) }
+    }
 }
diff --git a/src/main/kotlin/minesweeper/domain/position/Position.kt b/src/main/kotlin/minesweeper/domain/position/Position.kt
@@ -1,7 +1,5 @@
 package minesweeper.domain.position
 
-import minesweeper.domain.cell.Move
-
 data class Position(
     val row: Int,
     val column: Int,
@@ -12,27 +10,22 @@ data class Position(
     }
 
     val adjacentPositions: Set<Position>
-        get() = movesToAdjacentPositions.mapNotNull { this.moveOrNull(it) }.toSet()
-
-    private fun moveOrNull(move: Move): Position? {
-        val row = this.row - move.row
-        val column = this.column - move.column
-        if (row < MIN_ROW || column < MIN_COLUMN) return null
-        return Position(row, column)
-    }
+        get() = setOfNotNull(
+            createIfValid(row - 1, column - 1),
+            createIfValid(row - 1, column),
+            createIfValid(row - 1, column + 1),
+            createIfValid(row, column - 1),
+            createIfValid(row, column + 1),
+            createIfValid(row + 1, column - 1),
+            createIfValid(row + 1, column),
+            createIfValid(row + 1, column + 1),
+        )
 
     companion object {
         private const val MIN_ROW = 0
         private const val MIN_COLUMN = 0
-        private val movesToAdjacentPositions = listOf(
-            Move(-1, -1),
-            Move(-1, 0),
-            Move(-1, 1),
-            Move(0, -1),
-            Move(0, 1),
-            Move(1, -1),
-            Move(1, 0),
-            Move(1, 1),
-        )
+
+        private fun createIfValid(row: Int, column: Int): Position? =
+            takeIf { row >= MIN_ROW && column >= MIN_COLUMN }?.let { Position(row, column) }
     }
 }
diff --git a/src/main/kotlin/minesweeper/domain/position/Positions.kt b/src/main/kotlin/minesweeper/domain/position/Positions.kt
@@ -9,6 +9,7 @@ data class Positions(
     val mineCountByPosition: Map<Position, Int> by lazy {
         val adjacentMineCountByPosition = minePositions
             .flatMap { it.adjacentPositions }
+            .filter { it in value }
             .groupBy { it }
             .mapValues { it.value.size }
 

diff --git a/src/test/kotlin/domain/board/MineBoardSizeTest.kt b/src/test/kotlin/domain/board/MineBoardSizeTest.kt
@@ -13,7 +13,7 @@ class MineBoardSizeTest : DescribeSpec({
             val size = MineBoardSize(Height(3), Width(2))
 
             it("행(0..2)과 열(0..1)에 대한 Position 생성") {
-                val positions = size.allPositionsOfRowAndColumns
+                val positions = size.allPositions
 
                 val expect = setOf(
                     Position(0, 0), Position(0, 1),