🚀 3단계 - 로또(2등)

src/main/kotlin/lotto/LottoPlay.kt

@@ -23,8 +23,9 @@ fun main() {
     printLottoNumber(purchasedLottos)
 
     val lastWeekWinningString = LottoVendor.readLastWeekWinningString()
+    val lastWeekBonusNumber = LottoVendor.readLastWeekBonusBallNumber()
     val lastWeekWinningNumbers: List<Int> = toIntList(lastWeekWinningString)
-    purchasedLottos.forEach { it.setLottoPrize(lastWeekWinningNumbers) }
+    purchasedLottos.forEach { it.setLottoPrize(lastWeekWinningNumbers, lastWeekBonusNumber) }
     val winningRatio = LottoPlayResultAnalysis.getWinningRatio(purchaseAmount, purchasedLottos)
     LottoPlayer.printResult(purchasedLottos, winningRatio)
 }

src/main/kotlin/lotto/model/Lotto.kt

@@ -4,14 +4,23 @@ class Lotto {
     var lottoPrize: LottoPrize = LottoPrize.NONE_PRIZE
     val purchasedLottoNumbers: List<Int> = LOTTO_NUMBERS.shuffled().take(LOTTO_NUMBER_COUNT).sorted()
 
-    fun setLottoPrize(lastWeekWinningNumbers: List<Int>): LottoPrize {
+    private fun match(lastWeekWinningNumbers: List<Int>): Int {
         val matchingNumbers = purchasedLottoNumbers.intersect(lastWeekWinningNumbers.toSet()).size
-        lottoPrize = LottoPrize.getLottoPrize(matchingNumbers)
+        return matchingNumbers
+    }
+
+    fun setLottoPrize(lastWeekWinningNumbers: List<Int>, lastWeekBonusNumber: Int): LottoPrize {
+        val matchingNumbers = match(lastWeekWinningNumbers)
+        val bonusBallMatching: Int =
+            if (purchasedLottoNumbers.contains(lastWeekBonusNumber)) CONTAIN_BALL else NOT_CONTAIN_BALL
+        lottoPrize = LottoPrize.getLottoPrize(matchingNumbers, bonusBallMatching)
         return lottoPrize
     }
 
     companion object {
         private val LOTTO_NUMBERS: List<Int> = (1..45).toList()
         private const val LOTTO_NUMBER_COUNT = 6
+        private const val CONTAIN_BALL = 1
+        private const val NOT_CONTAIN_BALL = 0
     }
 }

src/main/kotlin/lotto/model/LottoPrize.kt

@@ -1,17 +1,28 @@
 package lotto.model
 
-enum class LottoPrize(val matchingCount: Int, val prizeAmount: Long) {
-    FIRST(6, 2000000000),
-    SECOND(5, 1500000),
-    THIRD(4, 50000),
-    FOURTH(3, 5000),
-    NONE_PRIZE(0, 0);
+enum class LottoPrize(val matchingCount: Int, val bonusMatching: Int = 0, val prizeAmount: Long) {
+    FIRST(6, 0, 2000000000),
+    BONUS(5, 1, 30000000),
+    SECOND(5, 0, 1500000),
+    THIRD(4, 0, 50000),
+    FOURTH(3, 0, 5000),
+    NONE_PRIZE(0, 0, 0);
 
     companion object {
         private const val PRIZING_CONT = 3
-        fun getLottoPrize(matchingCount: Int): LottoPrize {
-            if(matchingCount >= PRIZING_CONT) { return NONE_PRIZE }
-            return values().find { it.matchingCount == matchingCount }!!
+        private const val SECOND_PRIZE_MATCHING_COUNT = 5
+        fun getLottoPrize(matchingCount: Int, lastWeekBonusNumber: Int): LottoPrize {
+            if (matchingCount < PRIZING_CONT) {
+                return NONE_PRIZE
+            }
+
+            val prize = values().find { it.matchingCount == matchingCount } ?: return NONE_PRIZE
+
+            if (matchingCount == SECOND_PRIZE_MATCHING_COUNT) {
+                if ( lastWeekBonusNumber > 0)  return BONUS
+                else return SECOND
+            }
+            return prize
         }
     }
 }

src/main/kotlin/lotto/service/LottoTicketCountCalculator.kt

@@ -1,9 +1,7 @@
 package lotto.service
 
 object LottoTicketCountCalculator {
-
     private const val LOTTO_PRICE = 1000
 
     fun getCount(purchaseAmount: Int) : Int = purchaseAmount / LOTTO_PRICE
-
 }

src/main/kotlin/lotto/view/LottoPlayer.kt

@@ -12,9 +12,10 @@ object LottoPlayer {
         println("3개 일치 (5000원)- ${LottoPlayResultAnalysis.staticPrize(winningLottos, 5000)}")
         println("4개 일치 (50000원)- ${LottoPlayResultAnalysis.staticPrize(winningLottos, 50000)}")
         println("5개 일치 (1500000원)- ${LottoPlayResultAnalysis.staticPrize(winningLottos, 1500000)}")
+        println("5개 일치, 보너스 볼 일치(30000000원) - ${LottoPlayResultAnalysis.staticPrize(winningLottos, 30000000)}")
         println("6개 일치 (2000000000원)-${LottoPlayResultAnalysis.staticPrize(winningLottos, 2000000000)}")
         println()
         println("총 수익률은 ${formatWinningRatio(winningRatio)} 입니다.(기준이 1이기 때문에 결과적으로 ${if (winningRatio >= 1) "이득" else "손해"}라는 의미임)")
     }
 
-}
+}

src/main/kotlin/lotto/view/LottoVendor.kt

@@ -13,11 +13,16 @@ object LottoVendor {
     }
 
     fun printLottoNumber(purchasedLottos:List<Lotto>) {
-        purchasedLottos.forEach { print(it) }
+        purchasedLottos.forEach { println(it.purchasedLottoNumbers.toString()) }
     }
 
     fun readLastWeekWinningString(): String {
         println("지난 주 당첨 번호를 입력해 주세요.")
-        return readLine().toString()
+        return readln()
     }
-}
+
+    fun readLastWeekBonusBallNumber(): Int {
+        println("보너스 볼을 입력해 주세요.")
+        return readln().toInt()
+    }
+}

