🔀 [hanse & sally] 로또 2단계 - 보너스 번호 추가

README.md

@@ -6,23 +6,14 @@
 
 #### 기능요구사항
 
-- [x] 로또 구입 금액을 입력하면 구입 금액에 해당하는 로또를 발급해야 한다.
-- [x] 로또 1장의 가격은 1000원이다.
-- [x] 당첨 번호를 입력받아서 수익률을 출력한다.
-- [x] 기대 수익은 동작 예시를 참고하자.
+- [x] 2등을 위해 추가 번호를 하나 더 추첨한다. 당첨 통계에 2등도 추가해야 한다.
 
 
 
 #### 프로그래밍 요구사항
 
-- [x] indent(인덴트, 들여쓰기) depth를 1단계로 구현한다.
-- [x] depth의 경우 if문을 사용하는 경우 1단계의 depth가 증가한다. if문 안에 while문을 사용한다면 depth가 2단계가 된다.
-- [x] else를 사용하지 마라.
-- [x] 메소드의 크기가 최대 10라인을 넘지 않도록 구현한다.
-- [x] method가 한 가지 일만 하도록 최대한 작게 만들어라.
-- [x] ArrayList를 사용해서 구현한다.
-
+- [x] enum을 적용해 프로그래밍을 구현한다.
 
 #### 출력 결과
 
-<img src="https://user-images.githubusercontent.com/92699009/155276313-d1260c5c-de96-4875-9a05-bf43b59c10b9.png">
+<img src="https://user-images.githubusercontent.com/92699009/155632776-f8de735e-2021-4985-8104-3e79c7f7317c.PNG">

src/LottoApplication.java

@@ -0,0 +1,31 @@
+import static views.Input.*;
+import static views.Output.*;
+
+import java.util.List;
+
+import domains.users.LottoMachine;
+import domains.users.Lottos;
+import domains.winnings.Ranking;
+import domains.users.UserLotto;
+import views.PurchasedLotto;
+
+public class LottoApplication {
+	private static LottoMachine lottoMachine = new LottoMachine();
+	private static Lottos lottos = new Lottos();
+	private static UserLotto userLotto = new UserLotto(lottoMachine, lottos);
+
+	public static void main(String[] args) {
+		PurchasedLotto purchasedLotto = purchaseLotto();
+
+		List<List<Integer>> totalLottos = userLotto.getTickets(purchasedLotto);
+		showLottos(totalLottos);
+
+		List<Integer> inputValueOfWinningNumbers = inputWinningNumbers();
+		int bonusNumber = getBonusNumber();
+
+		Ranking ranking = userLotto.getRankingFromWinningNumbers(inputValueOfWinningNumbers, bonusNumber);
+		getResultOfLotto(ranking, purchasedLotto.getPurchaseAmount());
+
+		scanClose();
+	}
+}

src/domains/Lotto.java → src/domains/users/Lotto.java

@@ -1,4 +1,4 @@
-package domains;
+package domains.users;
 
 import java.util.Collections;
 import java.util.List;
@@ -23,7 +23,7 @@ public List<Integer> numbers() {
 		return this.sixNumbers;
 	}
 
