[step2] 보너스 볼 기능 추가

Rank enum Class에 FIRST ~ FIFTH 까지 총 5단계로 구성
TicketOffice에서 보너스를 처리하는 메서드 : checkBonusNumber(), setBonusNumber() 추가
이에 따른 InputView, OutputView 개선

src/main/java/Main.java

@@ -8,6 +8,7 @@ public static void main(String[] args) {
         TicketOffice to = new TicketOffice();
         List<LottoTicket> tickets = to.issueTickets();
         to.setWinningNumber();
+        to.setBonusNumber();
         to.getStatistic(tickets);
     }
 }

src/main/java/domain/Rank.java

@@ -1,10 +1,11 @@
 package domain;
 
 public enum Rank {
-    FORTH(3, 5000),
-    THIRD(4, 50000),
-    SECOND(5, 1500000),
-    FIRST(6, 2000000000);
+    FIFTH(3, 5_000),
+    FORTH(4, 50_000),
+    THIRD(5, 1_500_000),
+    SECOND(7, 30_000_000),
+    FIRST(6, 2_000_000_000);
 
     private final int matchedNumber;
     private final int prize;
@@ -18,17 +19,19 @@ public int getMatchedNumber() {
         return matchedNumber;
     }
 
-    public int getPrize(){
+    public int getPrize() {
         return prize;
     }
 
-    public static Rank designateRank(int matchedNumber) {
+    public static Rank designateRank(int matchedNumber, boolean isBonus) {
         switch (matchedNumber) {
             case 3:
-                return FORTH;
+                return FIFTH;
             case 4:
-                return THIRD;
+                return FORTH;
             case 5:
+                return THIRD;
+            case 7:
                 return SECOND;
             default:
                 return FIRST;

src/main/java/domain/TicketOffice.java

@@ -11,6 +11,7 @@ public class TicketOffice {
     private final int SELECTED_NUMBER = 6;
     private final int PRICE = 1000;
     private int TOTAL_PRICE;
+    private int bonusNumber;
     private List<Integer> winningNumbers = new ArrayList<>();
     private Map<Integer, Integer> statistics = new HashMap<>();
 
@@ -19,6 +20,7 @@ public class TicketOffice {
         statistics.put(4, 0);
         statistics.put(5, 0);
         statistics.put(6, 0);
+        statistics.put(7, 0);
     }
 
 
@@ -59,8 +61,7 @@ public List<LottoTicket> issueTickets() {
             for (int i = 0; i < numberOfTickets; i++) {
                 tickets.add(makeAutoTicket());
             }
-        }
-        else {
+        } else {
             for (int i = 0; i < numberOfTickets; i++) {
                 tickets.add(makeManualTicket());
             }
@@ -76,25 +77,41 @@ public void setWinningNumber() {
         }
     }
 
+    public void setBonusNumber() { // 추후 당첨 번호에 없는 번호만 받도록 예외처리 필요
+        bonusNumber = InputView.getBonusNumber();
+    }
+
     public void getStatistic(List<LottoTicket> tickets) {
         int matchedNumber = 0;
+        boolean isBonus = false;
         for (LottoTicket ticket : tickets) {
             matchedNumber = checkWinningNumber(ticket.getTicketInfo());
+            isBonus = checkBonusNumber(ticket.getTicketInfo());
+            matchedNumber += temp(matchedNumber, isBonus);
             statistics.computeIfPresent(matchedNumber, (k, v) -> v + 1);
         }
-        OutputView.showWinningResult(this.statistics, calculateProfit());
+        OutputView.showWinningResult(this.statistics, calculateProfit(isBonus));
     }
 
-    public double calculateProfit() {
+    private int temp(int matchedNumber, boolean isBonus){
+        if (matchedNumber == 5){
+            if(isBonus){
+                return 2;
+            }
+        }
+        return 0;
+    }
+
+    public double calculateProfit(boolean isBonus) {
         int totalPrize = 0;
         for (Integer matchedNumber : statistics.keySet()) {
-            totalPrize += (switchPrize(matchedNumber) * statistics.get(matchedNumber));
+            totalPrize += (switchPrize(matchedNumber, isBonus) * statistics.get(matchedNumber));
         }
         return ((double) (totalPrize - TOTAL_PRICE) / TOTAL_PRICE) * 100;
     }
 
-    private int switchPrize(int matchedNumber) {
-        return Rank.designateRank(matchedNumber).getPrize();
+    private int switchPrize(int matchedNumber, boolean isBonus) {
+        return Rank.designateRank(matchedNumber, isBonus).getPrize();
     }
 
     private int checkWinningNumber(List<Integer> ticketInfo) {
@@ -105,6 +122,13 @@ private int checkWinningNumber(List<Integer> ticketInfo) {
         return count;
     }
 
+    private boolean checkBonusNumber(List<Integer> ticketInfo) {
+        if (ticketInfo.contains(bonusNumber)) {
+            return true;
+        }
+        return false;
+    }
+
     private int isWinningNumber(int number) {
         if (winningNumbers.contains(number)) {
             return 1;

src/main/java/view/InputView.java

@@ -18,7 +18,7 @@ public static int getAmount() {
 
     public static String[] getWinningNumber() {
         sc = new Scanner(System.in);
-        System.out.println("\n당첨 번호를 입력해 주세요.");
+        System.out.println("\n지난 주 당첨 번호를 입력해 주세요.");
         return sc.nextLine().split(",");
     }
 
@@ -39,4 +39,10 @@ public static List<Integer> getManualNumber() {
             manualNumber.add(Integer.parseInt(number));
         return manualNumber;
     }
+
+    public static int getBonusNumber(){
+        sc = new Scanner(System.in);
+        System.out.println("보너스 볼을 입력해 주세요.");
+        return Integer.parseInt(sc.nextLine());
+    }
 }

src/main/java/view/OutputView.java

@@ -17,16 +17,27 @@ public static void completePurchase(int numberOfTickets, int change, List<LottoT
     }
 
     public static void showWinningResult(Map<Integer, Integer> statistics, double profitRate) {
-        System.out.println("\n당첨 통계");
-        System.out.println("__________");
+        StringBuilder sb = new StringBuilder();
         int matchedNumber;
         int prize;
-        for (Rank pa : Rank.values()) {
-            matchedNumber = pa.getMatchedNumber();
-            prize = pa.getPrize();
-            System.out.printf("%d개 일치 (%d원) - %d개", matchedNumber, prize, statistics.get(matchedNumber));
-            System.out.println();
+        sb.append("\n당첨 통계\n");
+        sb.append("__________\n");
+        for (Rank rank : Rank.values()) {
+            matchedNumber = rank.getMatchedNumber();
+            prize = rank.getPrize();
+            if (rank == Rank.SECOND){
+                matchedNumber -= 2;
+            }
+            sb.append(matchedNumber).append("개 일치");
+
+            if (rank == Rank.SECOND){
+                matchedNumber += 2;
+                sb.append(", 보너스 볼 일치");
+            }
+            sb.append(" (").append(prize).append(")원 - ");
+            sb.append(statistics.get(matchedNumber)).append("개\n");
         }
+        System.out.println(sb.toString());
         System.out.printf("총 수익률은 %.2f%%입니다.", profitRate);
     }
 }