[step2] Rank 수정, 당첨 통계 Map key Integer -> Rank 수정

Enum 클래스인 Rank를 수정해 boolean 값인 isBonus를 가지고 있게 하고, LottoCompany의 멤버변수 statisctic의 key를 Rank로 변경.

build/tmp/compileJava/source-classes-mapping.txt

@@ -1,12 +1,16 @@
-view/InputView.java
- view.InputView
+Main.java
+ Main
 domain/Rank.java
  domain.Rank
 view/OutputView.java
  view.OutputView
 domain/LottoTicket.java
  domain.LottoTicket
-Main.java
- Main
+view/InputView.java
+ view.InputView
+domain/User.java
+ domain.User
 domain/TicketOffice.java
  domain.TicketOffice
+domain/LottoCompany.java
+ domain.LottoCompany

src/main/java/domain/LottoCompany.java

@@ -10,13 +10,13 @@ public class LottoCompany {
     private int bonusNumber;
     private int totalPrice;
     private final int PRICE = 1000;
-    private final Map<Integer, Integer> statistics = new HashMap<>();
-    {
-        statistics.put(3, 0);
-        statistics.put(4, 0);
-        statistics.put(5, 0);
-        statistics.put(6, 0);
-        statistics.put(7, 0);
+    private final Map<Rank, Integer> statistics = new HashMap<>();
+
+
+    public void setInitialStatistic() {
+        for (Rank rank : Rank.values()) {
+            statistics.put(rank, 0);
+        }
     }
 
     public void check(List<LottoTicket> tickets){
@@ -35,13 +35,14 @@ public void setBonusNumber() { // 추후 당첨 번호에 없는 번호만 받
     }
 
     public void getStatistic(List<LottoTicket> tickets) {
+        setInitialStatistic();
         int matchedNumber;
         boolean isBonus;
         for (LottoTicket ticket : tickets) {
             matchedNumber = ticket.comparisonWinningTicket(this.winningTicket);
             isBonus = ticket.checkBonusNumber(this.bonusNumber);
-            matchedNumber += addMatchedForBonus(matchedNumber, isBonus);
-            statistics.computeIfPresent(matchedNumber, (k, v) -> v + 1);
+            Rank currentRank = Rank.designateRank(matchedNumber, isBonus);
+            statistics.computeIfPresent(currentRank, (k, v) -> v + 1);
         }
         OutputView.showWinningResult(this.statistics, calculateProfit());
     }
@@ -55,13 +56,10 @@ private int addMatchedForBonus(int matchedNumber, boolean isBonus){
 
     public double calculateProfit() {
         int totalPrize = 0;
-        for (int matchedNumber : this.statistics.keySet()) {
-            totalPrize += (switchPrize(matchedNumber) * statistics.get(matchedNumber));
+        for (Rank rank : this.statistics.keySet()) {
+            totalPrize += rank.getPrize() * statistics.get(rank);
         }
         return ((double) (totalPrize - totalPrice) / totalPrice) * 100;
     }
 
-    private int switchPrize(int matchedNumber) {
-        return Rank.designateRank(matchedNumber).getPrize();
-    }
 }

src/main/java/domain/Rank.java

@@ -1,18 +1,20 @@
 package domain;
 
 public enum Rank {
-    FIFTH(3, 5_000),
-    FORTH(4, 50_000),
-    THIRD(5, 1_500_000),
-    SECOND(7, 30_000_000),
-    FIRST(6, 2_000_000_000);
+    FIFTH(3, 5_000, false),
+    FORTH(4, 50_000, false),
+    THIRD(5, 1_500_000, false),
+    SECOND(5, 30_000_000, true),
+    FIRST(6, 2_000_000_000, false);
 
     private final int matchedNumber;
     private final int prize;
+    private final boolean isBonus;
 
-    private Rank(int matchedNumber, int prize) {
+    private Rank(int matchedNumber, int prize, boolean isBonus) {
         this.matchedNumber = matchedNumber;
         this.prize = prize;
+        this.isBonus = isBonus;
     }
 
     public int getMatchedNumber() {
@@ -23,16 +25,16 @@ public int getPrize() {
         return prize;
     }
 
-    public static Rank designateRank(int matchedNumber) {
+    public static Rank designateRank(int matchedNumber, boolean isBonus) {
         switch (matchedNumber) {
             case 3:
                 return FIFTH;
             case 4:
                 return FORTH;
             case 5:
+                if (isBonus)
+                    return SECOND;
                 return THIRD;
-            case 7:
-                return SECOND;
             default:
                 return FIRST;
         }

src/main/java/view/OutputView.java

@@ -16,7 +16,7 @@ public static void completePurchase(int numberOfTickets, int change, List<LottoT
         }
     }
 
-    public static void showWinningResult(Map<Integer, Integer> statistics, double profitRate) {
+    public static void showWinningResult(Map<Rank, Integer> statistics, double profitRate) {
         StringBuilder sb = new StringBuilder();
         int matchedNumber;
         int prize;