Step3 #1115
Merged
Step3 #1115
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Flamme1004K
approved these changes
Dec 4, 2024
Comment on lines
+1
to
+10
| # 🚀 3단계 - 로또(2등) | ||
|
|
||
| ## 기능 요구사항 | ||
|
|
||
| - 2등을 위해 추가 번호를 하나 더 추첨한다. | ||
| - 당첨 통계에 2등도 추가해야 한다. | ||
|
|
||
| - [ ] 보너스볼을 입력받는다. (`InputView.kt`) | ||
| - [ ] 보너스볼과 당첨번호를 비교해서 로또 등수를 계산한다. (`Match.kt`) | ||
| - [ ] 보너스볼 일치 여부(2등)을 통계에 추가한다. (`Statistics.kt`) |
There was a problem hiding this comment.
기능 요구사항 잘 작성해주셨어요!
단, 완성 된 기능에 대해서는 체크해주면 더욱 좋겠죠~?
| private val amount: Int, | ||
| private val lottoNumberListGenerator: LottoNumberListGenerator, | ||
| ) { | ||
| fun purchaseLotto(): List<Lotto> { |
There was a problem hiding this comment.
프로그래밍 요구 사항에 일급 컬렉션 사용이 있어요. List를 일급 컬렉션으로 표현해 볼까요?
Comment on lines
+8
to
12
| init { | ||
| require(lottoNumbers.size == REQUIRED_LOTTO_SIZE) { | ||
| ERROR_WRONG_NUMBER_COUNT | ||
| } | ||
| } |
Comment on lines
+15
to
+16
| val lottoNumbers: Set<LottoNumber> = lottoNumbers | ||
| val winningLottoNumbers: Set<LottoNumber> = winningLotto.lottoNumbers |
There was a problem hiding this comment.
Suggested change
| val lottoNumbers: Set<LottoNumber> = lottoNumbers | |
| val winningLottoNumbers: Set<LottoNumber> = winningLotto.lottoNumbers | |
| val lottoNumbers = lottoNumbers | |
| val winningLottoNumbers = winningLotto.lottoNumbers |
타입에 대한 부분은 생략해줘도 좋아보여요~ 코틀린의 장점은 타입 추론이 가능하다는 부분이에요. 타입 추론이 있기에 더욱더 명확한 변수 명이 나온다고 생각해요. 명확한 변수 명이 나오면 타입을 어느정도 추론할 수 있다고 봅니다. 그리고 IDE에서 타입을 다 알려주잖아요? ㅎㅎ
Comment on lines
7
to
+15
| value class LottoNumber(val number: Int) { | ||
| companion object { | ||
| private const val MINIMUM_NUMBER = 1 | ||
| private const val MAXIMUM_NUMBER = 45 | ||
| private const val CANNOT_CREATE_LOTTO_NUMBER_MESSAGE = "Lotto number must be between %s and %s." | ||
|
|
||
| private val NUMBERS: Map<Int, LottoNumber> = (MINIMUM_NUMBER..MAXIMUM_NUMBER).associateWith { LottoNumber(it) } | ||
|
|
||
| fun from(number: Int): LottoNumber { | ||
| return NUMBERS[number] ?: throw IllegalArgumentException( | ||
| CANNOT_CREATE_LOTTO_NUMBER_MESSAGE.format(MINIMUM_NUMBER, MAXIMUM_NUMBER), | ||
| ) | ||
| init { | ||
| require(number in MINIMUM_NUMBER..MAXIMUM_NUMBER) { | ||
| CANNOT_CREATE_LOTTO_NUMBER_MESSAGE.format(MINIMUM_NUMBER, MAXIMUM_NUMBER) | ||
| } | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return number.toString() | ||
| companion object { | ||
| private const val CANNOT_CREATE_LOTTO_NUMBER_MESSAGE = "Lotto number must be between %s and %s." |
Comment on lines
+4
to
+11
| FIRST(6, 2_000_000_000L), | ||
| SECOND(5, 30_000_000L), | ||
| THIRD(5, 1_500_000L), | ||
| FOURTH(4, 50_000L), | ||
| FIFTH(3, 5_000L), | ||
| NONE(0, 0L), | ||
| ; | ||
|
|
Comment on lines
+5
to
+20
| if (matchCount == 6) { | ||
| return LottoRank.FIRST | ||
| } | ||
|
|
||
| private fun rank(matchCount: Int): Int { | ||
| return when (matchCount) { | ||
| MATCH_COUNT_SIX -> FIRST_RANK | ||
| MATCH_COUNT_FIVE -> THIRD_RANK | ||
| MATCH_COUNT_FOUR -> FOURTH_RANK | ||
| MATCH_COUNT_THREE -> FIFTH_RANK | ||
| else -> NO_RANK | ||
| } | ||
| if (matchCount == 5 && isMatchedBonusBall) { | ||
| return LottoRank.SECOND | ||
| } | ||
| if (matchCount == 5) { | ||
| return LottoRank.THIRD | ||
| } | ||
| if (matchCount == 4) { | ||
| return LottoRank.FOURTH | ||
| } | ||
| if (matchCount == 3) { | ||
| return LottoRank.FIFTH | ||
| } | ||
| return LottoRank.NONE |
Comment on lines
+7
to
+18
| val initialRanks = | ||
| LottoRank.entries | ||
| .filter { it.matchCount in MINIMUM_MATCH_COUNT..MAXIMUM_MATCH_COUNT } | ||
| .associateWith { 0 } | ||
|
|
||
| val actualRanks = | ||
| lottos.map { winningLotto.getUserRank(it) } | ||
| .filter { it.matchCount in MINIMUM_MATCH_COUNT..MAXIMUM_MATCH_COUNT } | ||
| .groupingBy { it } | ||
| .eachCount() | ||
|
|
||
| return initialRanks + actualRanks |
There was a problem hiding this comment.
없는 Rank에 대해서는 0으로 나타내주기 위하여 initailRanks를 만든 것이지요?
| amount: Int, | ||
| ): Double { | ||
| return statisticsList.sumOf { it.earnings() }.toDouble() / amount | ||
| fun getProfitStatus(earningRatio: Double): String = |
There was a problem hiding this comment.
ProfitStatus를 String이 아닌 enum으로 만들어주면 어떨까요?
그러면, 서버의 도메인 로직과 view에 대한 로직을 분리할 수 있어보여요!
| import io.kotest.matchers.shouldBe | ||
| import lotto.strategy.WinningLottoNumberListGenerator | ||
| import lotto.stretagy.LottoNumberListGenerator | ||
|
|
||
| class LottoTest : DescribeSpec({ |
|
commit 매우 잘 해주셨어요! 굳굳 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
안녕하세요! 리뷰 잘 부탁드립니다 🙇♂️