feat: 파일 정리

- 가독성 증진
- unused file 정리

# step2

Author: moses-lee96

src/main/kotlin/blackJack/controller/BlackJackController.kt

@@ -2,6 +2,8 @@ package blackJack.controller
 
 import blackJack.model.Dealer
 import blackJack.model.Player
+import blackJack.model.askMoreCard
+import blackJack.model.checkDrawCardIsAllowedFor
 import blackJack.view.InputView
 import blackJack.view.OutputView
 
@@ -28,9 +30,9 @@ class BlackJackController {
             if (req == "n") {
                 break
             }
-            player.askMoreCard(dealer)
+            player askMoreCard dealer
 
-            if (dealer.isDrawCardAllowedFor(player).not()) {
+            if ((dealer checkDrawCardIsAllowedFor player).not()) {
                 break
             }
             OutputView.printPlayerState(player)

src/main/kotlin/blackJack/model/Card.kt

@@ -7,24 +7,3 @@ data class Card(
     val suit: Suit,
     val rank: Rank
 )
-
-class CardDeck(val cards: List<Card>) {
-    companion object {
-        fun of(): CardDeck {
-            val cards = generateAllCards()
-            return CardDeck(cards)
-        }
-
-        private fun generateAllCards(): List<Card> {
-            return Suit.values().flatMap { suit ->
-                generateCardsForSuit(suit)
-            }
-        }
-
-        private fun generateCardsForSuit(suit: Suit): List<Card> {
-            return Rank.values().map { rank ->
-                Card(suit, rank)
-            }
-        }
-    }
-}

src/main/kotlin/blackJack/model/CardDeck.kt

@@ -0,0 +1,25 @@
+package blackJack.model
+
+import blackJack.model.enums.Rank
+import blackJack.model.enums.Suit
+
+class CardDeck(val cards: List<Card>) {
+    companion object {
+        fun of(): CardDeck {
+            val cards = generateAllCards()
+            return CardDeck(cards)
+        }
+
+        private fun generateAllCards(): List<Card> {
+            return Suit.values().flatMap { suit ->
+                generateCardsForSuit(suit)
+            }
+        }
+
+        private fun generateCardsForSuit(suit: Suit): List<Card> {
+            return Rank.values().map { rank ->
+                Card(suit, rank)
+            }
+        }
+    }
+}

src/main/kotlin/blackJack/model/Dealer.kt

@@ -2,18 +2,10 @@ package blackJack.model
 
 class Dealer(val name: String) {
     private var cardDeck = CardDeck.of()
+    val MAXIMUM_SCORE = 21
 
-    fun startGame(players: List<Player>): List<Player> {
-        return initializePlayerHands(players)
-    }
-
-    private fun initializePlayerHands(players: List<Player>): List<Player> {
-        players.forEach { player ->
-            player.addCard(drawCard())
-            player.addCard(drawCard())
-        }
-
-        return players
+    fun countCard(): Int {
+        return cardDeck.cards.size
     }
 
     fun drawCard(): Card {
@@ -28,11 +20,20 @@ class Dealer(val name: String) {
         return currentCard
     }
 
-    fun isDrawCardAllowedFor(player: Player): Boolean {
-        return player.calculateScore() < 21
+    fun startGame(players: List<Player>): List<Player> {
+        return initializePlayerHands(players)
     }
 
-    fun countCard(): Int {
-        return cardDeck.cards.size
+    private fun initializePlayerHands(players: List<Player>): List<Player> {
+        players.forEach { player ->
+            player requestCardToDealer drawCard()
+            player requestCardToDealer drawCard()
+        }
+
+        return players
     }
 }
+
+infix fun Dealer.checkDrawCardIsAllowedFor(player: Player): Boolean {
+    return player.calculateScore() < MAXIMUM_SCORE
+}

src/main/kotlin/blackJack/model/Player.kt

@@ -4,19 +4,17 @@ class Player(
     val name: String,
     var hand: List<Card> = listOf()
 ) {
-    fun addCard(card: Card) {
-        hand += card
-    }
-
     fun calculateScore(): Int {
         return hand.sumOf { it.rank.score }
     }
+}
 
-    fun askMoreCard(dealer: Dealer) {
-        if (dealer.isDrawCardAllowedFor(this).not()) {
-            return
-        }
-
-        addCard(dealer.drawCard())
+infix fun Player.askMoreCard(dealer: Dealer) {
+    if (dealer checkDrawCardIsAllowedFor this) {
+        this requestCardToDealer dealer.drawCard()
     }
 }
+
+infix fun Player.requestCardToDealer(card: Card) {
+    hand += card
+}

src/test/kotlin/blackjack/domain/PlayerSpec.kt

@@ -3,8 +3,10 @@ package blackjack.domain
 import blackJack.model.Card
 import blackJack.model.Dealer
 import blackJack.model.Player
+import blackJack.model.askMoreCard
 import blackJack.model.enums.Rank
 import blackJack.model.enums.Suit
+import blackJack.model.requestCardToDealer
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 
@@ -13,8 +15,8 @@ class PlayerSpec : BehaviorSpec({
     given("플레이어가 2장의 카드를 받았을 때") {
         val player = Player("플레이어")
         val dealer = Dealer("딜러")
-        player.addCard(Card(Suit.SPADES, Rank.ACE))
-        player.addCard(Card(Suit.CLUBS, Rank.EIGHT))
+        player requestCardToDealer Card(Suit.SPADES, Rank.ACE)
+        player requestCardToDealer Card(Suit.CLUBS, Rank.EIGHT)
 
         `when`("플레이어가 가진 카드의 합을 구하면") {
             val score = player.calculateScore()
@@ -26,7 +28,7 @@ class PlayerSpec : BehaviorSpec({
 
         `when`("bust 상태가 아닌 플레이어가 딜러에게 카드를 더 달라고 요구하면") {
             val currentCardCount = player.hand.size
-            player.askMoreCard(dealer)
+            player askMoreCard dealer
             val newCardCount = player.hand.size
 
             then("플레이어는 카드를 한장 더 받는다.") {
@@ -38,13 +40,13 @@ class PlayerSpec : BehaviorSpec({
     given("bust 상태인 플레이어가") {
         val player = Player("플레이어")
         val dealer = Dealer("딜러")
-        player.addCard(Card(Suit.SPADES, Rank.JACK))
-        player.addCard(Card(Suit.SPADES, Rank.QUEEN))
-        player.addCard(Card(Suit.CLUBS, Rank.EIGHT))
+        player requestCardToDealer Card(Suit.SPADES, Rank.JACK)
+        player requestCardToDealer Card(Suit.SPADES, Rank.QUEEN)
+        player requestCardToDealer Card(Suit.CLUBS, Rank.EIGHT)
 
         `when`("딜러에게 카드를 더 달라고 요구하면") {
             val currentCardCount = player.hand.size
-            player.askMoreCard(dealer)
+            player askMoreCard dealer
             val newCardCount = player.hand.size
 
             then("플레이어는 카드를 받지 않는다.") {