[그리디] 이고은 로또 미션 3, 4, 5단계 제출합니다.

README.md

@@ -1,4 +1,4 @@
-## 로또 미션 1-2단계
+## 로또 미션 1-5단계
 
 ### 기능 요구사항
 
@@ -23,6 +23,13 @@
   - 소수점 둘째 자리까지 표시한다.
   - 1미만시 손해이고 1이상이면 이득이다.
 
-### 추가된 기능 요구사항
-1. 모든 원시 값과 문자열을 포장한다.
-2. 일급 컬렉션을 쓴다
+#### 3단계
+- 보너스볼이 들어온다
+- 5개 일치 + 보너스볼 일치: 30000000원 
+- 5개 일치 + 보너스볼 일치하지 않음 : 1500000원
+
+#### 4단계
+- 사용자는 수동으로 구매할 로또 수를 입력할 수 있다.
+
+#### 5단계
+- 리팩토링하기

src/main/java/Main.java

@@ -2,7 +2,6 @@
 
 public class Main {
     public static void main(String[] args) {
-
         LottoController lottoController = new LottoController();
         lottoController.run();
     }

src/main/java/controller/LottoController.java

@@ -1,56 +1,137 @@
 package controller;
 
-import domain.*;
+import domain.Lotto;
+import domain.LottoNumber;
+import domain.LottoService;
+import domain.LottoTicketCount;
+import domain.Lottos;
+import domain.LottoTotalPrice;
+import domain.Money;
+import domain.MatchCount;
+import domain.ProfitRate;
 import view.InputView;
 import view.OutputView;
 import view.ResultView;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 public class LottoController {
+
     OutputView outputView = new OutputView();
     InputView inputView = new InputView();
     ResultView resultView = new ResultView();
 
     public void run() {
         outputView.printWonMessage();
-        Money money = new Money(inputView.inputMoney());
+        Money money;
+        while (true) {
+            try {
+                money = new Money(inputView.inputMoney());
+                break;
+            } catch (IllegalArgumentException e) {
+                System.out.println(e.getMessage());
+                System.out.println("다시 입력해주세요.");
+            }
+        }
 
-        LottoTickets lottoTickets = buyLotto(money);
+        Lottos lottoTickets = buyLotto(money);
         checkLotto(lottoTickets, money);
     }
 
 
-    public LottoTickets buyLotto(Money money) {
-
-        LottoTicketCount ticketNumber = Money.getTicketCount(money);
+    public Lottos buyLotto(Money money) {
+        LottoTicketCount ticketNumber = money.getTicketCount();
         resultView.printTicketNumbers(ticketNumber.getCount());
 
+        outputView.printManualCount();
+        int manualCount;
+
+        while (true) {
+            try {
+                manualCount = inputView.inputManualCount();
+                ticketNumber.validateManualCount(manualCount);
+                break;
+            } catch (IllegalArgumentException e) {
+                System.out.println(e.getMessage());
+                System.out.println("다시 입력해주세요.");
+            }
+        }
+
+        List<Lotto> manualLottos = new ArrayList<>();
+        outputView.printManualNumbers();
+
+        LottoService lottoService = new LottoService();
+        for (int i = 0; i < manualCount; i++) {
+            while (true) {
+                try {
+                    String manualNumbers = inputView.inputManualNumbers();
+                    Lotto lotto = lottoService.parseLottoAnswer(manualNumbers);
+                    manualLottos.add(lotto);
+                    break;
+                } catch (IllegalArgumentException e) {
+                    System.out.println(e.getMessage());
+                    System.out.println("다시 입력해주세요.");
+                }
+            }
+        }
+
+        int autoCount = ticketNumber.getCount() - manualCount;
+
+        resultView.printManualAuto(manualCount, autoCount);
         outputView.lottoResult();
+        Lottos lottoTickets = Lottos.createMixedTickets(manualLottos, autoCount);
 
-        LottoTickets lottoTickets = new LottoTickets(ticketNumber);
         for (Lotto lotto : lottoTickets.getTickets()) {
             System.out.println(lotto);
         }
+
         return lottoTickets;
     }
 
-    public void checkLotto(LottoTickets lottoTickets, Money money) {
+
+    public void checkLotto(Lottos ticketAutoCount, Money money) {
         outputView.printLottoAnswer();
 
         LottoService lottoService = new LottoService();
-        String lottoAnswer = inputView.inputLottoAnswer();
+
+        Lotto lottoAnswerObj = null;
+        while (lottoAnswerObj == null) {
+            try {
+                String lottoAnswer = inputView.inputLottoAnswer();
+                lottoAnswerObj = lottoService.parseLottoAnswer(lottoAnswer);
+            } catch (IllegalArgumentException e) {
+                System.out.println(e.getMessage());
+                System.out.println("다시 입력해주세요.");
+            }
+        }
+
         outputView.printBonusMessage();
-        int bonusBallNumber = inputView.inputBonusNumber();
-        LottoNumber bonuseBall = new LottoNumber(bonusBallNumber);
 
-        Lotto lottoAnswerObj = lottoService.parseLottoAnswer(lottoAnswer);
-        MatchCount matchCount = lottoService.calculateMatchCount(lottoTickets.getTickets(), lottoAnswerObj, bonuseBall);
+        LottoNumber bonusBall;
+        while (true) {
+            try {
+                int bonusBallNumber = inputView.inputBonusNumber();
+                bonusBall = new LottoNumber(bonusBallNumber);
+                lottoService.validateBonusBall(lottoAnswerObj, bonusBall);
+                break;
+            } catch (IllegalArgumentException e) {
+                System.out.println(e.getMessage());
+                System.out.println("다시 입력해주세요.");
+            }
+        }
+
+        MatchCount matchCount = lottoService.calculateMatchCount(
+                ticketAutoCount.getTickets(),
+                lottoAnswerObj,
+                bonusBall);
 
-        int totalSum = LottoProfit.LottoSum(matchCount);
-//        ProfitRate profitRate = new ProfitRate(money, new LottoTotalPrice(totalSum));
         ProfitRate profitRate = new ProfitRate(money, new LottoTotalPrice(matchCount));
 
+        outputView.lottoResult();
         resultView.printLottoMatch(matchCount);
         resultView.printLottoProfit(profitRate.getProfitRate());
     }
+
 }

src/main/java/domain/Lotto.java

@@ -4,17 +4,22 @@
 import java.util.TreeSet;
 
 public class Lotto {
+
     private final SortedSet<LottoNumber> numbers;
 
     public Lotto(SortedSet<LottoNumber> numbers) {
-        if (numbers.size() != 6) {
+        validateSize(numbers);
+        this.numbers = new TreeSet<>(numbers);
+    }
+
+    private void validateSize(SortedSet<LottoNumber> numbers) {
+        if (numbers.size() != createList.LOTTO_NUMBER_COUNT) {
             throw new IllegalArgumentException("로또 숫자는 6개여야 하며, 중복될 수 없습니다.");
         }
-        this.numbers = new TreeSet<>(numbers);
     }
 
     public int contains(LottoNumber number) {
-        if(numbers.contains(number)) return 1;
+        if (numbers.contains(number)) return 1;
         return 0;
     }
 

src/main/java/domain/LottoNumber.java

@@ -1,10 +1,11 @@
 package domain;
 
 public class LottoNumber implements Comparable<LottoNumber> {
+
     private final int number;
 
     public LottoNumber(int number) {
-        if (number < createList.LOTTO_MIN_NUMBER|| number > createList.LOTTO_MAX_NUMBER) {
+        if (number < createList.LOTTO_MIN_NUMBER || number > createList.LOTTO_MAX_NUMBER) {
             throw new IllegalArgumentException("로또 번호는 1부터 45 사이의 숫자여야 합니다.");
         }
         this.number = number;
@@ -35,4 +36,5 @@ public int hashCode() {
     public String toString() {
         return String.valueOf(number);
     }
+
 }

src/main/java/domain/LottoPrice.java

@@ -16,4 +16,5 @@ public enum LottoPrice {
     public int getPrice() {
         return price;
     }
+
 }

src/main/java/domain/LottoService.java

@@ -1,12 +1,11 @@
 package domain;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.stream.Collectors;
 
 public class LottoService {
+
     public Lotto parseLottoAnswer(String lottoAnswer) {
         SortedSet<LottoNumber> numbers = new TreeSet<>();
         for (String num : lottoAnswer.split(",")) {
@@ -15,11 +14,15 @@ public Lotto parseLottoAnswer(String lottoAnswer) {
         return new Lotto(numbers);
     }
 
+    public void validateBonusBall(Lotto answer, LottoNumber bonusBall) {
+        if (answer.getNumbers().contains(bonusBall)) {
+            throw new IllegalArgumentException("보너스 볼은 당첨 번호와 중복될 수 없습니다.");
+        }
+    }
+
     public MatchCount calculateMatchCount(List<Lotto> tickets, Lotto answer, LottoNumber bonusBall) {
-        MatchCount matchCount = MatchCount.countAllMatches(tickets, answer);
-        MatchCount bonusCount = MatchCount.countBonusBallMatches(tickets, answer, bonusBall);
-        matchCount.merge(bonusCount);
-        return matchCount;
+        return MatchCount.calculateStatistics(tickets, answer, bonusBall);
     }
+
 }
 

src/main/java/domain/LottoTicketCount.java

@@ -1,13 +1,24 @@
 package domain;
 
 public class LottoTicketCount {
+
     private final int count;
 
     public LottoTicketCount(int count) {
+        if(count < 0) {
+            throw new IllegalArgumentException("로또 티켓 수는 0장 이상이어야 합니다.");
+        }
         this.count = count;
     }
 
     public int getCount() {
         return count;
     }
+
+    public void validateManualCount(int manualCount) {
+        if (manualCount < 0 || manualCount > count) {
+            throw new IllegalArgumentException("수동으로 구매할 로또 수는 0 이상이여야 하며, 구매 가능한 티켓 수를 초과할 수 없습니다.");
+        }
+    }
+
 }

src/main/java/domain/LottoTotalPrice.java

@@ -1,21 +1,20 @@
 package domain;
 
-import java.util.Arrays;
-
 public class LottoTotalPrice {
+
     private final long totalSum;
 
     public LottoTotalPrice(MatchCount matchCount) {
-        this.totalSum = calculateTotalSum(matchCount);
-    }
-
-    private long calculateTotalSum(MatchCount matchCount) {
-        return Arrays.stream(LottoPrice.values())
-                .mapToLong(price -> (long) matchCount.getCount(price) * price.getPrice())
-                .sum();
+        this.totalSum =
+                ((long) matchCount.getCount(LottoPrice.MATCH_3) * LottoPrice.MATCH_3.getPrice()) +
+                        ((long) matchCount.getCount(LottoPrice.MATCH_4) * LottoPrice.MATCH_4.getPrice()) +
+                        ((long) matchCount.getCount(LottoPrice.MATCH_5) * LottoPrice.MATCH_5.getPrice()) +
+                        ((long) matchCount.getCount(LottoPrice.MATCH_5_BONUS) * LottoPrice.MATCH_5_BONUS.getPrice()) +
+                        ((long) matchCount.getCount(LottoPrice.MATCH_6) * LottoPrice.MATCH_6.getPrice());
     }
 
     public long getTotalSum() {
         return totalSum;
     }
+
 }