[SCG] 이찬형 로또 3-4단계 제출합니다.

README.md

@@ -37,3 +37,13 @@
 * 로또별로 로또 당첨된 개수를 파악한다.
 * 일치하는 당첨개수별로 수를 센다.
 * 수익률을 계산한다.
+
+### 로또 2등 당첨
+
+* 2등을 위한 보너스볼을 추첨한다.
+* 당첨 통계에 2등을 추가한다.
+
+### 로또 수동 구매
+
+* 사용자가 수동으로 추첨 번호를 입력할 수 있도록 해야 한다.
+* 입력한 금액, 자동 생성 숫자, 수동 생성 번호를 입력하도록 해야 한다.

src/main/java/lotto/LottoDraw.java

@@ -5,13 +5,14 @@
 
 public class LottoDraw {
     private final Lotto drawnLotto;
+    private final LottoNumber bonusNumber;
     private final LottoReceipt receipt;
     private final MatchingCounts counts;
 
-    public LottoDraw(Lotto drawnLotto, LottoReceipt receipt) {
+    public LottoDraw(Lotto drawnLotto, LottoNumber bonusNumber, LottoReceipt receipt) {
         this.drawnLotto = drawnLotto;
+        this.bonusNumber = bonusNumber;
         this.receipt = receipt;
-
         this.counts = getNumberCount();
     }
 
@@ -32,7 +33,9 @@ private LottoResult getLottoResult(Lotto lottoRow) {
 
         int matchingCount = numbers.size();
 
-        return LottoResult.valueOf(matchingCount);
+        boolean matchBonus = lottoRow.numbers().contains(bonusNumber);
+
+        return LottoResult.valueOf(matchingCount, matchBonus);
     }
 
     public int getCount(LottoResult result) {

src/main/java/lotto/LottoPurchase.java

@@ -1,30 +1,53 @@
 package lotto;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class LottoPurchase {
     private static final int LOTTO_PRICE = 1000;
 
     private final Lottos lottos;
     private final int totalPrice;
     private final int change;
+    private final int manualCount;
 
-    public LottoPurchase(int totalPrice, LottoMaker lottoMaker) {
+    public LottoPurchase(int totalPrice, List<Lotto> manualLottos, LottoMaker lottoMaker) {
         this.totalPrice = totalPrice;
+        this.change = totalPrice % LOTTO_PRICE;
+        this.manualCount = manualLottos.size();
+
+        int totalTicketCount = totalPrice / LOTTO_PRICE;
+        int autoCount = totalTicketCount - manualCount;
 
-        int numberOfLotto = this.totalPrice / LOTTO_PRICE;
-        change = totalPrice % LOTTO_PRICE;
+        if (autoCount < 0) {
+            throw new IllegalArgumentException("구입 금액보다 많은 수동 로또를 선택하셨습니다.");
+        }
 
-        this.lottos = Lottos.from(numberOfLotto, lottoMaker);
+        List<Lotto> combinedLottos = new ArrayList<>(manualLottos);
+        for (int i = 0; i < autoCount; i++) {
+            combinedLottos.add(lottoMaker.makeLotto());
+        }
+
+        this.lottos = new Lottos(combinedLottos);
     }
 
     public LottoReceipt printReceipt() {
         return new LottoReceipt(lottos, totalPrice);
     }
 
+    public int getManualCount() {
+        return manualCount;
+    }
+
+    public int getAutoCount() {
+        return getNumberOfLotto() - manualCount;
+    }
+
     public int getNumberOfLotto() {
         return lottos.size();
     }
 
     public int getChange() {
         return change;
     }
-}
+}

src/main/java/lotto/LottoResult.java

@@ -5,6 +5,7 @@ public enum LottoResult {
     THREE(3, 5_000),
     FOUR(4, 50_000),
     FIVE(5, 1_500_000),
+    BONUS(5, 30_000_000),
     SIX(6, 2_000_000_000);
 
     private final int matchingCount;
@@ -15,20 +16,24 @@ public enum LottoResult {
         this.reward = reward;
     }
 
-    public static LottoResult valueOf(int count) {
+    public static LottoResult valueOf(int count, boolean matchBonus) {
+        if (count == 5 && matchBonus) {
+            return BONUS;
+        }
+
         for (LottoResult result : values()) {
-            if (result.matchingCount == count) {
+            if (result != BONUS && result.matchingCount == count) {
                 return result;
             }
         }
-        // 3개 미만은 모두 NONE으로 처리
-        if (count >= 0 && count < 3) {
-            return NONE;
-        }
-        throw new IllegalArgumentException("유효하지 않은 당첨 개수입니다: " + count);
+        return NONE;
+    }
+
+    public int getMatchingCount() {
+        return matchingCount;
     }
 
-    public int getReward(){
+    public int getReward() {
         return reward;
     }
 }

src/main/java/lotto/Main.java

@@ -6,65 +6,111 @@
 public class Main {
     private static final LottoMaker LOTTO_MAKER = new LottoMaker();
     private static final LottoParser LOTTO_PARSER = new LottoParser();
+    private static final Scanner SC = new Scanner(System.in);
 
     public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
-        int totalPrice;
+        int price = inputPrice();
+        if (price < 1000) {
+            return;
+        }
 
-        System.out.println("구입금액을 입력해 주세요. (ex. 1000) (숫자가 아닌 경우 0으로 간주)");
+        LottoPurchase purchase = buyLottos(price);
+        LottoReceipt receipt = purchase.printReceipt();
+        displayReceiptInfo(receipt, purchase.getChange());
 
-        try {
-            totalPrice = Integer.parseInt(scanner.nextLine());
-        } catch (NumberFormatException e) {
-            totalPrice = 0;
-        }
+        displayResult(runDraw(receipt));
+    }
 
-        System.out.println();
+    private static LottoPurchase buyLottos(int price) {
+        int manualCount = inputManualCount();
+        List<Lotto> manuals = inputManualNumbers(manualCount);
 
-        LottoPurchase purchase = purchaseAndPrintLotto(totalPrice);
-        LottoReceipt receipt = purchase.printReceipt();
-        displayReceipt(receipt);
-        displayChange(purchase.getChange());
+        LottoPurchase purchase = new LottoPurchase(price, manuals, LOTTO_MAKER);
+        System.out.printf("\n수동 %d장, 자동 %d개를 구매했습니다.\n",
+                manualCount, purchase.getNumberOfLotto() - manualCount);
+        return purchase;
+    }
 
-        System.out.println();
-        System.out.println("지난주 당첨 번호를 입력해 주세요.");
-        Lotto drawnLotto = LOTTO_PARSER.parse(scanner.nextLine());
+    private static LottoDraw runDraw(LottoReceipt receipt) {
+        System.out.println("\n지난주 당첨 번호를 입력해 주세요.");
+        Lotto winningLotto = LOTTO_PARSER.parse(SC.nextLine());
+        LottoNumber bonus = getValidBonus(winningLotto);
+        return new LottoDraw(winningLotto, bonus, receipt);
+    }
 
-        LottoDraw draw = new LottoDraw(drawnLotto, receipt);
-        System.out.println();
-        displayResult(draw);
+    private static LottoNumber getValidBonus(Lotto winningLotto) {
+        while (true) {
+            LottoNumber bonus = bonusBall();
+            if (!winningLotto.numbers().contains(bonus)) {
+                return bonus;
+            }
+            System.out.println("보너스 볼은 당첨 번호와 같을 수 없습니다.");
+        }
     }
 
-    private static LottoPurchase purchaseAndPrintLotto(int totalPrice) {
-        LottoPurchase purchase = new LottoPurchase(totalPrice, LOTTO_MAKER);
-        System.out.println(purchase.getNumberOfLotto() + "개를 구매했습니다.");
-        return purchase;
+    private static LottoNumber bonusBall() {
+        System.out.println("보너스 볼을 입력해 주세요.");
+        try {
+            int bonusValue = Integer.parseInt(SC.nextLine());
+            return new LottoNumber(bonusValue);
+        } catch (NumberFormatException e) {
+            System.out.println("숫자를 입력해 주세요.");
+            return bonusBall();
+        }
+    }
+
+    private static int inputPrice() {
+        System.out.println("구입금액을 입력해 주세요. (ex. 1000)");
+        try {
+            int price = Integer.parseInt(SC.nextLine());
+            if (price < 1000) {
+                System.out.println("1000원 이상 입력해야 합니다. 로또를 살 수 없으므로 종료합니다.");
+            }
+            return price;
+        } catch (NumberFormatException e) {
+            return 0;
+        }
+    }
+
+    private static int inputManualCount() {
+        System.out.println("\n수동으로 구매할 로또 수를 입력해 주세요.");
+        return Integer.parseInt(SC.nextLine());
     }
 
-    private static void displayReceipt(LottoReceipt receipt) {
-        for (Lotto lotto : receipt.lottos().getLottos()) {
-            List<String> nums = lotto.numbers().stream()
-                    .map(LottoNumber::toString)
-                    .toList();
-            System.out.println("[" + String.join(", ", nums) + "]");
+    private static List<Lotto> inputManualNumbers(int count) {
+        if (count <= 0) {
+            System.out.println("로또를 구매할 수 없습니다.");
+
         }
+        System.out.println("\n수동으로 구매할 번호를 입력해 주세요.");
+        return java.util.stream.IntStream.range(0, count)
+                .mapToObj(i -> LOTTO_PARSER.parse(SC.nextLine()))
+                .toList();
     }
 
-    private static void displayChange(int change) {
-        if (change != 0) {
+    private static void displayReceiptInfo(LottoReceipt receipt, int change) {
+        receipt.lottos().getLottos().forEach(lotto -> {
+            List<String> s = lotto.numbers().stream().map(Object::toString).toList();
+            System.out.println("[" + String.join(", ", s) + "]");
+        });
+        if (change > 0) {
             System.out.println(change + "원이 남았습니다.");
         }
     }
 
     private static void displayResult(LottoDraw draw) {
-        System.out.println("당첨 통계");
-        System.out.println("---------");
-
-        System.out.println("3개 일치 (" + LottoResult.THREE.getReward() + "원)- " + draw.getCount(LottoResult.THREE));
-        System.out.println("4개 일치 (" + LottoResult.FOUR.getReward() + "원)- " + draw.getCount(LottoResult.FOUR));
-        System.out.println("5개 일치 (" + LottoResult.FIVE.getReward() + "원)- " + draw.getCount(LottoResult.FIVE));
-        System.out.println("6개 일치 (" + LottoResult.SIX.getReward() + "원)- " + draw.getCount(LottoResult.SIX));
-
+        System.out.println("\n당첨 통계\n---------");
+        for (LottoResult res : LottoResult.values()) {
+            if (res == LottoResult.NONE) {
+                continue;
+            }
+            displayRank(res, draw.getCount(res));
+        }
         System.out.println("총 수익률은 " + draw.getRateOfReturn() + "입니다.");
     }
+
+    private static void displayRank(LottoResult res, int count) {
+        String label = res == LottoResult.BONUS ? "5개 일치, 보너스 볼 일치" : res.getMatchingCount() + "개 일치";
+        System.out.printf("%s (%d원)- %d\n", label, res.getReward(), count);
+    }
 }