Step3 - 로또(2등) (#3199)

* docs: <3단계> 기능 요구 사항 정리 * feat: <3단계> 로또 2등 당첨 확인 - 보너스 번호 추가 - 로또 2등 당첨 여부 확인 * feat: <3단계> 피드백 반영 - 상수 제거 - HashMap 메서드 활용 * refactor: <3단계> lottoTicket 검증 주체 변경 - 클라이언트 로또 티켓이 당첨 번호와 보너스 번호로 비교 검증 진행 --------- Co-authored-by: HAE\1161893 <[email protected]>
next-step · May 15, 2023 · 06308c1 · 06308c1
1 parent bfa706d
commit 06308c1
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -23,5 +23,9 @@
 - [x] 1 ~ 45 범위의 랜덤한 숫자 6개를 뽑는다.  
 - [x] 위 숫자 리스트 생산 비용을 1000으로 책정하여, 전달받은 금액만큼 생성한다.  
 - [x] 당첨 번호와 숫자 일치 개수를 확인하여 당첨 통계를 낸다.  
-- [ ] 수익률을 계산한다.
+- [x] 수익률을 계산한다.
 - [x] 해당 결과를 콘솔에 출력한다.
+
+### Step 3
+- [x] 보너스 번호를 입력받는다.
+- [x] 보너스 번호로 2등 여부를 확인한다.
diff --git a/src/main/java/step2/controller/LottoGameController.java b/src/main/java/step2/controller/LottoGameController.java
@@ -23,20 +23,19 @@ public void playLottoGame() {
 
         List<LottoTicket> lottoTickets = lottoGames.buyLottoGame(gameCount);
         ResultView.printLottoTicket(lottoTickets);
-        LottoTicket winningNumber = lottoGames.readWinningNumber(InputView.readWinningNumbers());
+        LottoTicket winningTicket = lottoGames.readWinningNumber(InputView.readWinningNumbers());
+        int bonusNumber = InputView.readBonusNumber();
 
         ResultView.printBlankLine();
         ResultView.printMessage("당첨 통계");
 
         LottoResultReport lottoResultReport = new LottoResultReport();
         for (LottoTicket lottoTicket : lottoTickets) {
-            lottoResultReport.recordRank(winningNumber.countMatchingNumbers(lottoTicket));
+            lottoResultReport.recordRank(lottoTicket.checkLottoTicket(winningTicket, bonusNumber));
         }
 
         ResultView.printResultReport(lottoResultReport);
         double profit = lottoResultReport.calculateProfit(gameCount);
         ResultView.printMessage("총 수익률은 " + profit + "입니다.");
-
     }
-
 }
