refactor: 도메인 패키지 분리

src/main/kotlin/Board.kt → src/main/kotlin/domain/board/Board.kt

@@ -1,5 +1,9 @@
-import player.Player
-import player.Players
+package domain.board
+
+import domain.player.Player
+import domain.player.Players
+import domain.stone.Stone
+import domain.stone.StoneColor
 
 class Board(private val players: Players) {
  constructor(blackPlayer: Player, whitePlayer: Player) : this(Players(blackPlayer, whitePlayer))
@@ -14,9 +18,4 @@ class Board(private val players: Players) {
  fun getPlayers(): Players = players.copy()
 
  fun isRunning(): Boolean = players.isRunning
-
- fun getWinner(): Player = players.getWinner()
-
- // private fun makeEmptyBoard(): List<MutableList<BoardState>> =
- // List(POSITION_RANGE.max()) { MutableList(POSITION_RANGE.max()) { BoardState.EMPTY } }
 }

src/main/kotlin/domain/game/Omok.kt

@@ -0,0 +1,36 @@
+package domain.game
+
+import domain.board.Board
+import domain.player.BlackPlayer
+import domain.player.WhitePlayer
+import domain.stone.Stone
+import domain.stone.StoneColor
+import listener.OmokStartEndEventListener
+import listener.OmokTurnEventListener
+
+class Omok(
+ private val startEndEventListener: OmokStartEndEventListener,
+ private val turnEventListener: OmokTurnEventListener
+) {
+ fun run() {
+ startEndEventListener.onStartGame()
+ var curStoneColor: StoneColor = StoneColor.BLACK
+ var curBoard = Board(BlackPlayer(), WhitePlayer())
+ do {
+ curBoard = takeTurn(curBoard, curStoneColor)
+ startEndEventListener.onEndTurn(curBoard.getPlayers())
+ curStoneColor = curStoneColor.next()
+ } while (curBoard.isRunning())
+ startEndEventListener.onEndGame(curStoneColor.next())
+ }
+
+ private fun takeTurn(board: Board, stoneColor: StoneColor): Board {
+ val newStone = Stone.of(turnEventListener.onTakeTurn(stoneColor))
+ val newBoard = board.putStone(stoneColor, newStone)
+ if (newBoard == null) {
+ turnEventListener.onNotPlaceable()
+ return takeTurn(board, stoneColor)
+ }
+ return newBoard
+ }
+}

src/main/kotlin/player/BlackPlayer.kt → src/main/kotlin/domain/player/BlackPlayer.kt

@@ -1,8 +1,8 @@
-package player
+package domain.player
 
-import Stone
-import state.PlayerState
-import state.PlayingState
+import domain.state.PlayerState
+import domain.state.PlayingState
+import domain.stone.Stone
 
 class BlackPlayer(state: PlayerState = PlayingState()) : Player(state) {
  override fun putStone(stone: Stone): Player = BlackPlayer(state.add(stone))

src/main/kotlin/player/Player.kt → src/main/kotlin/domain/player/Player.kt

@@ -1,9 +1,9 @@
-package player
+package domain.player
 
-import Position
-import Stone
-import state.PlayerState
-import state.WinState
+import domain.position.Position
+import domain.state.PlayerState
+import domain.state.WinState
+import domain.stone.Stone
 
 abstract class Player(protected val state: PlayerState) : Cloneable {
  val isWin: Boolean = state is WinState

src/main/kotlin/player/Players.kt → src/main/kotlin/domain/player/Players.kt

@@ -1,7 +1,7 @@
-package player
+package domain.player
 
-import Stone
-import StoneColor
+import domain.stone.Stone
+import domain.stone.StoneColor
 
 data class Players private constructor(private val players: List<Player>) {
  val isRunning: Boolean
@@ -20,7 +20,5 @@ data class Players private constructor(private val players: List<Player>) {
 
  fun getWhitePlayer(): Player = players.first { it is WhitePlayer }
 
- fun getWinner(): Player = players.first { it.isWin }
-
  fun canPlace(stone: Stone): Boolean = players.none { it.isPlaced(stone) }
 }

src/main/kotlin/player/WhitePlayer.kt → src/main/kotlin/domain/player/WhitePlayer.kt

@@ -1,8 +1,8 @@
-package player
+package domain.player
 
-import Stone
-import state.PlayerState
-import state.PlayingState
+import domain.state.PlayerState
+import domain.state.PlayingState
+import domain.stone.Stone
 
 class WhitePlayer(state: PlayerState = PlayingState()) : Player(state) {
  override fun putStone(stone: Stone): Player = WhitePlayer(state.add(stone))

src/main/kotlin/Position.kt → src/main/kotlin/domain/position/Position.kt

@@ -1,3 +1,5 @@
+package domain.position
+
 data class Position(val row: Int, val col: Int) {
  init {
  require(row in POSITION_RANGE) { ROW_OUT_OF_RANGE_ERROR_MESSAGE }

src/main/kotlin/state/PlayerState.kt → src/main/kotlin/domain/state/PlayerState.kt

@@ -1,8 +1,8 @@
-package state
+package domain.state
 
-import Position
-import Stone
-import Stones
+import domain.position.Position
+import domain.stone.Stone
+import domain.stone.Stones
 
 abstract class PlayerState(protected val stones: Stones = Stones()) {
  abstract fun add(newStone: Stone): PlayerState

src/main/kotlin/state/PlayingState.kt → src/main/kotlin/domain/state/PlayingState.kt

@@ -1,7 +1,7 @@
-package state
+package domain.state
 
-import Stone
-import Stones
+import domain.stone.Stone
+import domain.stone.Stones
 
 class PlayingState(stones: Stones = Stones()) : PlayerState(stones) {
  override fun add(newStone: Stone): PlayerState {

src/main/kotlin/state/WinState.kt → src/main/kotlin/domain/state/WinState.kt

@@ -1,7 +1,7 @@
-package state
+package domain.state
 
-import Stone
-import Stones
+import domain.stone.Stone
+import domain.stone.Stones
 
 class WinState(stones: Stones) : PlayerState(stones) {
  override fun add(newStone: Stone): PlayerState = this

src/main/kotlin/Stone.kt → src/main/kotlin/domain/stone/Stone.kt

@@ -1,4 +1,7 @@
-import Position.Companion.POSITION_RANGE
+package domain.stone
+
+import domain.position.Position
+import domain.position.Position.Companion.POSITION_RANGE
 
 data class Stone private constructor(val position: Position) {
  companion object {

src/main/kotlin/StoneColor.kt → src/main/kotlin/domain/stone/StoneColor.kt

@@ -1,3 +1,5 @@
+package domain.stone
+
 enum class StoneColor {
  BLACK, WHITE;
 

src/main/kotlin/Stones.kt → src/main/kotlin/domain/stone/Stones.kt

@@ -1,6 +1,11 @@
+package domain.stone
+
+import domain.position.Position
+
 data class Stones(private val stones: List<Stone>) {
  val lastStone: Stone
  get() = stones.last().copy()
+
  constructor(vararg stones: Stone) : this(stones.toList())
 
  init {
@@ -31,15 +36,16 @@ data class Stones(private val stones: List<Stone>) {
  val (startX, startY) = Pair(startPosition.row, startPosition.col)
  var count = 1
  var (currentX, currentY) = Pair(startX + direction.first * weight, startY + direction.second * weight)
- while (currentX in Position.POSITION_RANGE && currentY in Position.POSITION_RANGE && hasStone(Stone.of(currentX, currentY))) {
+ while (inRange(currentX, currentY) && hasStone(Stone.of(currentX, currentY))) {
  count++
  currentX += direction.first * weight
  currentY += direction.second * weight
  }
- if (count >= MINIMUM_WIN_CONDITION) return true
- return false
+ return count >= MINIMUM_WIN_CONDITION
  }
 
+ private fun inRange(x: Int, y: Int) = x in Position.POSITION_RANGE && y in Position.POSITION_RANGE
+
  companion object {
  private const val DUPLICATED_ERROR_MESSAGE = "중복되는 위치의 오목알을 가질 수 없습니다."
  private const val MINIMUM_WIN_CONDITION = 5

src/main/kotlin/listener/OmokStartEndEventListener.kt

@@ -1,8 +1,8 @@
 package listener
 
-import domain.Position
-import domain.StoneColor
 import domain.player.Players
+import domain.position.Position
+import domain.stone.StoneColor
 
 interface OmokStartEndEventListener {
  fun onStartTurn(stoneColor: StoneColor, position: Position)

src/main/kotlin/listener/OmokTurnEventListener.kt

@@ -1,7 +1,7 @@
 package listener
 
-import domain.Position
-import domain.StoneColor
+import domain.position.Position
+import domain.stone.StoneColor
 
 interface OmokTurnEventListener {
  fun onTakeTurn(stoneColor: StoneColor): Position

src/main/kotlin/view/InputView.kt

@@ -1,9 +1,10 @@
 package view
 
-import domain.Position
-import domain.Position.Companion.POSITION_RANGE
-import domain.StoneColor
+import domain.position.Position
+import domain.position.Position.Companion.POSITION_RANGE
+import domain.stone.StoneColor
 import listener.OmokTurnEventListener
+import view.model.BoardModel
 
 class InputView : OmokTurnEventListener {
  override fun onTakeTurn(stoneColor: StoneColor): Position = askPosition()

src/main/kotlin/view/OutputView.kt

@@ -1,9 +1,11 @@
 package view
 
-import domain.Position
-import domain.StoneColor
 import domain.player.Players
+import domain.position.Position
+import domain.stone.StoneColor
 import listener.OmokStartEndEventListener
+import view.model.BoardModel
+import view.model.ColorModel
 
 class OutputView : OmokStartEndEventListener {
  override fun onStartGame() {

src/main/kotlin/view/BoardModel.kt → src/main/kotlin/view/model/BoardModel.kt

@@ -1,6 +1,6 @@
-package view
+package view.model
 
-import domain.Position
+import domain.position.Position
 
 object BoardModel {
  private const val RANGE_MIN = 'A'

src/main/kotlin/view/ColorModel.kt → src/main/kotlin/view/model/ColorModel.kt

@@ -1,6 +1,6 @@
-package view
+package view.model
 
-import domain.StoneColor
+import domain.stone.StoneColor
 
 object ColorModel {
  private const val BLACK = "흑"

src/test/kotlin/BlackPlayerTest.kt

@@ -1,8 +1,9 @@
+import domain.player.BlackPlayer
+import domain.player.Player
+import domain.state.PlayingState
+import domain.stone.Stones
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import player.BlackPlayer
-import player.Player
-import state.PlayingState
 
 class BlackPlayerTest {
  @Test

src/test/kotlin/BoardTest.kt

@@ -1,9 +1,12 @@
+import domain.board.Board
+import domain.player.BlackPlayer
+import domain.player.Player
+import domain.player.WhitePlayer
+import domain.state.PlayingState
+import domain.stone.StoneColor
+import domain.stone.Stones
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import player.BlackPlayer
-import player.Player
-import player.WhitePlayer
-import state.PlayingState
 
 class BoardTest {
  @Test

src/test/kotlin/Fixtures.kt

@@ -1,3 +1,5 @@
+import domain.stone.Stone
+
 val ONE_ONE_STONE = Stone.of(1, 1)
 val ONE_TWO_STONE = Stone.of(1, 2)
 val ONE_THREE_STONE = Stone.of(1, 3)

src/test/kotlin/OmokTest.kt

@@ -1,9 +1,9 @@
-import game.Omok
+
 import org.junit.jupiter.api.Test
 
 class OmokTest {
  @Test
  fun `한 플레이어라도 승리할 때까지 차례를 번갈아가면서 돌을 놓는다`() {
- val omok = Omok()
+ // val omok = Omok()
  }
 }

src/test/kotlin/PlayingStateTest.kt

@@ -1,7 +1,8 @@
+import domain.state.PlayingState
+import domain.state.WinState
+import domain.stone.Stones
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import state.PlayingState
-import state.WinState
 
 class PlayingStateTest {
 

src/test/kotlin/PositionTest.kt

@@ -1,3 +1,4 @@
+import domain.position.Position
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertAll

src/test/kotlin/StoneColorTest.kt

@@ -1,3 +1,4 @@
+import domain.stone.StoneColor
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource

src/test/kotlin/StoneTest.kt

@@ -3,7 +3,7 @@
 class StoneTest {
  // @Test
  // fun `오목알은 자신의 위치를 알고 있다`() {
- // val stone = Stone("H", 10)
+ // val stone = domain.stone.Stone("H", 10)
  // assertThat(stone.x).isEqualTo("H")
  // assertThat(stone.y).isEqualTo(10)
  // }