From 3c454309135706fa05ed5c57178adde8b9eb3e5e Mon Sep 17 00:00:00 2001
From: CHANHAN <130114269+chanani@users.noreply.github.com>
Date: Sun, 23 Nov 2025 23:40:37 +0900
Subject: [PATCH 1/6] =?UTF-8?q?refactor=20:=20=ED=94=BC=EB=93=9C=EB=B0=B1?=
 =?UTF-8?q?=20=EB=B0=9B=EC=9D=80=20=EB=82=B4=EC=9A=A9=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/lotto/domain/NumberElement.java    | 10 ++++++----
 src/main/java/lotto/domain/WinningLotto.java     |  4 ----
 src/test/java/lotto/domain/WinningLottoTest.java |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/lotto/domain/NumberElement.java b/src/main/java/lotto/domain/NumberElement.java
index d48c99b3a3..dc1c3a584d 100644
--- a/src/main/java/lotto/domain/NumberElement.java
+++ b/src/main/java/lotto/domain/NumberElement.java
@@ -6,20 +6,22 @@
 public class NumberElement {
 
     private static final Map<Integer, NumberElement> numberElementMap = new HashMap<>();
+    private static final int START_NUMBER = 1;
+    private static final int END_NUMBER = 45;
 
     static {
-        for (int i = 1; i <= 45; i++) {
+        for (int i = START_NUMBER; i <= END_NUMBER; i++) {
             numberElementMap.put(i, new NumberElement(i));
         }
     }
 
     private final int value;
 
-    public NumberElement() {
+    private NumberElement() {
         this(0);
     }
 
-    public NumberElement(int value) {
+    private NumberElement(int value) {
         validationRange(value);
         this.value = value;
     }
@@ -36,7 +38,7 @@ private static void validationRange(int value) {
     }
 
     private static boolean isRange(int value) {
-        return 1 > value || value > 45;
+        return START_NUMBER > value || value > END_NUMBER;
     }
 
     @Override
diff --git a/src/main/java/lotto/domain/WinningLotto.java b/src/main/java/lotto/domain/WinningLotto.java
index 341d21447f..f299335db9 100644
--- a/src/main/java/lotto/domain/WinningLotto.java
+++ b/src/main/java/lotto/domain/WinningLotto.java
@@ -11,10 +11,6 @@ public class WinningLotto {
     private final Lotto numbers;
     private final NumberElement bonusNumber;
 
-    public WinningLotto(Integer... numbers) {
-        this(integerToLottoNumbers(numbers), NumberElement.create(0));
-    }
-
     public WinningLotto(List<Integer> numbers, int bonusNumber) {
         this(integerToLottoNumbers(numbers), NumberElement.create(bonusNumber));
     }
diff --git a/src/test/java/lotto/domain/WinningLottoTest.java b/src/test/java/lotto/domain/WinningLottoTest.java
index ea1498b779..a6cc7e38c1 100644
--- a/src/test/java/lotto/domain/WinningLottoTest.java
+++ b/src/test/java/lotto/domain/WinningLottoTest.java
@@ -21,7 +21,7 @@ class WinningLottoTest {
     @Test
     void 지난주_당첨번호_6개_미만() {
         assertThatIllegalArgumentException()
-                .isThrownBy(() -> new WinningLotto(1, 2, 3, 4, 5));
+                .isThrownBy(() -> new WinningLotto(new Lotto(1, 2, 3, 4, 5), NumberElement.create(10)));
     }
 
     @Test

From f71b641c9950703f23b5b60f6f808fb560763ab1 Mon Sep 17 00:00:00 2001
From: CHANHAN <130114269+chanani@users.noreply.github.com>
Date: Sun, 23 Nov 2025 23:45:09 +0900
Subject: [PATCH 2/6] =?UTF-8?q?docs=20:=20=EA=B8=B0=EB=8A=A5=20=EC=9A=94?=
 =?UTF-8?q?=EA=B5=AC=EC=82=AC=ED=95=AD=20=EB=B0=8F=20=ED=94=84=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EB=9E=98=EB=B0=8D=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD=20=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4487152817..cda8c4aa42 100644
--- a/README.md
+++ b/README.md
@@ -81,4 +81,24 @@
 - indent(인덴트, 들여쓰기) depth를 2를 넘지 않도록 구현한다. 1까지만 허용한다.
 - 함수(또는 메소드)의 길이가 15라인을 넘어가지 않도록 구현한다.
 - 자바 코드 컨벤션을 지키면서 프로그래밍한다.
-- else 예약어를 쓰지 않는다.
\ No newline at end of file
+- else 예약어를 쓰지 않는다.
+
+## Step4. 로또(수동)
+
+### 기능 요구사항
+
+- [ ] 현재 로또 생성기는 자동 생성 기능만 제공한다. 사용자가 수동으로 추첨 번호를 입력할 수 있도록 해야 한다.
+- [ ] 입력한 금액, 자동 생성 숫자, 수동 생성 번호를 입력하도록 해야 한다.
+
+### 프로그래밍 요구사항
+
+- 규칙 3: 모든 원시값과 문자열을 포장한다.
+- 규칙 5: 줄여쓰지 않는다(축약 금지).
+- 예외 처리를 통해 에러가 발생하지 않도록 한다.
+- 모든 기능을 TDD로 구현해 단위 테스트가 존재해야 한다. 단, UI(System.out, System.in) 로직은 제외
+- java enum을 적용해 프로그래밍을 구현한다.
+- 규칙 8: 일급 콜렉션을 쓴다.
+- indent(인덴트, 들여쓰기) depth를 2를 넘지 않도록 구현한다. 1까지만 허용한다.
+- 함수(또는 메소드)의 길이가 15라인을 넘어가지 않도록 구현한다.
+- 자바 코드 컨벤션을 지키면서 프로그래밍한다.
+- else 예약어를 쓰지 않는다.

From 689b2a067afb3e03484782683434edf7ae119a76 Mon Sep 17 00:00:00 2001
From: CHANHAN <130114269+chanani@users.noreply.github.com>
Date: Mon, 24 Nov 2025 13:48:28 +0900
Subject: [PATCH 3/6] =?UTF-8?q?feat=20:=20=EB=A1=9C=EB=98=90=20=EC=88=98?=
 =?UTF-8?q?=EB=8F=99=20=EA=B5=AC=EB=A7=A4=20=EB=A1=9C=EC=A7=81=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/lotto/Main.java                 | 15 ++++++++--
 src/main/java/lotto/domain/BuyLotto.java      |  9 ++++++
 src/main/java/lotto/domain/Lotto.java         |  4 ++-
 src/main/java/lotto/domain/LottoMachine.java  |  8 ++---
 src/main/java/lotto/domain/LottoPrice.java    | 18 +++++++++---
 src/main/java/lotto/view/InputView.java       | 29 ++++++++++++++++---
 .../java/lotto/domain/LottoMachineTest.java   |  5 ++--
 .../java/lotto/domain/LottoPriceTest.java     | 12 ++++++--
 8 files changed, 78 insertions(+), 22 deletions(-)

diff --git a/src/main/java/lotto/Main.java b/src/main/java/lotto/Main.java
index 073e6b4a37..3915d2a14b 100644
--- a/src/main/java/lotto/Main.java
+++ b/src/main/java/lotto/Main.java
@@ -13,10 +13,21 @@ public class Main {
 
     public static void main(String[] args) {
         printStart();
-        LottoPrice lottoPrice = inputBuyPrice();
+        int price = inputBuyPrice();
+
+        printPassiveBuyLottoCount();
+        int passiveCount = inputPassiveBuyLottoCount();
+        LottoPrice lottoPrice = new LottoPrice(price, passiveCount);
+
+        BuyLotto buyLotto = new BuyLotto();
+        if (passiveCount > 0) {
+            printPassiveBuyLotto();
+            inputPassiveBuyLotto(buyLotto, passiveCount);
+        }
+
         printLottoCount(lottoPrice);
 
-        BuyLotto buyLotto = LottoMachine.createLotto(lottoPrice);
+        LottoMachine.createLotto(buyLotto, lottoPrice);
         printBuyLotto(buyLotto);
 
         printResultLottoNumber();
diff --git a/src/main/java/lotto/domain/BuyLotto.java b/src/main/java/lotto/domain/BuyLotto.java
index 4a5d443e92..470258926e 100644
--- a/src/main/java/lotto/domain/BuyLotto.java
+++ b/src/main/java/lotto/domain/BuyLotto.java
@@ -1,5 +1,6 @@
 package lotto.domain;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -7,6 +8,10 @@ public class BuyLotto {
 
     private final List<Lotto> lottos;
 
+    public BuyLotto() {
+        lottos = new ArrayList<>();
+    }
+
     public BuyLotto(Integer... numbers) {
         this(List.of(new Lotto(numbers)));
     }
@@ -29,6 +34,10 @@ public LottoResult match(WinningLotto winningLotto) {
         return lottoResult;
     }
 
+    public void add(Lotto lotto){
+        this.lottos.add(lotto);
+    }
+
     @Override
     public String toString() {
         return "BuyLotto{" +
diff --git a/src/main/java/lotto/domain/Lotto.java b/src/main/java/lotto/domain/Lotto.java
index f1a8d7f621..900f9447da 100644
--- a/src/main/java/lotto/domain/Lotto.java
+++ b/src/main/java/lotto/domain/Lotto.java
@@ -8,7 +8,9 @@ public class Lotto {
     private final Set<NumberElement> numbers;
 
     public Lotto(Integer... numbers) {
-        this(Arrays.stream(numbers).map(NumberElement::create).collect(Collectors.toSet()));
+        this(Arrays.stream(numbers)
+                .map(NumberElement::create)
+                .collect(Collectors.toCollection(LinkedHashSet::new)));
     }
 
     public Lotto(Set<NumberElement> numbers) {
diff --git a/src/main/java/lotto/domain/LottoMachine.java b/src/main/java/lotto/domain/LottoMachine.java
index ed807f87e2..2d443d99e2 100644
--- a/src/main/java/lotto/domain/LottoMachine.java
+++ b/src/main/java/lotto/domain/LottoMachine.java
@@ -17,16 +17,12 @@ public class LottoMachine {
         }
     }
 
-    public static BuyLotto createLotto(LottoPrice lottoPrice) {
-        List<Lotto> lottoNumbers = new ArrayList<>();
-
+    public static void createLotto(BuyLotto buyLotto, LottoPrice lottoPrice) {
         lottoPrice.create(() -> {
             Collections.shuffle(LottoMachine.lottoNumbers);
-            lottoNumbers.add(new Lotto(new HashSet<>(
+            buyLotto.add(new Lotto(new HashSet<>(
                     LottoMachine.lottoNumbers.subList(0, 6).stream().collect(Collectors.toSet())))
             );
         });
-
-        return new BuyLotto(lottoNumbers);
     }
 }
diff --git a/src/main/java/lotto/domain/LottoPrice.java b/src/main/java/lotto/domain/LottoPrice.java
index 66a9d7e812..01db7fd8cc 100644
--- a/src/main/java/lotto/domain/LottoPrice.java
+++ b/src/main/java/lotto/domain/LottoPrice.java
@@ -6,18 +6,24 @@ public class LottoPrice {
 
     private final Price price;
     private final TicketCount ticketCount;
+    private final TicketCount passiveTicketCount;
 
     public LottoPrice(int price) {
-        this(price, price / 1_000);
+        this(price, (price / 1_000));
     }
 
-    public LottoPrice(int price, int ticketCount) {
-        this(new Price(price), new TicketCount(ticketCount));
+    public LottoPrice(int price, int passiveTicketCount) {
+        this(price, (price / 1_000) - passiveTicketCount, passiveTicketCount);
     }
 
-    public LottoPrice(Price price, TicketCount ticketCount) {
+    public LottoPrice(int price, int ticketCount, int passiveTicketCount) {
+        this(new Price(price), new TicketCount(ticketCount), new TicketCount(passiveTicketCount));
+    }
+
+    public LottoPrice(Price price, TicketCount ticketCount, TicketCount passiveTicketCount) {
         this.price = price;
         this.ticketCount = ticketCount;
+        this.passiveTicketCount = passiveTicketCount;
     }
 
     public void create(Runnable runnable) {
@@ -34,6 +40,10 @@ public int getTicketCount() {
         return ticketCount.getValue();
     }
 
+    public int getPassiveTicketCount() {
+        return passiveTicketCount.getValue();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
diff --git a/src/main/java/lotto/view/InputView.java b/src/main/java/lotto/view/InputView.java
index 1fa1d92599..485b2fd4fa 100644
--- a/src/main/java/lotto/view/InputView.java
+++ b/src/main/java/lotto/view/InputView.java
@@ -12,26 +12,47 @@ public class InputView {
     private static final Scanner scanner = new Scanner(System.in);
 
     private static final String START_MESSAGE = "구입금액을 입력해 주세요.";
-    private static final String LOTTO_COUNT_MESSAGE = "%d개를 구매했습니다.";
+    private static final String LOTTO_COUNT_MESSAGE = "수동으로 %d장, 자동으로 %d개를 구매했습니다.";
     private static final String RESULT_LOTTO_MESSAGE = "지난 주 당첨 번호를 입력해 주세요.";
     private static final String BONUS_NUMBER_MESSAGE = "보너스 볼을 입력해주세요.";
+    private static final String PASSIVE_BUY_COUNT_MESSAGE = "수동으로 구매할 로또 수를 입력해 주세요.";
+    private static final String PASSIVE_BUY_MESSAGE = "수동으로 구매할 번호를 입력해 주세요.";
 
     public static void printStart() {
         System.out.println(START_MESSAGE);
     }
 
-    public static LottoPrice inputBuyPrice() {
-        return new LottoPrice(scanner.nextInt());
+    public static int inputBuyPrice() {
+        return scanner.nextInt();
     }
 
     public static void printLottoCount(LottoPrice lottoPrice) {
-        System.out.println(String.format(LOTTO_COUNT_MESSAGE, lottoPrice.getTicketCount()));
+        System.out.println(String.format(LOTTO_COUNT_MESSAGE, lottoPrice.getPassiveTicketCount(), lottoPrice.getTicketCount()));
     }
 
     public static void printBuyLotto(BuyLotto buyLotto) {
         buyLotto.getLottos().stream().forEach(System.out::println);
     }
 
+    public static void printPassiveBuyLottoCount() {
+        System.out.println(PASSIVE_BUY_COUNT_MESSAGE);
+    }
+
+    public static void printPassiveBuyLotto() {
+        System.out.println(PASSIVE_BUY_MESSAGE);
+    }
+
+    public static void inputPassiveBuyLotto(BuyLotto buyLotto, int count) {
+        scanner.nextLine();
+        for (int i = 0; i < count; i++) {
+            buyLotto.add(new Lotto(StringToIntegerArray(scanner.next())));
+        }
+    }
+
+    public static int inputPassiveBuyLottoCount() {
+        return scanner.nextInt();
+    }
+
     public static void printResultLottoNumber() {
         System.out.println(RESULT_LOTTO_MESSAGE);
     }
diff --git a/src/test/java/lotto/domain/LottoMachineTest.java b/src/test/java/lotto/domain/LottoMachineTest.java
index 0b2a1b0cf7..b81bbac49f 100644
--- a/src/test/java/lotto/domain/LottoMachineTest.java
+++ b/src/test/java/lotto/domain/LottoMachineTest.java
@@ -8,7 +8,8 @@ public class LottoMachineTest {
 
     @Test
     void 로또번호_생성() {
-        BuyLotto results = LottoMachine.createLotto(new LottoPrice(5000));
-        assertThat(results.getLottos()).hasSize(5);
+        BuyLotto buyLotto = new BuyLotto();
+        LottoMachine.createLotto(buyLotto, new LottoPrice(5000));
+        assertThat(buyLotto.getLottos()).hasSize(5);
     }
 }
diff --git a/src/test/java/lotto/domain/LottoPriceTest.java b/src/test/java/lotto/domain/LottoPriceTest.java
index 73ea51aab7..1719e85ef1 100644
--- a/src/test/java/lotto/domain/LottoPriceTest.java
+++ b/src/test/java/lotto/domain/LottoPriceTest.java
@@ -8,19 +8,25 @@
 class LottoPriceTest {
 
     @Test
-    void 생성(){
+    void 생성() {
         LottoPrice lottoPrice = new LottoPrice(100000);
         assertThat(lottoPrice).isEqualTo(new LottoPrice(100000, 100));
     }
 
     @Test
-    void 천원_이하_생성시_오류(){
+    void 천원_이하_생성시_오류() {
         assertThatIllegalArgumentException().isThrownBy(() -> new LottoPrice(900));
     }
 
     @Test
-    void 천원단위가_아닐경우_오류(){
+    void 천원단위가_아닐경우_오류() {
         assertThatIllegalArgumentException().isThrownBy(() -> new LottoPrice(13340));
     }
 
+    @Test
+    void 수동_로또_생성() {
+        LottoPrice lottoPrice = new LottoPrice(10000, 3);
+        assertThat(lottoPrice).isEqualTo(new LottoPrice(10000, 7, 3));
+    }
+
 }
\ No newline at end of file

From a8bc5fdefdb47b46e02a0fabe19ba50eab19a8d3 Mon Sep 17 00:00:00 2001
From: CHANHAN <130114269+chanani@users.noreply.github.com>
Date: Mon, 24 Nov 2025 14:09:55 +0900
Subject: [PATCH 4/6] =?UTF-8?q?feat=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/lotto/domain/LottoMachine.java     | 4 +---
 src/main/java/lotto/domain/LottoPrice.java       | 2 +-
 src/test/java/lotto/domain/LottoMachineTest.java | 8 ++++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/lotto/domain/LottoMachine.java b/src/main/java/lotto/domain/LottoMachine.java
index 2d443d99e2..5752feb78c 100644
--- a/src/main/java/lotto/domain/LottoMachine.java
+++ b/src/main/java/lotto/domain/LottoMachine.java
@@ -20,9 +20,7 @@ public class LottoMachine {
     public static void createLotto(BuyLotto buyLotto, LottoPrice lottoPrice) {
         lottoPrice.create(() -> {
             Collections.shuffle(LottoMachine.lottoNumbers);
-            buyLotto.add(new Lotto(new HashSet<>(
-                    LottoMachine.lottoNumbers.subList(0, 6).stream().collect(Collectors.toSet())))
-            );
+            buyLotto.add(new Lotto(new HashSet<>(LottoMachine.lottoNumbers.subList(0, 6))));
         });
     }
 }
diff --git a/src/main/java/lotto/domain/LottoPrice.java b/src/main/java/lotto/domain/LottoPrice.java
index 01db7fd8cc..ba83f31601 100644
--- a/src/main/java/lotto/domain/LottoPrice.java
+++ b/src/main/java/lotto/domain/LottoPrice.java
@@ -9,7 +9,7 @@ public class LottoPrice {
     private final TicketCount passiveTicketCount;
 
     public LottoPrice(int price) {
-        this(price, (price / 1_000));
+        this(price, (price / 1_000), 0);
     }
 
     public LottoPrice(int price, int passiveTicketCount) {
diff --git a/src/test/java/lotto/domain/LottoMachineTest.java b/src/test/java/lotto/domain/LottoMachineTest.java
index b81bbac49f..b8936a3b94 100644
--- a/src/test/java/lotto/domain/LottoMachineTest.java
+++ b/src/test/java/lotto/domain/LottoMachineTest.java
@@ -12,4 +12,12 @@ public class LottoMachineTest {
         LottoMachine.createLotto(buyLotto, new LottoPrice(5000));
         assertThat(buyLotto.getLottos()).hasSize(5);
     }
+
+    @Test
+    void 로또번호_수동_생성() {
+        BuyLotto buyLotto = new BuyLotto();
+        buyLotto.add(new Lotto(1, 2, 3, 4, 5, 6));
+        LottoMachine.createLotto(buyLotto, new LottoPrice(5000, 1));
+        assertThat(buyLotto.getLottos()).hasSize(5);
+    }
 }

From 290700f58ea4d4ed3c6149b8f77d9bd6642f26c0 Mon Sep 17 00:00:00 2001
From: CHANHAN <130114269+chanani@users.noreply.github.com>
Date: Mon, 24 Nov 2025 19:14:50 +0900
Subject: [PATCH 5/6] =?UTF-8?q?refactor=20:=20=EC=9D=B8=EC=8A=A4=ED=84=B4?=
 =?UTF-8?q?=EC=8A=A4=20=EB=B3=80=EC=88=98=20=EC=A4=84=EC=9D=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=B4=20TicketCount=20=ED=81=B4=EB=9E=98=EC=8A=A4?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EB=8F=99=20=EB=A1=9C=EB=98=90=20=EA=B0=AF?=
 =?UTF-8?q?=EC=88=98=20=EC=9D=B4=EB=8F=99,=20=EC=88=98=EB=8F=99,=20?=
 =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EB=A1=9C=EB=98=90=20=EB=B3=91=ED=95=A9=20?=
 =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/lotto/Main.java                 | 14 ++++++----
 src/main/java/lotto/domain/LottoMachine.java  |  7 ++---
 src/main/java/lotto/domain/LottoPrice.java    | 26 +++++--------------
 .../{BuyLotto.java => PurchasedLottos.java}   | 16 +++++++-----
 src/main/java/lotto/domain/TicketCount.java   | 26 ++++++++++++++-----
 src/main/java/lotto/domain/WinningLotto.java  | 14 +++-------
 src/main/java/lotto/view/InputView.java       | 16 +++++++-----
 .../java/lotto/domain/LottoMachineTest.java   | 15 ++++++-----
 .../java/lotto/domain/LottoPriceTest.java     | 10 +++----
 .../java/lotto/domain/LottoResultTest.java    |  2 +-
 .../java/lotto/domain/WinningLottoTest.java   |  4 +--
 11 files changed, 79 insertions(+), 71 deletions(-)
 rename src/main/java/lotto/domain/{BuyLotto.java => PurchasedLottos.java} (75%)

diff --git a/src/main/java/lotto/Main.java b/src/main/java/lotto/Main.java
index 3915d2a14b..3172677acb 100644
--- a/src/main/java/lotto/Main.java
+++ b/src/main/java/lotto/Main.java
@@ -4,6 +4,8 @@
 import lotto.domain.*;
 
 
+import java.util.List;
+
 import static lotto.domain.LottoResult.*;
 import static lotto.view.InputView.*;
 import static lotto.view.InputView.inputBuyPrice;
@@ -19,16 +21,18 @@ public static void main(String[] args) {
         int passiveCount = inputPassiveBuyLottoCount();
         LottoPrice lottoPrice = new LottoPrice(price, passiveCount);
 
-        BuyLotto buyLotto = new BuyLotto();
+        PurchasedLottos purchasedLottos = new PurchasedLottos();
         if (passiveCount > 0) {
             printPassiveBuyLotto();
-            inputPassiveBuyLotto(buyLotto, passiveCount);
+            inputPassiveBuyLotto(purchasedLottos, passiveCount);
         }
 
         printLottoCount(lottoPrice);
 
-        LottoMachine.createLotto(buyLotto, lottoPrice);
-        printBuyLotto(buyLotto);
+        PurchasedLottos createLottos = LottoMachine.createLotto(lottoPrice);
+        purchasedLottos.addAll(createLottos);
+
+        printBuyLotto(purchasedLottos);
 
         printResultLottoNumber();
         Lotto resultLotto = inputResultLottoNumber();
@@ -37,7 +41,7 @@ public static void main(String[] args) {
         WinningLotto winningLotto = new WinningLotto(resultLotto, bonusNumber);
 
         printResultMessage();
-        LottoResult lottoResult = winningLotto.checkLottoNumber(buyLotto);
+        LottoResult lottoResult = winningLotto.checkLottoNumber(purchasedLottos);
 
         printResult(lottoResult);
         printProfit(profitPercent(lottoPrice));
diff --git a/src/main/java/lotto/domain/LottoMachine.java b/src/main/java/lotto/domain/LottoMachine.java
index 5752feb78c..9cce1315a0 100644
--- a/src/main/java/lotto/domain/LottoMachine.java
+++ b/src/main/java/lotto/domain/LottoMachine.java
@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class LottoMachine {
 
@@ -17,10 +16,12 @@ public class LottoMachine {
         }
     }
 
-    public static void createLotto(BuyLotto buyLotto, LottoPrice lottoPrice) {
+    public static PurchasedLottos createLotto(LottoPrice lottoPrice) {
+        List<Lotto> lottos = new ArrayList<>();
         lottoPrice.create(() -> {
             Collections.shuffle(LottoMachine.lottoNumbers);
-            buyLotto.add(new Lotto(new HashSet<>(LottoMachine.lottoNumbers.subList(0, 6))));
+            lottos.add(new Lotto(new HashSet<>(LottoMachine.lottoNumbers.subList(0, 6))));
         });
+        return new PurchasedLottos(lottos);
     }
 }
diff --git a/src/main/java/lotto/domain/LottoPrice.java b/src/main/java/lotto/domain/LottoPrice.java
index ba83f31601..c330885bcb 100644
--- a/src/main/java/lotto/domain/LottoPrice.java
+++ b/src/main/java/lotto/domain/LottoPrice.java
@@ -6,42 +6,30 @@ public class LottoPrice {
 
     private final Price price;
     private final TicketCount ticketCount;
-    private final TicketCount passiveTicketCount;
-
-    public LottoPrice(int price) {
-        this(price, (price / 1_000), 0);
-    }
 
     public LottoPrice(int price, int passiveTicketCount) {
-        this(price, (price / 1_000) - passiveTicketCount, passiveTicketCount);
+        this(price, new TicketCount(price, passiveTicketCount));
     }
 
-    public LottoPrice(int price, int ticketCount, int passiveTicketCount) {
-        this(new Price(price), new TicketCount(ticketCount), new TicketCount(passiveTicketCount));
+    public LottoPrice(int price, TicketCount ticketCount) {
+        this(new Price(price), ticketCount);
     }
 
-    public LottoPrice(Price price, TicketCount ticketCount, TicketCount passiveTicketCount) {
+    public LottoPrice(Price price, TicketCount ticketCount) {
         this.price = price;
         this.ticketCount = ticketCount;
-        this.passiveTicketCount = passiveTicketCount;
     }
 
     public void create(Runnable runnable) {
-        for (int i = 0; i < this.ticketCount.getValue(); i++) {
-            runnable.run();
-        }
+        this.ticketCount.create(runnable);
     }
 
     public double profitPercent(int totalResultPrice) {
         return price.profitPercent(totalResultPrice);
     }
 
-    public int getTicketCount() {
-        return ticketCount.getValue();
-    }
-
-    public int getPassiveTicketCount() {
-        return passiveTicketCount.getValue();
+    public TicketCount getTicketCount() {
+        return ticketCount;
     }
 
     @Override
diff --git a/src/main/java/lotto/domain/BuyLotto.java b/src/main/java/lotto/domain/PurchasedLottos.java
similarity index 75%
rename from src/main/java/lotto/domain/BuyLotto.java
rename to src/main/java/lotto/domain/PurchasedLottos.java
index 470258926e..b5952e3068 100644
--- a/src/main/java/lotto/domain/BuyLotto.java
+++ b/src/main/java/lotto/domain/PurchasedLottos.java
@@ -4,19 +4,19 @@
 import java.util.List;
 import java.util.Objects;
 
-public class BuyLotto {
+public class PurchasedLottos {
 
     private final List<Lotto> lottos;
 
-    public BuyLotto() {
+    public PurchasedLottos() {
         lottos = new ArrayList<>();
     }
 
-    public BuyLotto(Integer... numbers) {
+    public PurchasedLottos(Integer... numbers) {
         this(List.of(new Lotto(numbers)));
     }
 
-    public BuyLotto(List<Lotto> lottos) {
+    public PurchasedLottos(List<Lotto> lottos) {
         this.lottos = lottos;
     }
 
@@ -38,9 +38,13 @@ public void add(Lotto lotto){
         this.lottos.add(lotto);
     }
 
+    public void addAll(PurchasedLottos lottos){
+        this.lottos.addAll(lottos.lottos);
+    }
+
     @Override
     public String toString() {
-        return "BuyLotto{" +
+        return "PurchasedLottos{" +
                 "lotto=" + lottos +
                 '}';
     }
@@ -48,7 +52,7 @@ public String toString() {
     @Override
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
-        BuyLotto buyLotto = (BuyLotto) o;
+        PurchasedLottos buyLotto = (PurchasedLottos) o;
         return Objects.equals(getLottos(), buyLotto.getLottos());
     }
 
diff --git a/src/main/java/lotto/domain/TicketCount.java b/src/main/java/lotto/domain/TicketCount.java
index 5e2f69643b..a1d6458af1 100644
--- a/src/main/java/lotto/domain/TicketCount.java
+++ b/src/main/java/lotto/domain/TicketCount.java
@@ -4,25 +4,37 @@
 
 public class TicketCount {
 
-    private final int value;
+    private final int autoTicketCount;
+    private final int passiveTicketCount;
 
-    public TicketCount(int value) {
-        this.value = value;
+    public TicketCount(int price, int passiveTicketCount) {
+        this.autoTicketCount = (price / 1_000) - passiveTicketCount;
+        this.passiveTicketCount = passiveTicketCount;
     }
 
-    public int getValue() {
-        return this.value;
+    public void create(Runnable runnable) {
+        for (int i = 0; i < this.autoTicketCount; i++) {
+            runnable.run();
+        }
+    }
+
+    public int getAutoTicketCount() {
+        return this.autoTicketCount;
+    }
+
+    public int getPassiveTicketCount() {
+        return passiveTicketCount;
     }
 
     @Override
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         TicketCount that = (TicketCount) o;
-        return getValue() == that.getValue();
+        return getAutoTicketCount() == that.getAutoTicketCount();
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(getValue());
+        return Objects.hashCode(getAutoTicketCount());
     }
 }
diff --git a/src/main/java/lotto/domain/WinningLotto.java b/src/main/java/lotto/domain/WinningLotto.java
index f299335db9..b3a8db4532 100644
--- a/src/main/java/lotto/domain/WinningLotto.java
+++ b/src/main/java/lotto/domain/WinningLotto.java
@@ -25,14 +25,8 @@ public WinningLotto(Lotto numbers, NumberElement bonusNumber) {
         this.bonusNumber = bonusNumber;
     }
 
-    public LottoResult checkLottoNumber(BuyLotto buyLottos) {
-        return buyLottos.match(this);
-    }
-
-    private static Lotto integerToLottoNumbers(Integer... numbers) {
-        return new Lotto(Arrays.stream(numbers)
-                .map(NumberElement::create)
-                .collect(Collectors.toSet()));
+    public LottoResult checkLottoNumber(PurchasedLottos purchasedLottos) {
+        return purchasedLottos.match(this);
     }
 
     private static Lotto integerToLottoNumbers(List<Integer> numbers) {
@@ -55,8 +49,8 @@ private static boolean isBonus(int count) {
         return count == 5;
     }
 
-    public LottoRank checkBonusNumber(Lotto buyLotto, NumberElement bonusNumber) {
-        if (buyLotto.checkBonusNumber(bonusNumber)) {
+    public LottoRank checkBonusNumber(Lotto purchasedLotto, NumberElement bonusNumber) {
+        if (purchasedLotto.checkBonusNumber(bonusNumber)) {
             return LottoRank.SECOND;
         }
         return LottoRank.THIRD;
diff --git a/src/main/java/lotto/view/InputView.java b/src/main/java/lotto/view/InputView.java
index 485b2fd4fa..3ddc0653d5 100644
--- a/src/main/java/lotto/view/InputView.java
+++ b/src/main/java/lotto/view/InputView.java
@@ -1,6 +1,6 @@
 package lotto.view;
 
-import lotto.domain.BuyLotto;
+import lotto.domain.PurchasedLottos;
 import lotto.domain.Lotto;
 import lotto.domain.LottoPrice;
 
@@ -27,11 +27,15 @@ public static int inputBuyPrice() {
     }
 
     public static void printLottoCount(LottoPrice lottoPrice) {
-        System.out.println(String.format(LOTTO_COUNT_MESSAGE, lottoPrice.getPassiveTicketCount(), lottoPrice.getTicketCount()));
+        System.out.println(String.format(
+                LOTTO_COUNT_MESSAGE,
+                lottoPrice.getTicketCount().getPassiveTicketCount(),
+                lottoPrice.getTicketCount().getAutoTicketCount())
+        );
     }
 
-    public static void printBuyLotto(BuyLotto buyLotto) {
-        buyLotto.getLottos().stream().forEach(System.out::println);
+    public static void printBuyLotto(PurchasedLottos purchasedLottos) {
+        purchasedLottos.getLottos().stream().forEach(System.out::println);
     }
 
     public static void printPassiveBuyLottoCount() {
@@ -42,10 +46,10 @@ public static void printPassiveBuyLotto() {
         System.out.println(PASSIVE_BUY_MESSAGE);
     }
 
-    public static void inputPassiveBuyLotto(BuyLotto buyLotto, int count) {
+    public static void inputPassiveBuyLotto(PurchasedLottos purchasedLottos, int count) {
         scanner.nextLine();
         for (int i = 0; i < count; i++) {
-            buyLotto.add(new Lotto(StringToIntegerArray(scanner.next())));
+            purchasedLottos.add(new Lotto(StringToIntegerArray(scanner.next())));
         }
     }
 
diff --git a/src/test/java/lotto/domain/LottoMachineTest.java b/src/test/java/lotto/domain/LottoMachineTest.java
index b8936a3b94..721654ad45 100644
--- a/src/test/java/lotto/domain/LottoMachineTest.java
+++ b/src/test/java/lotto/domain/LottoMachineTest.java
@@ -2,22 +2,23 @@
 
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.*;
 
 public class LottoMachineTest {
 
     @Test
     void 로또번호_생성() {
-        BuyLotto buyLotto = new BuyLotto();
-        LottoMachine.createLotto(buyLotto, new LottoPrice(5000));
-        assertThat(buyLotto.getLottos()).hasSize(5);
+
+        PurchasedLottos purchasedLottos = LottoMachine.createLotto(new LottoPrice(5000, 0));
+        assertThat(purchasedLottos.getLottos()).hasSize(5);
     }
 
     @Test
     void 로또번호_수동_생성() {
-        BuyLotto buyLotto = new BuyLotto();
-        buyLotto.add(new Lotto(1, 2, 3, 4, 5, 6));
-        LottoMachine.createLotto(buyLotto, new LottoPrice(5000, 1));
-        assertThat(buyLotto.getLottos()).hasSize(5);
+        PurchasedLottos purchasedLottos = LottoMachine.createLotto(new LottoPrice(5000, 1));
+        purchasedLottos.addAll(new PurchasedLottos(List.of(new Lotto(1, 2, 3, 4, 5, 6))));
+        assertThat(purchasedLottos.getLottos()).hasSize(5);
     }
 }
diff --git a/src/test/java/lotto/domain/LottoPriceTest.java b/src/test/java/lotto/domain/LottoPriceTest.java
index 1719e85ef1..b1fc6612dc 100644
--- a/src/test/java/lotto/domain/LottoPriceTest.java
+++ b/src/test/java/lotto/domain/LottoPriceTest.java
@@ -9,24 +9,24 @@ class LottoPriceTest {
 
     @Test
     void 생성() {
-        LottoPrice lottoPrice = new LottoPrice(100000);
-        assertThat(lottoPrice).isEqualTo(new LottoPrice(100000, 100));
+        LottoPrice lottoPrice = new LottoPrice(100000, 0);
+        assertThat(lottoPrice).isEqualTo(new LottoPrice(100000, 0));
     }
 
     @Test
     void 천원_이하_생성시_오류() {
-        assertThatIllegalArgumentException().isThrownBy(() -> new LottoPrice(900));
+        assertThatIllegalArgumentException().isThrownBy(() -> new LottoPrice(900, 0));
     }
 
     @Test
     void 천원단위가_아닐경우_오류() {
-        assertThatIllegalArgumentException().isThrownBy(() -> new LottoPrice(13340));
+        assertThatIllegalArgumentException().isThrownBy(() -> new LottoPrice(13340, 0));
     }
 
     @Test
     void 수동_로또_생성() {
         LottoPrice lottoPrice = new LottoPrice(10000, 3);
-        assertThat(lottoPrice).isEqualTo(new LottoPrice(10000, 7, 3));
+        assertThat(lottoPrice).isEqualTo(new LottoPrice(10000, 3));
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/lotto/domain/LottoResultTest.java b/src/test/java/lotto/domain/LottoResultTest.java
index c92a37880f..b98c521477 100644
--- a/src/test/java/lotto/domain/LottoResultTest.java
+++ b/src/test/java/lotto/domain/LottoResultTest.java
@@ -15,7 +15,7 @@ void init() {
 
     @Test
     void 수익률_100퍼센트_미만() {
-        double result = LottoResult.profitPercent(new LottoPrice(100000));
+        double result = LottoResult.profitPercent(new LottoPrice(100000, 0));
         Assertions.assertThat(result).isEqualTo(0.5);
     }
 
diff --git a/src/test/java/lotto/domain/WinningLottoTest.java b/src/test/java/lotto/domain/WinningLottoTest.java
index a6cc7e38c1..33efef4235 100644
--- a/src/test/java/lotto/domain/WinningLottoTest.java
+++ b/src/test/java/lotto/domain/WinningLottoTest.java
@@ -14,7 +14,7 @@ class WinningLottoTest {
     void 로또번호_3개_일치() {
         WinningLotto lottoNumber = new WinningLotto(List.of(1, 2, 3, 4, 5, 6), 30);
         LottoResult lottoResult = lottoNumber.checkLottoNumber(
-                new BuyLotto(13, 2, 33, 40, 1, 3));
+                new PurchasedLottos(13, 2, 33, 40, 1, 3));
         assertThat(lottoResult.getLottoNumberResult().getFirst()).isEqualTo(new LottoNumberResult(LottoRank.FIFTH, 1));
     }
 
@@ -27,7 +27,7 @@ class WinningLottoTest {
     @Test
     void 로또번호_5개_보너스번호_일치() {
         WinningLotto lottoNumber = new WinningLotto(List.of(1, 2, 3, 4, 5, 6), 7);
-        LottoResult lottoResult = lottoNumber.checkLottoNumber(new BuyLotto(1, 2, 3, 4, 5, 7));
+        LottoResult lottoResult = lottoNumber.checkLottoNumber(new PurchasedLottos(1, 2, 3, 4, 5, 7));
         // [FOURTH(0), THIRD(0), SECOND(0), BONUS(1), FIRST(0)]
         assertThat(lottoResult.getLottoNumberResult().get(3)).isEqualTo(new LottoNumberResult(LottoRank.SECOND, 1));
     }

From 7ada0687723b05efbe4c03bb439b0ace0f6f359f Mon Sep 17 00:00:00 2001
From: CHANHAN <130114269+chanani@users.noreply.github.com>
Date: Tue, 9 Dec 2025 20:27:25 +0900
Subject: [PATCH 6/6] =?UTF-8?q?refactor=20:=20=ED=94=BC=EB=93=9C=EB=B0=B1?=
 =?UTF-8?q?=20=EB=B0=9B=EC=9D=80=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?,=20=EC=BD=98=EC=86=94=EC=97=90=20=EB=82=98=EC=98=A4=EB=8A=94?=
 =?UTF-8?q?=20=EB=A1=9C=EB=98=90=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=82=B4?=
 =?UTF-8?q?=EB=B6=80=EC=97=90=EC=84=9C=20=EB=A7=8C=EB=93=A4=EC=96=B4?=
 =?UTF-8?q?=EC=84=9C=20=EC=A0=84=EB=8B=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/lotto/Main.java                   | 4 ----
 src/main/java/lotto/domain/LottoMachine.java    | 5 ++++-
 src/main/java/lotto/domain/Price.java           | 7 ++++++-
 src/main/java/lotto/domain/PurchasedLottos.java | 8 ++++++++
 src/main/java/lotto/domain/TicketCount.java     | 2 +-
 src/main/java/lotto/view/InputView.java         | 2 +-
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/lotto/Main.java b/src/main/java/lotto/Main.java
index 3172677acb..fd27eeb46d 100644
--- a/src/main/java/lotto/Main.java
+++ b/src/main/java/lotto/Main.java
@@ -1,11 +1,7 @@
 package lotto;
 
-
 import lotto.domain.*;
 
-
-import java.util.List;
-
 import static lotto.domain.LottoResult.*;
 import static lotto.view.InputView.*;
 import static lotto.view.InputView.inputBuyPrice;
diff --git a/src/main/java/lotto/domain/LottoMachine.java b/src/main/java/lotto/domain/LottoMachine.java
index 9cce1315a0..876d3fe1e9 100644
--- a/src/main/java/lotto/domain/LottoMachine.java
+++ b/src/main/java/lotto/domain/LottoMachine.java
@@ -7,11 +7,14 @@
 
 public class LottoMachine {
 
+    public static final int MIN_LOTTO_NUMBER = 1;
+    public static final int MAX_LOTTO_NUMBER = 45;
+
     private static final List<NumberElement> lottoNumbers;
 
     static {
         lottoNumbers = new ArrayList<>();
-        for (int i = 1; i <= 45; i++) {
+        for (int i = MIN_LOTTO_NUMBER; i <= MAX_LOTTO_NUMBER; i++) {
             lottoNumbers.add(NumberElement.create(i));
         }
     }
diff --git a/src/main/java/lotto/domain/Price.java b/src/main/java/lotto/domain/Price.java
index 4c420a643e..4c25b189ff 100644
--- a/src/main/java/lotto/domain/Price.java
+++ b/src/main/java/lotto/domain/Price.java
@@ -31,11 +31,15 @@ private void checkMinPrice(int value) {
     }
 
     private void checkDivisibleByThousand(int value) {
-        if (value % 1000 != 0) {
+        if (value % 1_000 != 0) {
             throw new IllegalArgumentException("1000 단위로 입력해주세요.");
         }
     }
 
+    public int autoTiketCount(int passiveTicketCount) {
+        return (this.value / 1_000) - passiveTicketCount;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
@@ -47,4 +51,5 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hashCode(getValue());
     }
+
 }
diff --git a/src/main/java/lotto/domain/PurchasedLottos.java b/src/main/java/lotto/domain/PurchasedLottos.java
index b5952e3068..eb31a870a5 100644
--- a/src/main/java/lotto/domain/PurchasedLottos.java
+++ b/src/main/java/lotto/domain/PurchasedLottos.java
@@ -42,6 +42,14 @@ public void addAll(PurchasedLottos lottos){
         this.lottos.addAll(lottos.lottos);
     }
 
+    public String toLottosString() {
+        StringBuilder sb = new StringBuilder();
+        for (Lotto lotto : lottos) {
+            sb.append(lotto).append("\n");
+        }
+        return sb.toString();
+    }
+
     @Override
     public String toString() {
         return "PurchasedLottos{" +
diff --git a/src/main/java/lotto/domain/TicketCount.java b/src/main/java/lotto/domain/TicketCount.java
index a1d6458af1..30e3b82a9e 100644
--- a/src/main/java/lotto/domain/TicketCount.java
+++ b/src/main/java/lotto/domain/TicketCount.java
@@ -8,7 +8,7 @@ public class TicketCount {
     private final int passiveTicketCount;
 
     public TicketCount(int price, int passiveTicketCount) {
-        this.autoTicketCount = (price / 1_000) - passiveTicketCount;
+        this.autoTicketCount = new Price(price).autoTiketCount(passiveTicketCount);
         this.passiveTicketCount = passiveTicketCount;
     }
 
diff --git a/src/main/java/lotto/view/InputView.java b/src/main/java/lotto/view/InputView.java
index 3ddc0653d5..932e8b8604 100644
--- a/src/main/java/lotto/view/InputView.java
+++ b/src/main/java/lotto/view/InputView.java
@@ -35,7 +35,7 @@ public static void printLottoCount(LottoPrice lottoPrice) {
     }
 
     public static void printBuyLotto(PurchasedLottos purchasedLottos) {
-        purchasedLottos.getLottos().stream().forEach(System.out::println);
+        System.out.println(purchasedLottos.toLottosString());
     }
 
     public static void printPassiveBuyLottoCount() {