Step3 - 로또(2등)

src/main/java/lotto/LottoApplication.java

@@ -1,24 +1,30 @@
 package lotto;
 
 import lotto.controller.LottoMachine;
-import lotto.controller.WinningLotto;
+import lotto.domain.WinningLotto;
 import lotto.domain.Lotto;
+import lotto.domain.LottoNumber;
+import lotto.domain.LottoResult;
 import lotto.ui.InputView;
 import lotto.ui.ResultView;
 import lotto.util.LottoNumberParser;
 
 public class LottoApplication {
     public static void main(String[] args) {
         String purchaseAmount = InputView.getPurchaseAmount();
+
         LottoMachine lottoMachine = new LottoMachine(purchaseAmount);
         Lotto lotto = lottoMachine.generate();
-        ResultView.printLottoCount(lotto.count());
-        ResultView.printLottoNumbersList(lotto.toString());
+
+        ResultView.printLotto(lotto);
 
         String winningNumbers = InputView.getWinningNumber();
-        WinningLotto winningLotto = new WinningLotto(LottoNumberParser.parse(winningNumbers));
+        String bonusNumber = InputView.getBonusNumber();
+
+        WinningLotto winningLotto = new WinningLotto(winningNumbers, bonusNumber);
+        LottoResult result = lotto.getMatchResult(winningLotto);
 
-        ResultView.printLottoResult(winningLotto.getResult(lotto));
-        ResultView.printProfit(winningLotto.getProfit(lotto));
+        ResultView.printLottoResult(result.toString());
+        ResultView.printProfit(result.getProfit());
     }
 }

src/main/java/lotto/controller/LottoMachine.java

@@ -3,6 +3,7 @@
 import lotto.domain.Lotto;
 import lotto.domain.LottoNumbers;
 import lotto.domain.LottoPrice;
+import lotto.util.LottoNumberParser;
 import lotto.util.RandomNumbersGenerator;
 
 import java.util.ArrayList;