diff --git a/src/main/java/step2/domain/LottoResultReport.java b/src/main/java/step2/domain/LottoResultReport.java
@@ -6,29 +6,20 @@
 
 public class LottoResultReport {
 
-    static final int ZERO = 0;
-
-    private Map<PrizeMoney, Integer> lottoResultReport;
+    private Map<Rank, Integer> lottoResultReport;
 
     public LottoResultReport() {
         lottoResultReport = new HashMap<>();
     }
 
-    public int recordRank(PrizeMoney prizeMoney) {
-        if (lottoResultReport.containsKey(prizeMoney)) {
-            Integer cnt = lottoResultReport.get(prizeMoney);
-            lottoResultReport.put(prizeMoney, cnt + 1);
-            return cnt;
-        }
-        lottoResultReport.put(prizeMoney, 1);
-        return 1;
+    public int recordRank(Rank rank) {
+        Integer value = lottoResultReport.getOrDefault(rank, 0);
+        lottoResultReport.put(rank, value + 1);
+        return lottoResultReport.get(rank);
     }
 
-    public int findReportByMatchCount(PrizeMoney prizeMoney) {
-        if (lottoResultReport.containsKey(prizeMoney)) {
-            return lottoResultReport.get(prizeMoney);
-        }
-        return ZERO;
+    public int findReportByMatchCount(Rank rank) {
+        return lottoResultReport.getOrDefault(rank, 0);
     }
 
     public double calculateProfit(int gameCount) {
@@ -38,7 +29,7 @@ public double calculateProfit(int gameCount) {
     }
 
     long sum() {
-        Set<Map.Entry<PrizeMoney, Integer>> entries = lottoResultReport.entrySet();
+        Set<Map.Entry<Rank, Integer>> entries = lottoResultReport.entrySet();
         return entries.stream().mapToLong(e -> e.getKey().prizeMoney() * e.getValue()).sum();
     }
 

diff --git a/src/main/java/step2/domain/LottoTicket.java b/src/main/java/step2/domain/LottoTicket.java
@@ -29,11 +29,16 @@ public boolean isContain(Integer number) {
         return this.lottoTicket.contains(number);
     }
 
-    public PrizeMoney countMatchingNumbers(LottoTicket compareTarget) {
+    public Rank checkLottoTicket(LottoTicket winningTicket, int bonusNumber) {
         int count = (int) lottoTicket.stream()
-                .filter(i -> compareTarget.isContain(i))
+                .filter(i -> winningTicket.isContain(i))
                 .count();
-        return PrizeMoney.toPrizeMoney(count);
+
+       if(count == 5 && isContain(bonusNumber)) {
+           return Rank.SECOND;
+       }
+
+       return Rank.toPrizeMoney(count);
     }
 
     public String printTicket() {

diff --git a/src/main/java/step2/domain/PrizeMoney.java b/src/main/java/step2/domain/PrizeMoney.java
diff --git a/src/main/java/step2/domain/Rank.java b/src/main/java/step2/domain/Rank.java
@@ -0,0 +1,49 @@
+package step2.domain;
+
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+
+public enum Rank {
+    MISS(0, 0, "0개 일치 (0)"),
+    FIFTH(3, 5_000, "3개 일치 (5000)"),
+    FOURTH(4, 50_000, "4개 일치 (50000)"),
+    THIRD(5, 1_500_000, "5개 일치 (1500000)"),
+    SECOND(5, 30_000_000, "5개 일치, 보너스 볼 일치(30000000원)"),
+    FIRST(6, 2_000_000_000, "6개 일치 (2000000000)");
+
+    private static final int THIRD_COUNT = 5;
+
+    private int matchCount;
+    private long prizeMoney;
+
+    private String message;
+
+    Rank(int matchCount, long rank, String message) {
+        this.matchCount = matchCount;
+        this.prizeMoney = rank;
+        this.message = message;
+    }
+
+    public static Rank toPrizeMoney(int matchCount) {
+        if (matchCount == THIRD_COUNT) {
+            return Rank.THIRD;
+        }
+
+        return Arrays.stream(values())
+                .filter(prizeMoney -> prizeMoney.matchCount == matchCount)
+                .findAny()
+                .orElse(Rank.MISS);
+    }
+
+    public int matchCount() {
+        return this.matchCount;
+    }
+
+    public long prizeMoney() {
+        return this.prizeMoney;
+    }
+
+    public String message() {
+        return this.message;
+    }
+}
diff --git a/src/main/java/step2/view/InputView.java b/src/main/java/step2/view/InputView.java
@@ -10,6 +10,10 @@ public static int readAmountOfPurchase() {
         return readInt("구매 금액을 입력해 주세요");
     }
 
+    public static int readBonusNumber() {
+        return readInt("보너스 볼을 입력해 주세요.");
+    }
+
     private static int readInt(String message) {
         System.out.println(message);
         return toInt(scanner.nextLine());

diff --git a/src/main/java/step2/view/ResultView.java b/src/main/java/step2/view/ResultView.java
@@ -2,15 +2,12 @@
 
 import step2.domain.LottoResultReport;
 import step2.domain.LottoTicket;
-import step2.domain.PrizeMoney;
+import step2.domain.Rank;
 
 import java.util.List;
 
 public class ResultView {
 
-    private static final int MINIMUM_MATH_COUNT = 3;
-    private static final int MAXIMUM_MATH_COUNT = 6;
-
     public static void printMessage(String message) {
         System.out.println(message);
     }
@@ -27,9 +24,16 @@ public static void printLottoTicket(List<LottoTicket> lottoTickets) {
     }
 
     public static void printResultReport(LottoResultReport lottoResultReport) {
-        for (int i = MINIMUM_MATH_COUNT; i < MAXIMUM_MATH_COUNT + 1; i++) {
-            PrizeMoney prizeMoney = PrizeMoney.toPrizeMoney(i);
-            printMessage(i + "개 일치 (" + PrizeMoney.toPrizeMoney(i).prizeMoney() + ") - " + lottoResultReport.findReportByMatchCount(prizeMoney) + "개");
+        Rank[] values = Rank.values();
+        for (Rank rank : values) {
+            printEachLottoRank(lottoResultReport, rank);
+        }
+    }
+
+    private static void printEachLottoRank(LottoResultReport lottoResultReport, Rank rank) {
+        if (rank == Rank.MISS) {
+            return;
         }
+        printMessage(rank.message() + " - " + lottoResultReport.findReportByMatchCount(rank) + "개");
     }
 }
diff --git a/src/test/java/step2/domain/LottoResultReportTest.java b/src/test/java/step2/domain/LottoResultReportTest.java
@@ -21,11 +21,11 @@ class LottoResultReportTest {
 
         List<Integer> matchCountList = Arrays.asList(3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6);
         for (Integer count : matchCountList) {
-            lottoResultReport.recordRank(PrizeMoney.toPrizeMoney(count));
+            lottoResultReport.recordRank(Rank.toPrizeMoney(count));
         }
 
         for (int i = 3; i < 7; i++) {
-            assertThat(lottoResultReport.findReportByMatchCount(PrizeMoney.toPrizeMoney(i))).isEqualTo(i);
+            assertThat(lottoResultReport.findReportByMatchCount(Rank.toPrizeMoney(i))).isEqualTo(i);
         }
     }
 
@@ -36,7 +36,7 @@ class LottoResultReportTest {
         LottoResultReport lottoResultReport = new LottoResultReport();
         for (int i = 1; i <= 6; i++) {
             if (matchCounts[i] == 0) continue;
-            lottoResultReport.recordRank(PrizeMoney.toPrizeMoney(i));
+            lottoResultReport.recordRank(Rank.toPrizeMoney(i));
         }
         assertThat(lottoResultReport.sum()).isEqualTo(expected);
     }

diff --git a/src/test/java/step2/domain/LottoTicketTest.java b/src/test/java/step2/domain/LottoTicketTest.java
@@ -18,7 +18,7 @@ class LottoTicketTest {
     @MethodSource("winningNumbersSample")
     public void 로또_숫자_일치_개수_비교(List<Integer> winningNumbers, int matchCount) throws Exception {
         LottoTicket lottoTicket = new LottoTicket(Arrays.asList(1, 12, 22, 23, 34, 44));
-        assertThat(lottoTicket.countMatchingNumbers(new LottoTicket(winningNumbers))).isEqualTo(PrizeMoney.toPrizeMoney(matchCount));
+        assertThat(lottoTicket.checkLottoTicket(new LottoTicket(winningNumbers), 0)).isEqualTo(Rank.toPrizeMoney(matchCount));
     }
 
     static Stream<Arguments> winningNumbersSample() throws Throwable {
@@ -32,4 +32,19 @@ static Stream<Arguments> winningNumbersSample() throws Throwable {
         );
     }
 
+    @DisplayName("2등 당첨 케이스를 테스트한다.")
+    @ParameterizedTest
+    @MethodSource("secondRankSample")
+    public void 로또_2등_당첨(List<Integer> numbers, List<Integer> winningNumbers, int bonusNumber) throws Exception {
+        LottoTicket winningTicket = new LottoTicket(winningNumbers);
+        assertThat(new LottoTicket(numbers).checkLottoTicket(winningTicket, bonusNumber)).isEqualTo(Rank.SECOND);
+    }
+
+    static Stream<Arguments> secondRankSample() throws Throwable {
+        return Stream.of(
+                Arguments.of(Arrays.asList(1, 12, 13, 14, 27, 45), Arrays.asList(10, 12, 13, 14, 27, 45), 1),
+                Arguments.of(Arrays.asList(7, 8, 17, 18, 32, 33), Arrays.asList(7, 8, 17, 29, 32, 33), 18),
+                Arguments.of(Arrays.asList(10, 16, 21, 24, 39, 40), Arrays.asList(10, 16, 21, 24, 39, 41), 40)
+        );
+    }
 }
diff --git a/...est/java/step2/domain/PrizeMoneyTest.java → src/test/java/step2/domain/RankTest.java b/...est/java/step2/domain/PrizeMoneyTest.java → src/test/java/step2/domain/RankTest.java
@@ -6,13 +6,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class PrizeMoneyTest {
+class RankTest {
 
     @DisplayName("숫자 일치 갯수별 당첨 상금을 확인한다.")
     @ParameterizedTest
     @CsvSource(value = {"6:2000000000", "5:1500000", "4:50000", "3:5000", "2:0", "1:0"}, delimiter = ':')
     public void 당첨금_확인(int rank, long prizeMoney) throws Exception {
-        assertThat(PrizeMoney.toPrizeMoney(rank).prizeMoney()).isEqualTo(prizeMoney);
+        assertThat(Rank.toPrizeMoney(rank).prizeMoney()).isEqualTo(prizeMoney);
     }
 
 }