[2단계 - 로또 구현] 포츈(정윤성) 미션 제출합니다.

docs/기능목록.md

@@ -26,4 +26,44 @@
     - [x] 당첨된 티켓 개수 저장하는 기능
     - [x] 수익률을 계산하는 기능
         - [x] 당첨된 수익금을 더하는 기능
-        - [x] 구입금액 기준 수익률 계산하는 기능
+        - [x] 구입금액 기준 수익률 계산하는 기능
+
+---
+
+## 로또 수동 구매 기능목록
+
+- [x] 수동으로 구매할 로또 티켓의 수를 입력 받는 기능
+    - [x] 숫자를 입력 받는 기능
+        - [x] 숫자인지 확인하는 기능
+        - [x] 양의 정수인지 확인하는 기능
+        - [x] 보유한 금액에 맞는 티켓을 구매하려는지 확인하는 기능
+
+- [x] 수동으로 구매할 번호를 입력 받는 기능
+  - [x] `,` 단위로 잘라내는 기능
+  - [x] 숫자인지 판별하는 기능
+  - [x] 1~45 사이의 숫자인지 판별하는 기능
+    - [x] 중복숫자인지 판별하는 기능
+    - [x] 잘라낸 숫자의 개수가 6개인지 판별하는 기능
+
+- [x] 로또 번호를 정렬하는 기능
+
+- [x] 수동으로 구매한 개수, 자동으로 구매한 개수를 출력하는 기능
+    - [x] 티켓 뭉치에서 수동이 몇갠지 찾는 기능
+    - [x] 티켓 뭉치에서 자동이 몇갠지 찾는 기능
+
+- [x] 수동으로 로또 티켓을 구매하는 기능
+
+---
+
+## 코드리뷰 리팩토링
+- [x] 유틸리티 클래스 없애기
+    - [x] 문자열 형태의 로또 번호들을 자르는 역할을 Utils 에서 LottoNumbers로 이관
+
+- [x] 로또 수동 번호 입력을 List로 받기
+    - [x] view 단에서 시도 횟수 검증하기
+    - [x] 로또 수동 번호 입력 받기
+
+- [x] 인터페이스로 나눈 LottoTicket 다시 합치기
+    - [x] 인자없이 로또 티켓을 만드려고 하면 자동으로 만들기
+    - [x] numbers가 인자로 들어오면 수동으로 만들기
+

src/main/java/lottogame/controller/LottoGameController.java

