🚀 4단계 - 로또(수동)

src/main/java/com/nextstep/camp/lotto/domain/entity/LottoTickets.java

@@ -1,12 +1,13 @@
 package com.nextstep.camp.lotto.domain.entity;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import com.nextstep.camp.lotto.domain.exception.LottoTicketsCannotBeEmptyException;
 import com.nextstep.camp.lotto.domain.type.Rank;
 import com.nextstep.camp.lotto.domain.vo.WinningNumbers;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class LottoTickets {
     private final List<LottoTicket> tickets;
 
@@ -25,6 +26,13 @@ public static LottoTickets of(List<LottoTicket> tickets) {
         return new LottoTickets(tickets);
     }
 
+    public static LottoTickets of(LottoTickets manualTickets, LottoTickets autoTickets) {
+        List<LottoTicket> allTickets = new ArrayList<>();
+        allTickets.addAll(manualTickets.getTickets());
+        allTickets.addAll(autoTickets.getTickets());
+        return new LottoTickets(allTickets);
+    }
+
     public int size() {
         return tickets.size();
     }

src/main/java/com/nextstep/camp/lotto/domain/entity/WinningStatistics.java

@@ -1,13 +1,11 @@
 package com.nextstep.camp.lotto.domain.entity;
 
-import com.nextstep.camp.lotto.domain.type.ProfitType;
+import java.util.Map;
+
 import com.nextstep.camp.lotto.domain.type.Rank;
 import com.nextstep.camp.lotto.domain.vo.LottoAmount;
 import com.nextstep.camp.lotto.domain.vo.RateOfReturn;
 
-import java.util.Map;
-import java.util.stream.Collectors;
-
 public class WinningStatistics {
     private final Map<Rank, Integer> resultCounts;
     private final LottoAmount spent;
@@ -38,18 +36,4 @@ public Map<Rank, Integer> getResultCounts() {
     public LottoAmount getSpent() {
         return spent;
     }
-
-    @Override
-    public String toString() {
-        String resultString = resultCounts.entrySet().stream()
-            .map(entry -> entry.getKey() + " - " + entry.getValue() + "개")
-            .collect(Collectors.joining("\n"));
-
-        RateOfReturn rateOfReturn = calculateRateOfReturn(spent);
-        ProfitType profitType = rateOfReturn.getProfitType();
-        return resultString + "\n" +
-            "총 수익률은 " +
-            rateOfReturn.toString() +
-            "입니다.(기준이 1이기 때문에 결과적으로 " + profitType.getDescription() + "라는 의미임)";
-    }
 }

src/main/java/com/nextstep/camp/lotto/domain/exception/LottoCountCannotBeNegativeException.java

@@ -0,0 +1,10 @@
+package com.nextstep.camp.lotto.domain.exception;
+
+public class LottoCountCannotBeNegativeException extends RuntimeException {
+
+    private static final String MESSAGE = "로또 티켓 수는 0보다 작을 수 없습니다.";
+
+    public LottoCountCannotBeNegativeException() {
+        super(MESSAGE);
+    }
+}

src/main/java/com/nextstep/camp/lotto/domain/exception/LottoNumberInputRegexException.java

@@ -0,0 +1,10 @@
+package com.nextstep.camp.lotto.domain.exception;
+
+public class LottoNumberInputRegexException extends IllegalArgumentException {
+
+    private static final String MESSAGE = "로또 번호 입력 형식이 올바르지 않습니다. ";
+
+    public LottoNumberInputRegexException() {
+        super(MESSAGE);
+    }
+}

src/main/java/com/nextstep/camp/lotto/domain/strategy/LottoAutoPicker.java

@@ -1,16 +1,16 @@
 package com.nextstep.camp.lotto.domain.strategy;
 
-import com.nextstep.camp.lotto.domain.entity.LottoTicket;
-import com.nextstep.camp.lotto.domain.vo.LottoAmount;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import com.nextstep.camp.lotto.domain.entity.LottoTicket;
+import com.nextstep.camp.lotto.domain.vo.LottoCount;
+
 public class LottoAutoPicker implements LottoPicker {
 
-    private final LottoAmount amount;
+    private final LottoCount count;
 
     private static final int LOTTO_MIN = 1;
     private static final int LOTTO_MAX = 45;
@@ -19,19 +19,19 @@ public class LottoAutoPicker implements LottoPicker {
             .boxed()
             .collect(Collectors.toList());
 
-    private LottoAutoPicker(LottoAmount amount) {
-        this.amount = amount;
+    private LottoAutoPicker(LottoCount count) {
+        this.count = count;
     }
 
-    public static LottoAutoPicker of(LottoAmount amount) {
+    public static LottoAutoPicker of(LottoCount amount) {
         return new LottoAutoPicker(amount);
     }
 
     @Override
     public List<LottoTicket> pick() {
-        return IntStream.range(0, this.amount.lottoCount())
-                .mapToObj(i -> LottoTicket.of(generateOne()))
-                .collect(Collectors.toList());
+        return this.count.intStream()
+            .mapToObj(count -> LottoTicket.of(generateOne()))
+            .collect(Collectors.toList());
     }
 
     private List<Integer> generateOne() {

src/main/java/com/nextstep/camp/lotto/domain/vo/LottoAmount.java

@@ -31,11 +31,11 @@ public static LottoAmount of(int value) {
         return new LottoAmount(value);
     }
 
-    public int lottoCount() {
-        return value / LOTTO_PRICE;
-    }
-
     public int getValue() {
         return value;
     }
+
+    public LottoCount getLottoCount() {
+        return LottoCount.of(value / LOTTO_PRICE);
+    }
 }

src/main/java/com/nextstep/camp/lotto/domain/vo/LottoCount.java

@@ -0,0 +1,50 @@
+package com.nextstep.camp.lotto.domain.vo;
+
+import java.util.stream.IntStream;
+
+import com.nextstep.camp.lotto.domain.exception.LottoCountCannotBeNegativeException;
+
+public class LottoCount {
+    private final int value;
+
+    private LottoCount(int value) {
+        validate(value);
+        this.value = value;
+    }
+
+    private static void validate(int value) {
+        if (value < 0) {
+            throw new LottoCountCannotBeNegativeException();
+        }
+    }
+
+    public static LottoCount of(int intValue) {
+        return new LottoCount(intValue);
+    }
+
+    public int getCount() {
+        return value;
+    }
+
+    public IntStream intStream() {
+        return IntStream.range(0, value);
+    }
+
+    public LottoCount minus(LottoCount other) {
+        validateMinus(other);
+        return LottoCount.of(this.value - other.value);
+    }
+
+    private void validateMinus(LottoCount other) {
+        if (this.value < other.value) {
+            throw new LottoCountCannotBeNegativeException();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "LottoCount{" +
+                "count=" + value +
+                '}';
+    }
+}

src/main/java/com/nextstep/camp/lotto/domain/vo/LottoNumber.java

@@ -1,14 +1,14 @@
 package com.nextstep.camp.lotto.domain.vo;
 
-import com.nextstep.camp.lotto.domain.exception.LottoNumberOutOfRangeException;
-
 import java.util.Objects;
 
+import com.nextstep.camp.lotto.domain.exception.LottoNumberOutOfRangeException;
+
 public class LottoNumber {
     private final int value;
 
-    private static final int MIN_VALUE = 1;
-    private static final int MAX_VALUE = 45;
+    public static final int MIN_VALUE = 1;
+    public static final int MAX_VALUE = 45;
 
     private LottoNumber(int value) {
         validate(value);

src/main/java/com/nextstep/camp/lotto/domain/vo/LottoNumbers.java

@@ -1,17 +1,15 @@
 package com.nextstep.camp.lotto.domain.vo;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 import com.nextstep.camp.lotto.domain.exception.LottoNumberDuplicatedException;
 import com.nextstep.camp.lotto.domain.exception.LottoNumbersSizeException;
 
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class LottoNumbers {
     private final List<LottoNumber> numbers;
 
-    private static final int LOTTO_NUMBERS_SIZE = 6;
+    public static final int LOTTO_NUMBERS_SIZE = 6;
 
     private LottoNumbers(List<Integer> rawNumbers) {
         validate(rawNumbers);

src/main/java/com/nextstep/camp/lotto/view/LottoInputView.java

@@ -1,16 +1,14 @@
 package com.nextstep.camp.lotto.view;
 
 import com.nextstep.camp.lotto.domain.vo.LottoAmount;
-import com.nextstep.camp.lotto.view.component.LottoAmountInput;
-import com.nextstep.camp.lotto.view.component.LottoTicketsInput;
-import com.nextstep.camp.lotto.view.component.WinningNumbersInput;
+import com.nextstep.camp.lotto.domain.vo.LottoCount;
+import com.nextstep.camp.lotto.view.component.*;
 import com.nextstep.camp.lotto.view.dto.LottoInputData;
-import com.nextstep.camp.lotto.view.strategy.LottoAmountInputStrategy;
-import com.nextstep.camp.lotto.view.strategy.LottoTicketsAutoInputStrategy;
-import com.nextstep.camp.lotto.view.strategy.WinningNumbersInputStrategy;
+import com.nextstep.camp.lotto.view.strategy.*;
 
 public class LottoInputView {
     private final LottoAmountInput lottoAmountInput;
+    private final LottoManuelCountInput lottoManuelCountInput;
     private final WinningNumbersInput winningNumbersInput;
 
     private LottoTicketsInput lottoTicketsInput;
@@ -19,7 +17,9 @@ public class LottoInputView {
     private LottoInputView() {
         LottoAmountInput lottoAmountInput = LottoAmountInput.create(LottoAmountInputStrategy.ofSystemIn());
         WinningNumbersInput winningNumbersInput = WinningNumbersInput.create(WinningNumbersInputStrategy.of());
+        LottoManuelCountInput lottoManuelCountInput = LottoManuelCountInput.create(LottoManuelCountInputStrategy.ofSystemIn());
         this.lottoAmountInput = lottoAmountInput;
+        this.lottoManuelCountInput = lottoManuelCountInput;
         this.winningNumbersInput = winningNumbersInput;
     }
 
@@ -29,8 +29,9 @@ public static LottoInputView publish() {
 
     public void render() {
         LottoAmount lottoAmount = this.lottoAmountInput.action();
+        LottoCount lottoManuelCount = this.lottoManuelCountInput.action();
 
-        LottoTicketsAutoInputStrategy inputStrategy = LottoTicketsAutoInputStrategy.of(lottoAmount);
+        LottoTicketsInputStrategy inputStrategy = LottoTicketsInputStrategy.of(lottoAmount, lottoManuelCount);
         this.lottoTicketsInput = LottoTicketsInput.create(inputStrategy);
         this.lottoTicketsInput.action();
 

src/main/java/com/nextstep/camp/lotto/view/component/LottoManuelCountInput.java

@@ -0,0 +1,21 @@
+package com.nextstep.camp.lotto.view.component;
+
+import com.nextstep.camp.common.strategy.InputStrategy;
+import com.nextstep.camp.common.view.component.AbstractInput;
+import com.nextstep.camp.lotto.domain.vo.LottoCount;
+
+public class LottoManuelCountInput extends AbstractInput<LottoCount> {
+
+    private LottoManuelCountInput(InputStrategy<LottoCount> inputStrategy) {
+        super(inputStrategy);
+    }
+
+    public static LottoManuelCountInput create(InputStrategy<LottoCount> inputStrategy) {
+        return new LottoManuelCountInput(inputStrategy);
+    }
+
+    @Override
+    public String getLabel() {
+        return "\n수동으로 구매할 로또 수를 입력해 주세요.";
+    }
+}

src/main/java/com/nextstep/camp/lotto/view/component/LottoTicketsAutoInput.java

@@ -0,0 +1,34 @@
+package com.nextstep.camp.lotto.view.component;
+
+import com.nextstep.camp.common.strategy.InputStrategy;
+import com.nextstep.camp.common.view.component.AbstractInput;
+import com.nextstep.camp.lotto.domain.entity.LottoTickets;
+import com.nextstep.camp.lotto.domain.vo.LottoCount;
+
+public class LottoTicketsAutoInput extends AbstractInput<LottoTickets> {
+
+    private final LottoCount autoCount;
+    private final LottoCount manualCount;
+
+    private LottoTicketsAutoInput(InputStrategy<LottoTickets> inputStrategy, LottoCount autoCount, LottoCount manualCount) {
+        super(inputStrategy);
+        this.autoCount = autoCount;
+        this.manualCount = manualCount;
+    }
+
+    public static LottoTicketsAutoInput create(InputStrategy<LottoTickets> inputStrategy, LottoCount autoCount, LottoCount manualCount) {
+        return new LottoTicketsAutoInput(inputStrategy, autoCount, manualCount);
+    }
+
+    @Override
+    public String getLabel() {
+        return String.format("수동으로 %d장, 자동으로 %d개를 구매했습니다.", manualCount.getCount(), autoCount.getCount());
+    }
+
+    @Override
+    public LottoTickets action() {
+        LottoTickets lottoTickets = super.action();
+        System.out.println(lottoTickets);
+        return lottoTickets;
+    }
+}

src/main/java/com/nextstep/camp/lotto/view/component/LottoTicketsInput.java

@@ -16,13 +16,6 @@ public static LottoTicketsInput create(InputStrategy<LottoTickets> inputStrategy
 
     @Override
     public String getLabel() {
-        return "14개를 구매했습니다.";
-    }
-
-    @Override
-    public LottoTickets action() {
-        LottoTickets lottoTickets = super.action();
-        System.out.println(lottoTickets);
-        return lottoTickets;
+        return "";
     }
 }

src/main/java/com/nextstep/camp/lotto/view/component/LottoTicketsManualInput.java

@@ -0,0 +1,21 @@
+package com.nextstep.camp.lotto.view.component;
+
+import com.nextstep.camp.common.strategy.InputStrategy;
+import com.nextstep.camp.common.view.component.AbstractInput;
+import com.nextstep.camp.lotto.domain.entity.LottoTickets;
+
+public class LottoTicketsManualInput extends AbstractInput<LottoTickets> {
+
+    private LottoTicketsManualInput(InputStrategy<LottoTickets> inputStrategy) {
+        super(inputStrategy);
+    }
+
+    public static LottoTicketsManualInput create(InputStrategy<LottoTickets> inputStrategy) {
+        return new LottoTicketsManualInput(inputStrategy);
+    }
+
+    @Override
+    public String getLabel() {
+        return "\n수동으로 구매할 로또 번호를 입력해 주세요.";
+    }
+}