fix: 출력구문 수정

Author: DuhanMo

README.md

@@ -37,4 +37,8 @@
 ### 기능 구현사항
 - [x] 딜러는 처음받는 2장의 합계가 16이하면 반드시 1장의 카드를 추가로 받는다
 - [x] 딜러가 21을 초과하면 남은 플레이어들은 패에 상관없이 승리한다
-- [x] 게임 완료 후 각 플레이어별로 승패를 출력한다
+- [x] 게임 완료 후 각 플레이어별로 승패를 출력한다
+- [x] data class , 일반 클래스 설정 일관성 유지
+- [x] 도메인 패키지 분리
+- [x] 객체 상태를 객체가 관리
+- [x] 게임 관련 로직 분리

src/main/kotlin/blackjack/Main.kt

@@ -1,9 +1,7 @@
 package blackjack
 
 import blackjack.controller.BlackjackGame
-import blackjack.view.InputView
-import blackjack.view.ResultView
 
 fun main() {
-    BlackjackGame(InputView, ResultView).start()
+    BlackjackGame.start()
 }

src/main/kotlin/blackjack/controller/BlackjackGame.kt

@@ -1,87 +1,35 @@
 package blackjack.controller
 
-import blackjack.domain.Dealer
-import blackjack.domain.Deck
-import blackjack.domain.GameResult
-import blackjack.domain.GameTable
-import blackjack.domain.Participant
-import blackjack.domain.Player
+import blackjack.domain.card.Deck
+import blackjack.domain.player.Dealer
+import blackjack.domain.player.Player
 import blackjack.view.InputView
 import blackjack.view.ResultView
 
-data class BlackjackGame(
-    private val inputView: InputView,
-    private val resultView: ResultView,
-) {
+object BlackjackGame {
     fun start() {
-        val gameTable = GameTable(Deck.create())
-        val participants = playGame(gameTable)
-        printCard(participants)
-        printGameResult(participants)
+        val gameTable = setUp()
+        initDeal(gameTable)
+        turnStart(gameTable)
+        ResultView.printAfterTurn(gameTable)
     }
 
-    private fun playGame(gameTable: GameTable): List<Participant> {
-        val participants = setUpInitCard(gameTable)
-        val (players, dealer) = Participant.separate(participants)
-        val gamedPlayers = playersTurn(players, gameTable)
-        resultView.linebreak()
-        val gamedDealer = dealerTurn(dealer, gameTable)
-        return gamedPlayers + gamedDealer
+    private fun setUp(): GameTable {
+        val gameTable = GameTable(Deck(), Dealer(), getPlayers())
+        ResultView.linebreak()
+        return gameTable
     }
 
-    private fun setUpInitCard(gameTable: GameTable): List<Participant> {
-        val participants = gameTable.dealInitCard(getParticipants())
-        resultView.linebreak()
-        resultView.printInitCardReceive(participants)
-        resultView.printParticipantsCard(participants = participants, printScore = false)
-        resultView.linebreak()
-        return participants
-    }
-
-    private fun getParticipants(): List<Participant> {
-        return buildList {
-            add(Dealer.create())
-            addAll(inputView.inputNames().map { Player.create(name = it) })
-        }
-    }
-
-    private fun playersTurn(
-        participants: List<Participant>,
-        gameTable: GameTable,
-    ): List<Participant> {
-        return participants.map { playerTurn(it, gameTable) }
-    }
-
-    private tailrec fun playerTurn(
-        player: Participant,
-        gameTable: GameTable,
-    ): Participant {
-        if (!player.canHit() || !inputView.inputHit(player)) {
-            return player
-        }
-        val hitPlayer = gameTable.hit(player)
-        resultView.printParticipantCard(participant = hitPlayer, printScore = false)
-        return playerTurn(hitPlayer, gameTable)
-    }
-
-    private tailrec fun dealerTurn(
-        dealer: Participant,
-        gameTable: GameTable,
-    ): Participant {
-        if (!dealer.canHit()) {
-            return dealer
-        }
-        resultView.printDealerHit()
-        return dealerTurn(gameTable.hit(dealer), gameTable)
-    }
+    private fun getPlayers(): List<Player> = InputView.inputNames().map { Player(it) }
 
-    private fun printCard(participants: List<Participant>) {
-        resultView.linebreak()
-        resultView.printParticipantsCard(participants = participants, printScore = true)
+    private fun initDeal(gameTable: GameTable) {
+        gameTable.dealInitCard()
+        ResultView.printDealInitCard(gameTable)
     }
 
-    private fun printGameResult(participants: List<Participant>) {
-        resultView.linebreak()
-        resultView.printGameResult(GameResult.from(participants))
+    private fun turnStart(gameTable: GameTable) {
+        gameTable.playersTurn()
+        ResultView.linebreak()
+        gameTable.dealerTurn()
     }
 }

src/main/kotlin/blackjack/controller/GameTable.kt

@@ -0,0 +1,46 @@
+package blackjack.controller
+
+import blackjack.domain.card.Deck
+import blackjack.domain.game.GameResult
+import blackjack.domain.player.Dealer
+import blackjack.domain.player.Player
+import blackjack.view.InputView
+import blackjack.view.ResultView
+
+class GameTable(
+    val deck: Deck,
+    val dealer: Dealer,
+    val players: List<Player>,
+) {
+    fun dealInitCard() =
+        repeat(INIT_CARD_DRAW_COUNT) {
+            dealer.hit(deck.draw())
+            players.forEach { it.hit(deck.draw()) }
+        }
+
+    fun playersTurn() = players.forEach { playerTurn(it) }
+
+    fun dealerTurn() {
+        if (!dealer.canHit()) {
+            return
+        }
+        ResultView.printDealerHit()
+        dealer.hit(deck.draw())
+        dealerTurn()
+    }
+
+    fun getGameResult(): GameResult = GameResult.from(dealer, players)
+
+    private fun playerTurn(player: Player) {
+        if (!player.canHit() || !InputView.inputHit(player)) {
+            return
+        }
+        player.hit(deck.draw())
+        ResultView.printPlayerCard(player)
+        playerTurn(player)
+    }
+
+    companion object {
+        const val INIT_CARD_DRAW_COUNT = 2
+    }
+}

src/main/kotlin/blackjack/domain/Cards.kt

@@ -1,6 +1,6 @@
-package blackjack.domain
+package blackjack.domain.card
 
-import blackjack.domain.Rank.ACE
+import blackjack.domain.card.Rank.ACE
 
 data class Card(
     val rank: Rank,

src/main/kotlin/blackjack/domain/Deck.kt

@@ -0,0 +1,8 @@
+package blackjack.domain.card
+
+class Deck(private val cards: MutableList<Card> = Card.ALL.shuffled().toMutableList()) {
+    fun draw(): Card {
+        check(cards.isNotEmpty()) { "카드가 모두 소진되었습니다" }
+        return cards.removeFirst()
+    }
+}