@@ -14,7 +14,18 @@ public LottoGameController(LottoGame lottoGame) {
     }
 
     public void buyTickets() {
-        lottoGame.buyTickets(new Money(InputView.getMoneyInput()));
+        Money money = new Money(InputView.getMoneyInput());
+        System.out.println();
+        buyManualTickets(money);
+        buyAutoTickets(money);
+    }
+
+    private void buyManualTickets(Money money) {
+        lottoGame.buyManualTickets(money, InputView.getManualLottoNumbers(money));
+    }
+
+    private void buyAutoTickets(Money money) {
+        lottoGame.buyAutoTickets(money);
     }
 
     public void printBroughtLottoTickets() {

src/main/java/lottogame/domain/LottoGame.java

@@ -15,12 +15,18 @@ public class LottoGame {
 
     private LottoNumber drawnBonusNumber;
     private LottoNumbers drawnWinningNumbers;
-    private LottoTickets lottoTickets;
     private LottoGameResult lottoGameResult;
+    private final LottoTickets lottoTickets = new LottoTickets();
     private final LottoTicketMachine lottoTicketMachine = new LottoTicketMachine();
 
-    public void buyTickets(final Money money) {
-        this.lottoTickets = lottoTicketMachine.buyTickets(money);
+    public void buyManualTickets(final Money money, final List<String> LottoNumbersGroup) {
+        for (String lottoNumbers : LottoNumbersGroup) {
+            this.lottoTickets.add(lottoTicketMachine.buyManualTicket(money, lottoNumbers));
+        }
+    }
+
+    public void buyAutoTickets(final Money money) {
+        this.lottoTickets.concat(lottoTicketMachine.buyAutoTickets(money));
     }
 
     public void drawWinningNumber(final String winningNumbers, final String bonusNumber) {

src/main/java/lottogame/domain/LottoGameResult.java

@@ -2,7 +2,6 @@
 
 import lottogame.domain.ticket.LottoTicketResult;
 
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,7 +26,7 @@ public LottoGameResult(final List<LottoTicketResult> winningTickets) {
     }
 
     public Map<Rank, Integer> toMap() {
-        return Collections.unmodifiableMap(lottoGameResult);
+        return new LinkedHashMap<>(lottoGameResult);
     }
 
     public double getLottoGameYield(final int ticketCount) {

src/main/java/lottogame/domain/Rank.java

@@ -24,11 +24,11 @@ public enum Rank {
         this.messageFormat = messageFormat;
     }
 
-    public static Rank getRank(LottoTicketResult lottoTicketResult) {
+    public static Rank getRank(final LottoTicketResult lottoTicketResult) {
         return Arrays.stream(values())
                 .filter(rank -> rank.matchCount == lottoTicketResult.getMatchCount())
-                .filter(rank -> rank.isBonusMatch == lottoTicketResult.isBonusMatched())
-                .findAny()
+                .filter(rank -> !rank.equals(RANK3) || rank.isBonusMatch == lottoTicketResult.isBonusMatched())
+                .findFirst()
                 .orElse(FAIL);
     }
 

src/main/java/lottogame/domain/machine/LottoTicketMachine.java

@@ -1,20 +1,29 @@
 package lottogame.domain.machine;
 
 import lottogame.domain.Money;
+import lottogame.domain.number.LottoNumbers;
 import lottogame.domain.ticket.LottoTicket;
 import lottogame.domain.ticket.LottoTickets;
 
 public class LottoTicketMachine {
 
     public static final int TICKET_PRICE = 1000;
 
-    public LottoTickets buyTickets(final Money money) {
+    public LottoTickets buyAutoTickets(final Money money) {
         LottoTickets lottoTickets = new LottoTickets();
 
         while (money.isCanBuy(TICKET_PRICE)) {
-            lottoTickets.add(new LottoTicket());
+            lottoTickets.add(LottoTicket.of());
             money.use(TICKET_PRICE);
         }
         return lottoTickets;
     }
+
+    public LottoTicket buyManualTicket(final Money money, final String selectedLottoNumbers) {
+        if (!money.isCanBuy(TICKET_PRICE)) {
+            throw new IllegalArgumentException("남은 금액이 모자릅니다.");
+        }
+        money.use(TICKET_PRICE);
+        return LottoTicket.of(new LottoNumbers(selectedLottoNumbers));
+    }
 }

src/main/java/lottogame/domain/machine/LottoWinningDrawingMachine.java

@@ -3,31 +3,21 @@
 import lottogame.domain.number.LottoNumber;
 import lottogame.domain.number.LottoNumbers;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class LottoWinningDrawingMachine {
 
-    public static final String DELIMITER = ",";
     private LottoNumbers lottoNumbers;
 
-    public LottoNumbers drawing(String drawingNumbers) {
-        drawingNumbers = drawingNumbers.replaceAll(" ", "");
-        final List<LottoNumber> lottoNumberGroup = new ArrayList<>();
-
-        for (String number : drawingNumbers.split(DELIMITER)) {
-            lottoNumberGroup.add(new LottoNumber(number));
-        }
-        return lottoNumbers = new LottoNumbers(lottoNumberGroup);
+    public LottoNumbers drawing(final String drawingNumbers) {
+        return lottoNumbers = new LottoNumbers(drawingNumbers);
     }
 
     public LottoNumber bonusDrawing(final String drawingNumber) {
         validBonusNumber(drawingNumber);
-        return new LottoNumber(drawingNumber);
+        return LottoNumber.of(drawingNumber);
     }
 
     private void validBonusNumber(final String bonusNumber) {
-        if (lottoNumbers.contains(new LottoNumber(bonusNumber))) {
+        if (lottoNumbers.contains(LottoNumber.of(bonusNumber))) {
             throw new IllegalArgumentException("보너스 번호가 당첨번호와 중복됩니다.");
         }
     }

src/main/java/lottogame/domain/number/LottoNumber.java

@@ -1,5 +1,7 @@
 package lottogame.domain.number;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 public class LottoNumber {
@@ -8,17 +10,29 @@ public class LottoNumber {
     private static final int FINISH_NUMBER = 45;
 
     private final int value;
+    private static final Map<Integer, LottoNumber> LOTTO_NUMBER_MAP = new HashMap<>();
 
-    public LottoNumber(final String value) {
-        this(Integer.parseInt(value));
+    static {
+        for (int number = START_NUMBER; number <= FINISH_NUMBER; ++number) {
+            LOTTO_NUMBER_MAP.put(number, new LottoNumber(number));
+        }
     }
 
-    public LottoNumber(final int value) {
+    private LottoNumber(final int value) {
         validateRange(value);
         this.value = value;
     }
 
-    private void validateRange(final int value) {
+    public static LottoNumber of(final String value) {
+        return LottoNumber.of(Integer.parseInt(value));
+    }
+
+    public static LottoNumber of(final int value) {
+        validateRange(value);
+        return LottoNumber.LOTTO_NUMBER_MAP.get(value);
+    }
+
+    private static void validateRange(final int value) {
         if (value < START_NUMBER || FINISH_NUMBER < value) {
             throw new IllegalArgumentException("로또 숫자 범위를 벗어났습니다.");
         }

src/main/java/lottogame/domain/number/LottoNumbers.java

@@ -1,26 +1,43 @@
 package lottogame.domain.number;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 
 public class LottoNumbers {
 
     public static final int DRAWING_COUNT_LIMIT = 6;
+    public static final String DELIMITER = ",";
+
     private final List<LottoNumber> lottoNumbers;
 
+    public LottoNumbers(final String lottoNumbers) {
+        this(getSplitLottoNumbersByString(lottoNumbers));
+    }
+
     public LottoNumbers(final List<LottoNumber> lottoNumbers) {
         validDrawingNumbers(lottoNumbers);
+        lottoNumbers.sort((Comparator.comparingInt(LottoNumber::getValue)));
         this.lottoNumbers = new ArrayList<>(lottoNumbers);
     }
 
+    private static List<LottoNumber> getSplitLottoNumbersByString(String lottoNumbers) {
+        lottoNumbers = lottoNumbers.replaceAll(" ", "");
+        final List<LottoNumber> lottoNumberGroup = new ArrayList<>();
+
+        for (String number : lottoNumbers.split(DELIMITER)) {
+            lottoNumberGroup.add(LottoNumber.of(number));
+        }
+        return lottoNumberGroup;
+    }
+
     public boolean contains(final LottoNumber lottoNumber) {
         return lottoNumbers.contains(lottoNumber);
     }
 
     public List<LottoNumber> toList() {
-        return Collections.unmodifiableList(new ArrayList<>(this.lottoNumbers));
+        return new ArrayList<>(this.lottoNumbers);
     }
 
     private void validDrawingNumbers(final List<LottoNumber> lottoNumbers) {

src/main/java/lottogame/domain/ticket/LottoTicket.java

@@ -9,40 +9,59 @@
 
 public class LottoTicket {
 
-    public static final int START_LOTTO_NUMBER = 1;
-    public static final int FINISH_LOTTO_NUMBER = 45;
-    public static final int COUNT_LOTTO_NUMBER = 6;
+    private static final int START_LOTTO_NUMBER = 1;
+    private static final int FINISH_LOTTO_NUMBER = 45;
+    private static final int COUNT_LOTTO_NUMBER = 6;
 
     private final LottoNumbers lottoNumbers;
+    private final boolean isAuto;
 
-    public LottoTicket() {
+
+    private LottoTicket(final LottoNumbers lottoNumbers, final boolean isAuto) {
+        this.lottoNumbers = new LottoNumbers(lottoNumbers.toList());
+        this.isAuto = isAuto;
+    }
+
+    public static LottoTicket of() {
+        return new LottoTicket(getAutoNumbers(), true);
+    }
+
+    public static LottoTicket of(final LottoNumbers lottoNumbers) {
+        return new LottoTicket(lottoNumbers, false);
+    }
+
+    private static LottoNumbers getAutoNumbers() {
         List<LottoNumber> lottoNumberGroup = new ArrayList<>();
-        for (int number : getShuffledNumbers(new ArrayList<>())) {
-            lottoNumberGroup.add(new LottoNumber(number));
+        for (int number : getShuffledNumbers()) {
+            lottoNumberGroup.add(LottoNumber.of(number));
         }
-        lottoNumbers = new LottoNumbers(lottoNumberGroup);
+        return new LottoNumbers(lottoNumberGroup);
     }
 
-    private List<Integer> getShuffledNumbers(List<Integer> numbers) {
+    private static List<Integer> getShuffledNumbers() {
+        List<Integer> numbers = new ArrayList<>();
         Collections.shuffle(initNumbers(numbers));
 
-        List<Integer> shuffledNumbers = numbers.subList(0, COUNT_LOTTO_NUMBER);
-        Collections.sort(shuffledNumbers);
-        return shuffledNumbers;
+        return numbers.subList(0, COUNT_LOTTO_NUMBER);
     }
 
-    private List<Integer> initNumbers(List<Integer> numbers) {
+    private static List<Integer> initNumbers(final List<Integer> numbers) {
         for (int i = START_LOTTO_NUMBER; i <= FINISH_LOTTO_NUMBER; i++) {
             numbers.add(i);
         }
         return numbers;
     }
 
+
     public List<LottoNumber> getLottoNumbers() {
-        return Collections.unmodifiableList(lottoNumbers.toList());
+        return new ArrayList<>(lottoNumbers.toList());
     }
 
-    public boolean isContainNumber(final LottoNumber lottoNumber){
+    public boolean isContainNumber(LottoNumber lottoNumber) {
         return lottoNumbers.contains(lottoNumber);
     }
+
+    public boolean isAutoTicket() {
+        return isAuto;
+    }
 }

src/main/java/lottogame/domain/ticket/LottoTickets.java

@@ -3,25 +3,41 @@
 import lottogame.domain.machine.LottoWinningMachine;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class LottoTickets {
 
     public static final int TICKET_PRICE = 1000;
+    private int autoTicketCount;
 
-    List<LottoTicket> lottoTickets = new ArrayList<>();
+    private final List<LottoTicket> lottoTickets = new ArrayList<>();
 
     public void add(final LottoTicket lottoTicket) {
         lottoTickets.add(lottoTicket);
+        countAutoTicket(lottoTicket);
+    }
+
+    private void countAutoTicket(final LottoTicket lottoTicket) {
+        if (lottoTicket.isAutoTicket()) {
+            autoTicketCount++;
+        }
+    }
+
+    public void concat(final LottoTickets lottoTickets) {
+        this.lottoTickets.addAll(lottoTickets.toList());
+        this.autoTicketCount += lottoTickets.getAutoTicketsCount();
     }
 
     public List<LottoTicket> toList() {
-        return Collections.unmodifiableList(lottoTickets);
+        return new ArrayList<>(lottoTickets);
+    }
+
+    public int getAutoTicketsCount() {
+        return autoTicketCount;
     }
 
-    public int getTicketsCount() {
-        return lottoTickets.size();
+    public int getManualTicketsCount() {
+        return lottoTickets.size() - autoTicketCount;
     }
 
     public int getCostUsedToBuy() {