From 722879a90db140b86b9ece6318b063f3e284539f Mon Sep 17 00:00:00 2001
From: Celina <luv.mins99@gmail.com>
Date: Thu, 23 Nov 2023 23:42:13 +0900
Subject: [PATCH 1/3] =?UTF-8?q?docs:=20step1=20=EA=B5=AC=ED=98=84=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c354962f..c7b515b12 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,52 @@
-# kotlin-minesweeper
\ No newline at end of file
+# kotlin-minesweeper
+
+## 🚀 1단계 - 지뢰 찾기(그리기)
+### 기능 요구사항 
+지뢰 찾기를 변형한 프로그램을 구현한다.
+
+- 높이와 너비, 지뢰 개수를 입력받을 수 있다.
+- 지뢰는 눈에 잘 띄는 것으로 표기한다.
+- 지뢰는 가급적 랜덤에 가깝게 배치한다.
+
+### 실행 결과
+```
+높이를 입력하세요.
+10
+
+너비를 입력하세요.
+10
+
+지뢰는 몇 개인가요?
+10
+
+지뢰찾기 게임 시작
+C C C * C C C * C C
+C C * C * C C C C C
+C C C C C C C C C C
+C C C C C C C C C C
+* C C C C C C C C C
+C C C C C C * C C C
+C C * C C C * C C C
+C C C C C C * C C *
+C C C C C C C C C C
+C C C C C C C C C C
+```
+
+### 프로그래밍 요구 사항
+객체지향 생활 체조 원칙을 지키면서 프로그래밍한다.
+#### 객체지향 생활 체조 원칙
+1. 한 메서드에 오직 한 단계의 들여쓰기만 한다.
+2. else 예약어를 쓰지 않는다.
+3. 모든 원시 값과 문자열을 포장한다.
+4. 한 줄에 점을 하나만 찍는다.
+5. 줄여 쓰지 않는다(축약 금지).
+6. 모든 엔티티를 작게 유지한다.
+7. 3개 이상의 인스턴스 변수를 가진 클래스를 쓰지 않는다.
+8. 일급 컬렉션을 쓴다.
+9. getter/setter/프로퍼티를 쓰지 않는다.
+
+### 구현 사항
+- [x] 높이를 입력받는다
+- [x] 너비를 입력받는다
+- [x] 지뢰 갯수를 입력받는다
+- [x] 입력 결과를 출력한다
\ No newline at end of file

From 13cf3dbd76e4ecc1cdbe79b75042f320a6f089d0 Mon Sep 17 00:00:00 2001
From: Celina <luv.mins99@gmail.com>
Date: Thu, 23 Nov 2023 23:44:16 +0900
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=EC=A7=80=EB=A2=B0=EC=B0=BE?=
 =?UTF-8?q?=EA=B8=B0=20=EA=B2=8C=EC=9E=84=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 높이, 너비, 지뢰 갯수를 입력받는다
- 지뢰찾기 판을 만들어 게임을 생성한다
- 입력 결과를 출력한다
---
 .../controller/MineSweeperController.kt       | 16 ++++++++
 .../minesweeper/model/MineSweeperGame.kt      | 40 +++++++++++++++++++
 src/main/kotlin/minesweeper/view/InputView.kt | 19 +++++++++
 .../kotlin/minesweeper/view/OutputView.kt     | 17 ++++++++
 .../minesweeper/model/MineSweeperGameTest.kt  | 22 ++++++++++
 5 files changed, 114 insertions(+)
 create mode 100644 src/main/kotlin/minesweeper/controller/MineSweeperController.kt
 create mode 100644 src/main/kotlin/minesweeper/model/MineSweeperGame.kt
 create mode 100644 src/main/kotlin/minesweeper/view/InputView.kt
 create mode 100644 src/main/kotlin/minesweeper/view/OutputView.kt
 create mode 100644 src/test/kotlin/minesweeper/model/MineSweeperGameTest.kt

