refactor(TurnResult): TurnResult 생성, 점진적인 리팩터링

domain/src/main/kotlin/controller/OmokController.kt

@@ -13,16 +13,16 @@ class OmokController(
  private val outputView: OmokGameEventListener,
 ) {
  fun start(blackRule: OmokRule, whiteRule: OmokRule) {
- Omok(inputView, outputView).apply {
+ Omok().apply {
  var players = Players(BlackPlayer(rule = blackRule), WhitePlayer(rule = whiteRule))
  outputView.onStartGame()
-
  while (players.isPlaying) {
  outputView.onStartTurn(players.curPlayerColor, players.getLastPoint())
- players = takeTurn(players)
- outputView.onEndTurn(players)
+ val result = takeTurn(inputView.onTakeTurn(players.curPlayerColor), players)
+ outputView.onEndTurn(result)
+ players = result.players
  }
- endGame(players)
+ outputView.onEndGame(players)
  }
  }
 }

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

@@ -1,29 +1,14 @@
 package domain.game
 
-import domain.player.BlackPlayer
 import domain.player.Players
-import domain.player.WhitePlayer
-import domain.rule.OmokRule
-import listener.OmokGameEventListener
-import listener.OmokTurnEventListener
+import domain.point.Point
+import domain.result.TurnResult
 
-class Omok(
- private val turnEventListener: OmokTurnEventListener,
- private val gameEventListener: OmokGameEventListener,
-) {
- fun takeTurn(originPlayers: Players): Players {
- val newPoint = turnEventListener.onTakeTurn(originPlayers.curPlayerColor)
- val endTurnPlayers = originPlayers.putStone(newPoint)
- if (!endTurnPlayers.isPut(originPlayers)) turnEventListener.onNotPlaceable()
-
- return endTurnPlayers
- }
-
- fun endGame(players: Players) {
- when {
- players.isFoul -> gameEventListener.onEndGame(players.curPlayerColor)
- !players.isPlaying -> gameEventListener.onEndGame(players.curPlayerColor.next())
- }
+class Omok {
+ fun takeTurn(point: Point, originPlayers: Players): TurnResult {
+ val endTurnPlayers = originPlayers.putStone(point)
+ if (endTurnPlayers == originPlayers) return TurnResult.Failure(endTurnPlayers)
+ return TurnResult.Success(endTurnPlayers)
  }
 
  companion object {

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

@@ -36,8 +36,6 @@ data class Players private constructor(private val players: List<Player>) {
  return Players(latestPlayer, newPlayers)
  }
 
- fun isPut(players: Players): Boolean = this != players
-
  fun getLastPoint(): Point? = latestPlayer.getLastStone()
 
  fun toList(): List<Player> = players.toList()

domain/src/main/kotlin/domain/result/TurnResult.kt

@@ -0,0 +1,8 @@
+package domain.result
+
+import domain.player.Players
+
+sealed class TurnResult(val players: Players) {
+ class Success(players: Players): TurnResult(players)
+ class Failure(players: Players): TurnResult(players)
+}

domain/src/main/kotlin/listener/OmokGameEventListener.kt

@@ -2,11 +2,12 @@ package listener
 
 import domain.player.Players
 import domain.point.Point
+import domain.result.TurnResult
 import domain.stone.StoneColor
 
 interface OmokGameEventListener {
  fun onStartTurn(stoneColor: StoneColor, point: Point?)
- fun onEndTurn(players: Players)
+ fun onEndTurn(result: TurnResult)
  fun onStartGame()
- fun onEndGame(winnerStoneColor: StoneColor)
+ fun onEndGame(players: Players)
 }

domain/src/main/kotlin/view/OmokOutputView.kt

@@ -6,6 +6,7 @@ import domain.point.Point
 import domain.stone.StoneColor
 import view.mapper.toPresentation
 import domain.game.Omok.Companion.OMOK_BOARD_SIZE
+import domain.result.TurnResult
 import listener.OmokGameEventListener
 
 
@@ -15,9 +16,14 @@ class OmokOutputView : OmokGameEventListener {
  println(OMOK_BOARD)
  }
 
- override fun onEndGame(stoneColor: StoneColor) {
+ override fun onEndGame(players: Players) {
  println(GAME_END_MESSAGE)
- println(WINNER_MESSAGE.format(stoneColor.toPresentation().text))
+ if (players.isFoul) {
+ println("금수를 두었습니다.")
+ println(WINNER_MESSAGE.format(players.curPlayerColor.toPresentation().text))
+ return
+ }
+ println(WINNER_MESSAGE.format(players.curPlayerColor.next().toPresentation().text))
  }
 
  override fun onStartTurn(stoneColor: StoneColor, point: Point?) {
@@ -29,8 +35,10 @@ class OmokOutputView : OmokGameEventListener {
  println()
  }
 
- override fun onEndTurn(players: Players) {
+ override fun onEndTurn(result: TurnResult) {
+ if(result is TurnResult.Failure) println(ALREADY_EXIST_STONE)
  val board = OMOK_BOARD.toMutableList()
+ val players = result.players
  players.toList().forEach { player ->
  player.getAllPoints().getAll().forEach { drawPoint(player, board, it) }
  }
@@ -50,6 +58,7 @@ class OmokOutputView : OmokGameEventListener {
  private const val START_MESSAGE = "오목 게임을 시작합니다."
  private const val TURN_MESSAGE = "%s의 차례입니다. "
  private const val LAST_STONE_POSITION_MESSAGE = "(마지막 돌의 위치: %s)"
+ private const val ALREADY_EXIST_STONE = "이미 돌이 있습니다."
  private const val GAME_END_MESSAGE = "게임이 종료되었습니다."
  private const val WINNER_MESSAGE = "%s의 승리입니다."
  private const val BLACK_STONE = '●'