@@ -23,7 +24,7 @@ public Lotto generate() {
         List<LottoNumbers> lottoNumbersList = new ArrayList<>();
 
         for (int i = 0; i < lottoPrice.count(); i++) {
-            lottoNumbersList.add(new LottoNumbers(RandomNumbersGenerator.randomNumbers()));
+            lottoNumbersList.add(new LottoNumbers(LottoNumberParser.parse(RandomNumbersGenerator.randomNumbers())));
         }
 
         return new Lotto(lottoPrice, lottoNumbersList);

src/main/java/lotto/domain/Lotto.java

@@ -4,29 +4,25 @@
 import java.util.stream.Collectors;
 
 public class Lotto {
-    LottoPrice price;
-    List<LottoNumbers> lottoNumbers;
+    private final LottoPrice price;
+    private final List<LottoNumbers> lottoNumbers;
 
     public Lotto(LottoPrice price, List<LottoNumbers> lottoNumbers) {
         this.price = price;
         this.lottoNumbers = lottoNumbers;
     }
 
-    public LottoResult getMatchResult(LottoNumbers winningNumbers) {
+    public LottoResult getMatchResult(WinningLotto winningLotto) {
         LottoResult result = new LottoResult();
 
         for (LottoNumbers lottoNumbers : lottoNumbers) {
-            LottoRank rank = lottoNumbers.getMatchedRank(winningNumbers);
+            LottoRank rank = winningLotto.getMatchedRank(lottoNumbers);
             result.add(rank);
         }
 
         return result;
     }
 
-    public double calculateProfit(int prize) {
-        return price.getProfit(prize);
-    }
-
     public String count() {
         return String.valueOf(price.count());
     }

src/main/java/lotto/domain/LottoNumber.java

@@ -5,6 +5,10 @@
 public class LottoNumber {
     private final int number;
 
+    public LottoNumber(String number) {
+        this(Integer.parseInt(number));
+    }
+
     public LottoNumber(int number) {
         this.number = number;
     }

src/main/java/lotto/domain/LottoNumbers.java

@@ -1,41 +1,43 @@
 package lotto.domain;
 
+import lotto.util.LottoNumberParser;
+
+import java.sql.Array;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class LottoNumbers {
     private final List<LottoNumber> numbers;
 
-    public LottoNumbers(List<Integer> numbers) {
-        this.numbers = toLottoNumber(numbers);
+    public LottoNumbers(int... numbers) {
+        this(LottoNumberParser.parse(numbers));
     }
 
-    private static List<LottoNumber> toLottoNumber(List<Integer> numbers) {
-        List<LottoNumber> lottoNumbers = new ArrayList<>();
-
-        for (int number : numbers) {
-            lottoNumbers.add(new LottoNumber(number));
-        }
+    public LottoNumbers(String numbers) {
+        this(LottoNumberParser.parse(numbers));
+    }
 
-        return lottoNumbers;
+    public LottoNumbers(List<LottoNumber> numbers) {
+        this.numbers = numbers;
     }
 
-    public LottoRank getMatchedRank(LottoNumbers other) {
+    public int getMatchCount(LottoNumbers other) {
         int matchCount = 0;
 
-        for (int i = 0; i < numbers.size(); i++) {
-            if (matchesAtIndex(i, other)) {
+        for (LottoNumber number : numbers) {
+            if (other.contains(number)) {
                 matchCount++;
             }
         }
 
-        return LottoRank.of(matchCount);
+        return matchCount;
     }
 
-    private boolean matchesAtIndex(int index, LottoNumbers other) {
-        return numbers.get(index).equals(other.numbers.get(index));
+    public boolean contains(LottoNumber number) {
+        return numbers.contains(number);
     }
 
     @Override

src/main/java/lotto/domain/LottoRank.java

@@ -1,41 +1,56 @@
 package lotto.domain;
 
 public enum LottoRank {
-    FIRST(6, 2_000_000_000),
-    SECOND(5, 30_000_000),
-    THIRD(4, 1_500_000),
-    FOURTH(3, 50_000),
-    NONE(0, 0);
+    FIRST(6, 2_000_000_000, false),
+    SECOND_BONUS(5, 30_000_000, true),
+    SECOND(5, 1_500_000, false),
+    THIRD(4, 50_000, false),
+    FOURTH(3, 5_000, false),
+    NONE(0, 0, false);
 
 
     private final int matchCount;
     private final int prize;
+    private final boolean requireBonus;
 
-    LottoRank(int matchCount, int prize) {
+    LottoRank(int matchCount, int prize, boolean requireBonus) {
         this.matchCount = matchCount;
         this.prize = prize;
+        this.requireBonus = requireBonus;
     }
 
-    public static LottoRank of(int matchCount) {
+    public static LottoRank of(int matchCount, boolean bonusMatch) {
         for (LottoRank rank : LottoRank.values()) {
-            if (isMatch(rank, matchCount)) {
+            if (isMatch(rank, matchCount, bonusMatch)) {
                 return rank;
             }
         }
 
         return NONE;
     }
 
-    public static boolean isMatch(LottoRank rank, int matchCount) {
+    public static boolean isMatch(LottoRank rank, int matchCount, boolean requireBonus) {
+        return isCountMatch(rank, matchCount) && isBonusRequireMatch(rank, requireBonus);
+    }
+
+    private static boolean isCountMatch(LottoRank rank, int matchCount) {
         return rank.matchCount == matchCount;
     }
 
+    private static boolean isBonusRequireMatch(LottoRank rank, boolean requireBonus) {
+        return rank.requireBonus == requireBonus;
+    }
+
     public int getPrize(LottoRank rank, int count) {
         return rank.prize * count;
     }
 
     @Override
     public String toString() {
-        return String.format("%d개 일치 (%d원)", matchCount, prize);
+        return String.format("%d개%s(%d원)", matchCount, matchString(), prize);
+    }
+
+    private String matchString() {
+        return requireBonus ? ", 보너스 볼 일치" : " 일치";
     }
 }

src/main/java/lotto/domain/LottoResult.java

@@ -25,7 +25,7 @@ public void add(LottoRank rank) {
         matchResult.put(rank, matchResult.get(rank) + 1);
     }
 
-    public int prize() {
+    private int prize() {
         int prize = 0;
         for (LottoRank rank : LottoRank.values()) {
             prize += rank.getPrize(rank, matchResult.get(rank));
@@ -34,6 +34,20 @@ public int prize() {
         return prize;
     }
 
+    private LottoPrice getPrice() {
+        int count = 0;
+        for (LottoRank rank : LottoRank.values()) {
+            count += matchResult.get(rank);
+        }
+
+        return new LottoPrice(count);
+    }
+
+    public String getProfit() {
+        LottoPrice price = getPrice();
+        return String.valueOf(price.getProfit(prize()));
+    }
+
     @Override
     public String toString() {
         return Arrays.stream(LottoRank.values())

src/main/java/lotto/domain/WinningLotto.java

@@ -0,0 +1,27 @@
+package lotto.domain;
+
+
+import lotto.util.LottoNumberParser;
+
+public class WinningLotto {
+    private final LottoNumbers winningNumbers;
+    private final LottoNumber bonusNumber;
+
+    public WinningLotto(String winningNumbers, String bonusNumber) {
+        this(new LottoNumbers(LottoNumberParser.parse(winningNumbers)), new LottoNumber(bonusNumber));
+    }
+
+    public WinningLotto(LottoNumbers winningNumbers, LottoNumber bonusNumber) {
+        if (winningNumbers.contains(bonusNumber)) {
+            throw new IllegalArgumentException(String.format("당첨 숫자와 보너스 숫자가 일치합니다. (%d)", bonusNumber));
+        }
+
+        this.winningNumbers = winningNumbers;
+        this.bonusNumber = bonusNumber;
+    }
+
+    public LottoRank getMatchedRank(LottoNumbers numbers) {
+        int matchCount = winningNumbers.getMatchCount(numbers);
+        return LottoRank.of(matchCount, numbers.contains(bonusNumber));
+    }
+}

src/main/java/lotto/ui/InputView.java

@@ -7,6 +7,7 @@ public class InputView {
     private static final String WINNING_NUMBER_MESSAGE = "지난 주 당첨 번호 6개를 입력해 주세요.";
 
     private static final Scanner scanner = new Scanner(System.in);
+    public static final String BONUS_BALL_MESSAGE = "보너스볼을 입력해주세요";
 
     public static String getPurchaseAmount() {
         System.out.println(PURCHASE_AMOUNT_MESSAGE);
@@ -18,5 +19,10 @@ public static String getWinningNumber() {
         return scanner.nextLine();
     }
 
+    public static String getBonusNumber() {
+        System.out.println(BONUS_BALL_MESSAGE);
+        return scanner.nextLine();
+    }
+
 
 }

src/main/java/lotto/ui/ResultView.java

@@ -1,17 +1,24 @@
 package lotto.ui;
 
+import lotto.domain.Lotto;
+
 public class ResultView {
     private static final String LOTTO_COUNT_MESSAGE = "%s개를 구매했습니다.\n";
     private static final String LOTTO_RESULT_MESSSAGE = "당첨 통계\n-------";
 
-    public static void printLottoCount(String lottoCount) {
+    private static void printLottoCount(String lottoCount) {
         System.out.printf(LOTTO_COUNT_MESSAGE, lottoCount);
     }
 
-    public static void printLottoNumbersList(String lottoList) {
+    private static void printLottoNumbersList(String lottoList) {
         System.out.println(lottoList);
     }
 
+    public static void printLotto(Lotto lotto) {
+        printLottoCount(lotto.count());
+        printLottoNumbersList(lotto.toString());
+    }
+
     public static void printLottoResult(String lottoResult) {
         System.out.println(LOTTO_RESULT_MESSSAGE);
         System.out.println(lottoResult);

src/main/java/lotto/util/LottoNumberCache.java

@@ -0,0 +1,31 @@
+package lotto.util;
+
+import lotto.domain.LottoNumber;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class LottoNumberCache {
+    private static final int MIN = 1;
+    private static final int MAX = 45;
+    private static final LottoNumber NONE = new LottoNumber(0);
+    private static final Map<Integer, LottoNumber> Cache = new HashMap<>();
+
+    static {
+        for (int i = MIN; i <= MAX; i++) {
+            Cache.put(i, new LottoNumber(i));
+        }
+    }
+
+    public static LottoNumber get(int value) {
+        LottoNumber lottoNumber = Cache.getOrDefault(value, NONE);
+        if (lottoNumber == NONE) {
+            throw new IllegalArgumentException("로또의 숫자는 1에서 45 사이여야합니다.");
+        }
+        return Cache.get(value);
+    }
+
+    public static LottoNumber get(String value) {
+        return get(Integer.parseInt(value));
+    }
+}