diff --git a/src/main/kotlin/minesweeper/controller/MineSweeperController.kt b/src/main/kotlin/minesweeper/controller/MineSweeperController.kt
new file mode 100644
index 000000000..523190ed3
--- /dev/null
+++ b/src/main/kotlin/minesweeper/controller/MineSweeperController.kt
@@ -0,0 +1,16 @@
+package minesweeper.controller
+
+import minesweeper.model.MineSweeperGame
+import minesweeper.view.InputView
+import minesweeper.view.OutputView
+
+class MineSweeperController {
+    fun start() {
+        val game = MineSweeperGame(InputView.inputHeight(), InputView.inputWidth(), InputView.inputCountOfMine())
+        OutputView.printMap(game.minefield)
+    }
+}
+
+fun main() {
+    MineSweeperController().start()
+}
diff --git a/src/main/kotlin/minesweeper/model/MineSweeperGame.kt b/src/main/kotlin/minesweeper/model/MineSweeperGame.kt
new file mode 100644
index 000000000..1948acc49
--- /dev/null
+++ b/src/main/kotlin/minesweeper/model/MineSweeperGame.kt
@@ -0,0 +1,40 @@
+package minesweeper.model
+
+import kotlin.random.Random
+
+class MineSweeperGame(
+    private val rows: Int,
+    private val cols: Int,
+    private val mines: Int
+) {
+    val minefield = Array(rows) { Array(cols) { "C" } }
+
+    init {
+        plantingMines()
+    }
+
+    private fun plantingMines() {
+        var mineCount = 0
+
+        while (mineCount < mines) {
+            val row = Random.nextInt(rows)
+            val col = Random.nextInt(cols)
+
+            mineCount = plantingResult(row, col, mineCount)
+        }
+    }
+
+    private fun plantingResult(row: Int, col: Int, mineCount: Int): Int {
+        if (isIsland(row, col)) {
+            plantingMine(row, col)
+            return mineCount + 1
+        }
+        return mineCount
+    }
+
+    private fun isIsland(row: Int, col: Int) = minefield[row][col] == "C"
+
+    private fun plantingMine(row: Int, col: Int) {
+        minefield[row][col] = "*"
+    }
+}
diff --git a/src/main/kotlin/minesweeper/view/InputView.kt b/src/main/kotlin/minesweeper/view/InputView.kt
new file mode 100644
index 000000000..23942cc60
--- /dev/null
+++ b/src/main/kotlin/minesweeper/view/InputView.kt
@@ -0,0 +1,19 @@
+package minesweeper.view
+
+object InputView {
+
+    fun inputHeight(): Int {
+        println("높이를 입력하세요.")
+        return readln().toInt()
+    }
+
+    fun inputWidth(): Int {
+        println("\n너비를 입력하세요.")
+        return readln().toInt()
+    }
+
+    fun inputCountOfMine(): Int {
+        println("\n지뢰는 몇 개 인가요?")
+        return readln().toInt()
+    }
+}
diff --git a/src/main/kotlin/minesweeper/view/OutputView.kt b/src/main/kotlin/minesweeper/view/OutputView.kt
new file mode 100644
index 000000000..873ee5dd7
--- /dev/null
+++ b/src/main/kotlin/minesweeper/view/OutputView.kt
@@ -0,0 +1,17 @@
+package minesweeper.view
+
+object OutputView {
+    fun printMap(mineMap: Array<Array<String>>) {
+        println("\n지뢰찾기 게임 시작")
+        for (row in mineMap) {
+            printCols(row)
+        }
+    }
+
+    private fun printCols(row: Array<String>) {
+        for (it in row) {
+            print("$it ")
+        }
+        println()
+    }
+}
diff --git a/src/test/kotlin/minesweeper/model/MineSweeperGameTest.kt b/src/test/kotlin/minesweeper/model/MineSweeperGameTest.kt
new file mode 100644
index 000000000..68c7ec716
--- /dev/null
+++ b/src/test/kotlin/minesweeper/model/MineSweeperGameTest.kt
@@ -0,0 +1,22 @@
+package minesweeper.model
+
+import io.kotest.matchers.types.shouldBeInstanceOf
+import io.kotest.matchers.types.shouldBeSameInstanceAs
+import org.junit.jupiter.api.Test
+
+class MineSweeperGameTest {
+    @Test
+    fun `지뢰찾기 게임의 너비와 높이, 지뢰 갯수를 받아 게임을 생성한다`() {
+        // given
+        val cols = 10
+        val rows = 10
+        val mines = 10
+
+        // when
+        val mineSweeperGame = MineSweeperGame(cols = cols, rows = rows, mines = mines)
+
+        // then
+        mineSweeperGame.shouldBeInstanceOf<MineSweeperGame>()
+        mineSweeperGame.minefield.size shouldBeSameInstanceAs cols
+    }
+}