src/test/kotlin/lotto/LottoPlayTest.kt

@@ -35,7 +35,7 @@ class LottoPlayTest {
     @ParameterizedTest
     @ValueSource(ints = [2])
     fun testNotPrizeAmount(matchingCount: Int) {
-        Assertions.assertThat(LottoPrize.getLottoPrize(matchingCount).prizeAmount).isEqualTo(0)
+        Assertions.assertThat(LottoPrize.getLottoPrize(matchingCount, 0).prizeAmount).isEqualTo(0)
     }
 
     @DisplayName(value = "지난주 당첨 번호와 3개 일치 상금 5000원 ")
@@ -45,7 +45,12 @@ class LottoPlayTest {
         val winningLottoNumber = Lotto()
         val lastWeekWinningLottoNumber = winningLottoNumber.purchasedLottoNumbers.toMutableList()
 
-        Assertions.assertThat(winningLottoNumber.setLottoPrize(lastWeekWinningLottoNumber.subList(0,3)).prizeAmount)
+        Assertions.assertThat(
+            winningLottoNumber.setLottoPrize(
+                lastWeekWinningLottoNumber.subList(0, 3),
+                lastWeekWinningLottoNumber.last() + 1
+            ).prizeAmount
+        )
             .isEqualTo(matchingCount.toLong())
     }
 
@@ -56,7 +61,12 @@ class LottoPlayTest {
         val winningLottoNumber = Lotto()
         val lastWeekWinningLottoNumber = winningLottoNumber.purchasedLottoNumbers.toMutableList()
 
-        Assertions.assertThat(winningLottoNumber.setLottoPrize(lastWeekWinningLottoNumber.subList(0,4)).prizeAmount)
+        Assertions.assertThat(
+            winningLottoNumber.setLottoPrize(
+                lastWeekWinningLottoNumber.subList(0, 4),
+                lastWeekWinningLottoNumber.last() + 1
+            ).prizeAmount
+        )
             .isEqualTo(matchingCount.toLong())
     }
 
@@ -67,7 +77,28 @@ class LottoPlayTest {
         val winningLottoNumber = Lotto()
         val lastWeekWinningLottoNumber = winningLottoNumber.purchasedLottoNumbers.toMutableList()
 
-        Assertions.assertThat(winningLottoNumber.setLottoPrize(lastWeekWinningLottoNumber.subList(0,5)).prizeAmount)
+        Assertions.assertThat(
+            winningLottoNumber.setLottoPrize(
+                lastWeekWinningLottoNumber.subList(0, 5),
+                lastWeekWinningLottoNumber.last() + 1
+            ).prizeAmount
+        )
+            .isEqualTo(matchingCount.toLong())
+    }
+
+    @DisplayName(value = "지난주 당첨 번호와 5개 보너스볼 일치 상금 3000000원")
+    @ParameterizedTest
+    @ValueSource(strings = ["30000000"])
+    fun testBonusPrizeAmount(matchingCount: String) {
+        val winningLottoNumber = Lotto()
+        val lastWeekWinningLottoNumber = winningLottoNumber.purchasedLottoNumbers.toMutableList()
+
+        Assertions.assertThat(
+            winningLottoNumber.setLottoPrize(
+                lastWeekWinningLottoNumber.subList(0, 5),
+                lastWeekWinningLottoNumber.last()
+            ).prizeAmount
+        )
             .isEqualTo(matchingCount.toLong())
     }
 
@@ -77,8 +108,7 @@ class LottoPlayTest {
     fun testFirstPrizeAmount(matchingCount: String) {
         val winningLottoNumber = Lotto()
         val lastWeekWinningLottoNumber = winningLottoNumber.purchasedLottoNumbers.toList()
-        Assertions.assertThat(winningLottoNumber.setLottoPrize(lastWeekWinningLottoNumber).prizeAmount)
+        Assertions.assertThat(winningLottoNumber.setLottoPrize(lastWeekWinningLottoNumber, 1).prizeAmount)
             .isEqualTo(matchingCount.toLong())
     }
-
 }