-	public int numberOfWinnings(List<Integer> winningNumbers){
+	public int countNumberOfWinnings(List<Integer> winningNumbers){
 		int count = 0;
 		for (Integer winningNumber : winningNumbers) {
 			count = getCount(count, winningNumber);
@@ -37,4 +37,11 @@ private int getCount(int count, Integer winningNumber) {
 		}
 		return count;
 	}
+
+	public boolean getBonus(int bonusNumber) {
+		if (sixNumbers.contains(bonusNumber)){
+			return true;
+		}
+		return false;
+	}
 }

src/domains/LottoMachine.java → src/domains/users/LottoMachine.java

@@ -1,4 +1,4 @@
-package domains;
+package domains.users;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/domains/Lottos.java → src/domains/users/Lottos.java

@@ -1,10 +1,11 @@
-package domains;
-
-import static java.util.stream.Collectors.*;
+package domains.users;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import domains.winnings.BonusWinningNumbers;
+import domains.winnings.Ranking;
+
 public class Lottos {
     public static final int  MINIMUM_NUMBER_OF_WINNING = 3;
     private ArrayList<Lotto> lottos = new ArrayList<>();
@@ -14,11 +15,18 @@ public Lottos() {
     }
 
     public List<List<Integer>> getTotalLottos(ArrayList<ArrayList<Integer>> tickets) {
+        toLottos(tickets);
+
+        return getPurchasedLottos();
+    }
 
+    private void toLottos(ArrayList<ArrayList<Integer>> tickets) {
         for (ArrayList<Integer> ticket : tickets) {
             this.purchased(ticket);
         }
+    }
 
+    private List<List<Integer>> getPurchasedLottos() {
         List<List<Integer>> purchasedLottos = new ArrayList<>();
         for (Lotto lotto : this.lottos) {
             List<Integer> numbers = lotto.numbers();
@@ -32,12 +40,17 @@ private void purchased(ArrayList<Integer> pickedNumber){
         this.lottos.add(lotto);
     }
 
-    public List<Integer> numberOfWinningAboveThree(List<Integer> winningNumbers) {
-        List<Integer> resultOfLottos = this.lottos.stream()
-            .mapToInt(lotto -> lotto.numberOfWinnings(winningNumbers))
-            .filter(value -> value >= MINIMUM_NUMBER_OF_WINNING)
-            .boxed()
-            .collect(toList());
-        return resultOfLottos;
+    public Ranking getNumberOfWinningAboveThree(BonusWinningNumbers winningNumbers) {
+        Ranking ranking = new Ranking();
+        List<Integer> winning = winningNumbers.getNumbers();
+
+        for (Lotto lotto : lottos) {
+            int winningCount = lotto.countNumberOfWinnings(winning);
+            if (winningCount >= MINIMUM_NUMBER_OF_WINNING) {
+                boolean checkedBonus = lotto.getBonus(winningNumbers.getBonus());
+                ranking.record(checkedBonus, winningCount);
+            }
+        }
+       return ranking;
     }
 }

src/domains/Money.java → src/domains/users/Money.java

@@ -1,4 +1,4 @@
-package domains;
+package domains.users;
 
 public class Money {
 	private static final String WON = "원";

src/domains/users/UserLotto.java

@@ -0,0 +1,29 @@
+package domains.users;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import domains.winnings.BonusWinningNumbers;
+import domains.winnings.Ranking;
+import views.PurchasedLotto;
+
+public class UserLotto {
+	private final LottoMachine lottoMachine;
+	private final Lottos lottos;
+
+	public UserLotto(LottoMachine lottoMachine, Lottos lottos) {
+		this.lottoMachine = lottoMachine;
+		this.lottos = lottos;
+	}
+
+	public List<List<Integer>> getTickets(PurchasedLotto purchasedLotto) {
+		ArrayList<ArrayList<Integer>> tickets = lottoMachine.getTicket(purchasedLotto.getNumberOfTicket());
+		return lottos.getTotalLottos(tickets);
+	}
+
+	public Ranking getRankingFromWinningNumbers(List<Integer> inputValueOfWinningNumbers, int bonusNumber) {
+		BonusWinningNumbers winningNumbers = new BonusWinningNumbers(inputValueOfWinningNumbers, bonusNumber);
+		Ranking ranking = lottos.getNumberOfWinningAboveThree(winningNumbers);
+		return ranking;
+	}
+}

src/domains/winnings/BonusWinningNumbers.java

@@ -0,0 +1,16 @@
+package domains.winnings;
+
+import java.util.List;
+
+public class BonusWinningNumbers extends WinningNumbers{
+	private final int bonus;
+
+	public BonusWinningNumbers(List<Integer> winningNumbers, int bonus) {
+		super(winningNumbers);
+		this.bonus = bonus;
+	}
+
+	public int getBonus() {
+		return bonus;
+	}
+}