From d9a6972da21bbc2b9cc91b0dce8c2b6f6477e5bb Mon Sep 17 00:00:00 2001
From: Celina <luv.mins99@gmail.com>
Date: Fri, 24 Nov 2023 01:22:41 +0900
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EC=A7=80=EB=A2=B0=EC=B0=BE?=
 =?UTF-8?q?=EA=B8=B0=20=EA=B2=8C=EC=9E=84=20=EB=A6=AC=ED=8C=A9=ED=86=A0?=
 =?UTF-8?q?=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 객체지향 생활 체조 원칙을 지킨다
- 확장성을 고려하여 개발한다
---
 build.gradle.kts                              |  2 +-
 .../controller/MineSweeperController.kt       |  2 +-
 .../minesweeper/model/MineSweeperGame.kt      | 38 +++++------------
 .../kotlin/minesweeper/model/board/Cols.kt    | 11 +++++
 .../minesweeper/model/board/Minefield.kt      | 42 +++++++++++++++++++
 .../kotlin/minesweeper/model/board/Rows.kt    | 11 +++++
 .../kotlin/minesweeper/model/cell/Island.kt   |  3 ++
 .../kotlin/minesweeper/model/cell/Mine.kt     |  3 ++
 .../kotlin/minesweeper/model/cell/Opening.kt  |  5 +++
 .../kotlin/minesweeper/view/OutputView.kt     | 10 +++--
 .../minesweeper/model/MineSweeperGameTest.kt  |  6 +--
 .../minesweeper/model/board/ColsTest.kt       | 18 ++++++++
 .../minesweeper/model/board/MinefieldTest.kt  | 27 ++++++++++++
 .../minesweeper/model/board/RowsTest.kt       | 18 ++++++++
 14 files changed, 159 insertions(+), 37 deletions(-)
 create mode 100644 src/main/kotlin/minesweeper/model/board/Cols.kt
 create mode 100644 src/main/kotlin/minesweeper/model/board/Minefield.kt
 create mode 100644 src/main/kotlin/minesweeper/model/board/Rows.kt
 create mode 100644 src/main/kotlin/minesweeper/model/cell/Island.kt
 create mode 100644 src/main/kotlin/minesweeper/model/cell/Mine.kt
 create mode 100644 src/main/kotlin/minesweeper/model/cell/Opening.kt
 create mode 100644 src/test/kotlin/minesweeper/model/board/ColsTest.kt
 create mode 100644 src/test/kotlin/minesweeper/model/board/MinefieldTest.kt
 create mode 100644 src/test/kotlin/minesweeper/model/board/RowsTest.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index e78e72956..4a0fdf936 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ repositories {
 dependencies {
     testImplementation("org.junit.jupiter", "junit-jupiter", "5.8.2")
     testImplementation("org.assertj", "assertj-core", "3.22.0")
-    testImplementation("io.kotest", "kotest-runner-junit5", "5.2.3")
+    testImplementation("io.kotest", "kotest-runner-junit5", "5.5.3")
 }
 
 tasks {
diff --git a/src/main/kotlin/minesweeper/controller/MineSweeperController.kt b/src/main/kotlin/minesweeper/controller/MineSweeperController.kt
index 523190ed3..2c94cafe7 100644
--- a/src/main/kotlin/minesweeper/controller/MineSweeperController.kt
+++ b/src/main/kotlin/minesweeper/controller/MineSweeperController.kt
@@ -7,7 +7,7 @@ import minesweeper.view.OutputView
 class MineSweeperController {
     fun start() {
         val game = MineSweeperGame(InputView.inputHeight(), InputView.inputWidth(), InputView.inputCountOfMine())
-        OutputView.printMap(game.minefield)
+        OutputView.printMap(game.minefield())
     }
 }
 
diff --git a/src/main/kotlin/minesweeper/model/MineSweeperGame.kt b/src/main/kotlin/minesweeper/model/MineSweeperGame.kt
index 1948acc49..b5b9d44ad 100644
--- a/src/main/kotlin/minesweeper/model/MineSweeperGame.kt
+++ b/src/main/kotlin/minesweeper/model/MineSweeperGame.kt
@@ -1,40 +1,22 @@
 package minesweeper.model
 
-import kotlin.random.Random
+import minesweeper.model.board.Minefield
+import minesweeper.model.cell.Opening
 
 class MineSweeperGame(
-    private val rows: Int,
-    private val cols: Int,
-    private val mines: Int
+    private val countOfMine: Int,
+    private val minefield: Minefield
 ) {
-    val minefield = Array(rows) { Array(cols) { "C" } }
+    constructor(rows: Int, cols: Int, countOfMine: Int) : this(
+        countOfMine = countOfMine,
+        minefield = Minefield(rows, cols)
+    )
 
     init {
         plantingMines()
     }
 
-    private fun plantingMines() {
-        var mineCount = 0
+    fun minefield(): Array<Array<Opening>> = minefield.minefield
 
-        while (mineCount < mines) {
-            val row = Random.nextInt(rows)
-            val col = Random.nextInt(cols)
-
-            mineCount = plantingResult(row, col, mineCount)
-        }
-    }
-
-    private fun plantingResult(row: Int, col: Int, mineCount: Int): Int {
-        if (isIsland(row, col)) {
-            plantingMine(row, col)
-            return mineCount + 1
-        }
-        return mineCount
-    }
-
-    private fun isIsland(row: Int, col: Int) = minefield[row][col] == "C"
-
-    private fun plantingMine(row: Int, col: Int) {
-        minefield[row][col] = "*"
-    }
+    private fun plantingMines() = minefield.plantingMine(countOfMine)
 }
diff --git a/src/main/kotlin/minesweeper/model/board/Cols.kt b/src/main/kotlin/minesweeper/model/board/Cols.kt
new file mode 100644
index 000000000..abd59e294
--- /dev/null
+++ b/src/main/kotlin/minesweeper/model/board/Cols.kt
@@ -0,0 +1,11 @@
+package minesweeper.model.board
+
+import kotlin.random.Random
+
+data class Cols(val value: Int) {
+    init {
+        require(value > 0) { "입력 값은 양수여야 합니다." }
+    }
+
+    fun getPosition() = Random.nextInt(value)
+}
diff --git a/src/main/kotlin/minesweeper/model/board/Minefield.kt b/src/main/kotlin/minesweeper/model/board/Minefield.kt
new file mode 100644
index 000000000..db4dfad7d
--- /dev/null
+++ b/src/main/kotlin/minesweeper/model/board/Minefield.kt
@@ -0,0 +1,42 @@
+package minesweeper.model.board
+
+import minesweeper.model.cell.Island
+import minesweeper.model.cell.Mine
+import minesweeper.model.cell.Opening
+
+class Minefield(
+    private val rows: Rows,
+    private val cols: Cols,
+    val minefield: Array<Array<Opening>>
+) {
+    constructor(rows: Int, cols: Int) : this(
+        rows = Rows(rows),
+        cols = Cols(cols),
+        minefield = Array(rows) { Array(cols) { Island() } }
+    )
+
+    constructor(rows: Int, cols: Int, minefield: Array<Array<Opening>>) : this(
+        rows = Rows(rows),
+        cols = Cols(cols),
+        minefield = minefield
+    )
+
+    fun plantingMine(countOfMine: Int) {
+        var mineCount = 0
+
+        while (mineCount < countOfMine) {
+            val row = rows.getPosition()
+            val col = cols.getPosition()
+
+            mineCount = plantingResult(row, col, mineCount)
+        }
+    }
+
+    private fun plantingResult(row: Int, col: Int, mineCount: Int): Int {
+        if (minefield[row][col] is Island) {
+            minefield[row][col] = Mine()
+            return mineCount + 1
+        }
+        return mineCount
+    }
+}
diff --git a/src/main/kotlin/minesweeper/model/board/Rows.kt b/src/main/kotlin/minesweeper/model/board/Rows.kt
new file mode 100644
index 000000000..acb808b71
--- /dev/null
+++ b/src/main/kotlin/minesweeper/model/board/Rows.kt
@@ -0,0 +1,11 @@
+package minesweeper.model.board
+
+import kotlin.random.Random
+
+data class Rows(val value: Int) {
+    init {
+        require(value > 0) { "입력 값은 양수여야 합니다." }
+    }
+
+    fun getPosition() = Random.nextInt(value)
+}
diff --git a/src/main/kotlin/minesweeper/model/cell/Island.kt b/src/main/kotlin/minesweeper/model/cell/Island.kt
new file mode 100644
index 000000000..050f12d21
--- /dev/null
+++ b/src/main/kotlin/minesweeper/model/cell/Island.kt
@@ -0,0 +1,3 @@
+package minesweeper.model.cell
+
+data class Island(override val value: String = "C") : Opening
diff --git a/src/main/kotlin/minesweeper/model/cell/Mine.kt b/src/main/kotlin/minesweeper/model/cell/Mine.kt
new file mode 100644
index 000000000..c8bc86d49
--- /dev/null
+++ b/src/main/kotlin/minesweeper/model/cell/Mine.kt
@@ -0,0 +1,3 @@
+package minesweeper.model.cell
+
+data class Mine(override val value: String = "*") : Opening
diff --git a/src/main/kotlin/minesweeper/model/cell/Opening.kt b/src/main/kotlin/minesweeper/model/cell/Opening.kt
new file mode 100644
index 000000000..2d919b4ff
--- /dev/null
+++ b/src/main/kotlin/minesweeper/model/cell/Opening.kt
@@ -0,0 +1,5 @@
+package minesweeper.model.cell
+
+interface Opening {
+    val value: String
+}
diff --git a/src/main/kotlin/minesweeper/view/OutputView.kt b/src/main/kotlin/minesweeper/view/OutputView.kt
index 873ee5dd7..99aef54dd 100644
--- a/src/main/kotlin/minesweeper/view/OutputView.kt
+++ b/src/main/kotlin/minesweeper/view/OutputView.kt
@@ -1,16 +1,18 @@
 package minesweeper.view
 
+import minesweeper.model.cell.Opening
+
 object OutputView {
-    fun printMap(mineMap: Array<Array<String>>) {
+    fun printMap(minefield: Array<Array<Opening>>) {
         println("\n지뢰찾기 게임 시작")
-        for (row in mineMap) {
+        for (row in minefield) {
             printCols(row)
         }
     }
 
-    private fun printCols(row: Array<String>) {
+    private fun printCols(row: Array<Opening>) {
         for (it in row) {
-            print("$it ")
+            print("${it.value} ")
         }
         println()
     }
diff --git a/src/test/kotlin/minesweeper/model/MineSweeperGameTest.kt b/src/test/kotlin/minesweeper/model/MineSweeperGameTest.kt
index 68c7ec716..f003f1198 100644
--- a/src/test/kotlin/minesweeper/model/MineSweeperGameTest.kt
+++ b/src/test/kotlin/minesweeper/model/MineSweeperGameTest.kt
@@ -10,13 +10,13 @@ class MineSweeperGameTest {
         // given
         val cols = 10
         val rows = 10
-        val mines = 10
+        val countOfMine = 10
 
         // when
-        val mineSweeperGame = MineSweeperGame(cols = cols, rows = rows, mines = mines)
+        val mineSweeperGame = MineSweeperGame(cols = cols, rows = rows, countOfMine = countOfMine)
 
         // then
         mineSweeperGame.shouldBeInstanceOf<MineSweeperGame>()
-        mineSweeperGame.minefield.size shouldBeSameInstanceAs cols
+        mineSweeperGame.minefield().size shouldBeSameInstanceAs cols
     }
 }
diff --git a/src/test/kotlin/minesweeper/model/board/ColsTest.kt b/src/test/kotlin/minesweeper/model/board/ColsTest.kt
new file mode 100644
index 000000000..38e9966e1
--- /dev/null
+++ b/src/test/kotlin/minesweeper/model/board/ColsTest.kt
@@ -0,0 +1,18 @@
+package minesweeper.model.board
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.ints.shouldBeBetween
+
+class ColsTest : StringSpec({
+    "행의 길이 범위 내의 랜덤한 위치값을 반환받는다" {
+        // given
+        val size = 10
+        val col = Cols(size)
+
+        // when
+        val result = col.getPosition()
+
+        // then
+        result.shouldBeBetween(0, size)
+    }
+})
diff --git a/src/test/kotlin/minesweeper/model/board/MinefieldTest.kt b/src/test/kotlin/minesweeper/model/board/MinefieldTest.kt
new file mode 100644
index 000000000..af32f51a4
--- /dev/null
+++ b/src/test/kotlin/minesweeper/model/board/MinefieldTest.kt
@@ -0,0 +1,27 @@
+package minesweeper.model.board
+
+import io.kotest.matchers.shouldBe
+import minesweeper.model.cell.Island
+import minesweeper.model.cell.Mine
+import minesweeper.model.cell.Opening
+import org.junit.jupiter.api.Test
+
+class MinefieldTest {
+    @Test
+    fun `지뢰찾기 맵 생성 결과 지뢰 갯수만큼 지뢰가 심어진다`() {
+        // given
+        val openings: Array<Array<Opening>> = arrayOf(
+            arrayOf(Island(), Mine(), Island()),
+            arrayOf(Mine(), Island(), Mine()),
+            arrayOf(Mine(), Island(), Island())
+        )
+        val minefield = Minefield(3, 3, openings)
+
+        // when
+        val (islandCount, mineCount) = openings.flatten().partition { it is Island }
+
+        // then
+        islandCount.size shouldBe 5
+        mineCount.size shouldBe 4
+    }
+}
diff --git a/src/test/kotlin/minesweeper/model/board/RowsTest.kt b/src/test/kotlin/minesweeper/model/board/RowsTest.kt
new file mode 100644
index 000000000..cda161612
--- /dev/null
+++ b/src/test/kotlin/minesweeper/model/board/RowsTest.kt
@@ -0,0 +1,18 @@
+package minesweeper.model.board
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.ints.shouldBeBetween
+
+class RowsTest : StringSpec({
+    "열의 길이 범위 내의 랜덤한 위치값을 반환받는다" {
+        // given
+        val size = 10
+        val row = Rows(size)
+
+        // when
+        val result = row.getPosition()
+
+        // then
+        result.shouldBeBetween(0, size)
+    }
+})