[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 int bonusNumber;
     private final LottoReceipt receipt;
     private final MatchingCounts counts;
 
-    public LottoDraw(Lotto drawnLotto, LottoReceipt receipt) {
+    public LottoDraw(Lotto drawnLotto, int bonusNumber, LottoReceipt receipt) {
         this.drawnLotto = drawnLotto;
+        this.bonusNumber = bonusNumber;
         this.receipt = receipt;
-
         this.counts = getNumberCount();
     }
 
@@ -32,7 +33,10 @@ private LottoResult getLottoResult(Lotto lottoRow) {
 
         int matchingCount = numbers.size();
 
-        return LottoResult.valueOf(matchingCount);
+        boolean matchBonus = lottoRow.numbers().stream()
+                .anyMatch(num -> num.number() == bonusNumber);
+
+        return LottoResult.valueOf(matchingCount, matchBonus);
     }
 
     public int getCount(LottoResult result) {
@@ -43,4 +47,4 @@ public float getRateOfReturn() {
         int sumOfReturn = counts.getSumOfReturn();
         return (float) sumOfReturn / receipt.totalPrice();
     }
-}
+}

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,29 @@ public enum LottoResult {
         this.reward = reward;
     }
 
-    public static LottoResult valueOf(int count) {
-        for (LottoResult result : values()) {
-            if (result.matchingCount == count) {
-                return result;
-            }
+    public static LottoResult valueOf(int matchingCount, boolean matchBonus) {
+        if (matchingCount == 6) {
+            return SIX;
         }
-        // 3개 미만은 모두 NONE으로 처리
-        if (count >= 0 && count < 3) {
+        if (matchingCount == 5 && matchBonus) {
+            return BONUS;
+        }
+        if (matchingCount == 5) {
+            return FIVE;
+        }
+        if (matchingCount == 4) {
+            return FOUR;
+        }
+        if (matchingCount == 3) {
+            return THREE;
+        }
+        if (matchingCount < 3 && matchingCount >= 0) {
             return NONE;
         }
-        throw new IllegalArgumentException("유효하지 않은 당첨 개수입니다: " + count);
+        throw new IllegalArgumentException("유효하지 않은 당첨 개수입니다: " + matchingCount);
     }
 
-    public int getReward(){
+    public int getReward() {
         return reward;
     }
-}
+}

src/main/java/lotto/Main.java

@@ -1,5 +1,6 @@
 package lotto;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
 
@@ -9,7 +10,7 @@ public class Main {
 
     public static void main(String[] args) {
         Scanner scanner = new Scanner(System.in);
-        int totalPrice;
+        int totalPrice, numberOfManual;
 
         System.out.println("구입금액을 입력해 주세요. (ex. 1000) (숫자가 아닌 경우 0으로 간주)");
 
@@ -21,7 +22,22 @@ public static void main(String[] args) {
 
         System.out.println();
 
-        LottoPurchase purchase = purchaseAndPrintLotto(totalPrice);
+        System.out.println("수동으로 구매할 로또 수를 입력해 주세요.");
+        numberOfManual = Integer.parseInt(scanner.nextLine());
+
+        System.out.println();
+
+        System.out.println("수동으로 구매할 번호를 입력해 주세요.");
+        List<Lotto> manualLottos = new ArrayList<>();
+        for (int i = 0; i < numberOfManual; i++) {
+            manualLottos.add(LOTTO_PARSER.parse(scanner.nextLine()));
+        }
+
+        LottoPurchase purchase = new LottoPurchase(totalPrice, manualLottos, LOTTO_MAKER);
+
+        System.out.println("\n수동으로 " + numberOfManual + "장, 자동으로 " +
+                (purchase.getNumberOfLotto() - numberOfManual) + "개를 구매했습니다.");
+
         LottoReceipt receipt = purchase.printReceipt();
         displayReceipt(receipt);
         displayChange(purchase.getChange());
@@ -30,16 +46,14 @@ public static void main(String[] args) {
         System.out.println("지난주 당첨 번호를 입력해 주세요.");
         Lotto drawnLotto = LOTTO_PARSER.parse(scanner.nextLine());
 
-        LottoDraw draw = new LottoDraw(drawnLotto, receipt);
+        System.out.println("보너스 볼을 입력해 주세요.");
+        int bonusNumber = Integer.parseInt(scanner.nextLine());
+
+        LottoDraw draw = new LottoDraw(drawnLotto, bonusNumber, receipt);
         System.out.println();
         displayResult(draw);
     }
 
-    private static LottoPurchase purchaseAndPrintLotto(int totalPrice) {
-        LottoPurchase purchase = new LottoPurchase(totalPrice, LOTTO_MAKER);
-        System.out.println(purchase.getNumberOfLotto() + "개를 구매했습니다.");
-        return purchase;
-    }
 
     private static void displayReceipt(LottoReceipt receipt) {
         for (Lotto lotto : receipt.lottos().getLottos()) {
@@ -63,8 +77,11 @@ private static void displayResult(LottoDraw draw) {
         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(
+                "5개 일치, 보너스 볼 일치 (" + LottoResult.BONUS.getReward() + "원)- " + draw.getCount(LottoResult.BONUS));
         System.out.println("6개 일치 (" + LottoResult.SIX.getReward() + "원)- " + draw.getCount(LottoResult.SIX));
 
         System.out.println("총 수익률은 " + draw.getRateOfReturn() + "입니다.");
     }
-}
+
+}