From 2fc1bfd1d0210eaee02ce50b3d7bf9456ae4a4af Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 17:14:39 +0900 Subject: [PATCH 01/28] =?UTF-8?q?docs=20:=20=ED=95=84=EC=9A=94=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EB=AA=A9=EB=A1=9D=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/docs/README.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/main/docs/README.md diff --git a/src/main/docs/README.md b/src/main/docs/README.md new file mode 100644 index 000000000..80547a44a --- /dev/null +++ b/src/main/docs/README.md @@ -0,0 +1,30 @@ +# 자판기 +### 기능 : 상품을 구매하면 자판기가 가진 동전만으로 잔돈을 거슬러준다. +1. 투입 금액 받기 + ```[콜라,1500,20];[사이다,1000,10]``` + - 상품명 입력받기 + - 가격 입력받기 + - 수량 입력받기 +2. 자판이가 보유하고 있는 금액에서 동전을 무작위로 생성하기 + - 자판기가 보유한 동전을 출력한다. +3. 잔돈 돌려주기 + - 동전의 개수를 최소한으로 잔돈 돌려주기 + - 지폐 단위는 사용 불가하다. + - 잔액 중 동전만 사용해 반환 불가능 시에 남은 금액은 자판기에 남는다. +4. 상품을 구매하기 + - 더이상 구매가 불가능한 경우(남은 금액이 상품의 최저 가격보다 적음, 모든 상품이 소진됨.) 잔돈을 반환한다 + + +# 프로그래밍 요구사항 - Coin +Coin 클래스를 활용해 구현해야 한다. +필드(인스턴스 변수)인 amount의 접근 제어자 private을 변경할 수 없다. + +IllegalArgumentException를 발생시키고, "[ERROR]"로 시작하는 에러 메시지를 출력 후 해당 부분부터 다시 입력을 받는다 + +Randoms, Console API를 사용한다. + +✅ indent(인덴트, 들여쓰기) depth를 3이 넘지 않도록 구현한다. 2까지만 허용한다. +✅ 3항 연산자를 쓰지 않는다. +✅ 함수(또는 메소드)의 길이가 15라인을 넘어가지 않도록 구현한다. +✅ 함수(또는 메소드)가 한 가지 일만 잘 하도록 구현한다. +✅ else 예약어를 쓰지 않는다. \ No newline at end of file From c7a2b21df33805b9a90ba340b26815bf196cf2e1 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 17:18:17 +0900 Subject: [PATCH 02/28] =?UTF-8?q?feat(Product)=20:=20=EC=83=81=ED=92=88=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=83=9D=EC=84=B1=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vendingmachine/{ => domain}/Coin.java | 2 +- .../java/vendingmachine/domain/Product.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) rename src/main/java/vendingmachine/{ => domain}/Coin.java (87%) create mode 100644 src/main/java/vendingmachine/domain/Product.java diff --git a/src/main/java/vendingmachine/Coin.java b/src/main/java/vendingmachine/domain/Coin.java similarity index 87% rename from src/main/java/vendingmachine/Coin.java rename to src/main/java/vendingmachine/domain/Coin.java index c76293fbc..7bb89c146 100644 --- a/src/main/java/vendingmachine/Coin.java +++ b/src/main/java/vendingmachine/domain/Coin.java @@ -1,4 +1,4 @@ -package vendingmachine; +package vendingmachine.domain; public enum Coin { COIN_500(500), diff --git a/src/main/java/vendingmachine/domain/Product.java b/src/main/java/vendingmachine/domain/Product.java new file mode 100644 index 000000000..6db85c1c2 --- /dev/null +++ b/src/main/java/vendingmachine/domain/Product.java @@ -0,0 +1,19 @@ +package vendingmachine.domain; + +import vendingmachine.validators.ProductValidator; + +public class Product { + private final String name; + private final int price; + + private Product(final String name, final int price) { + this.name = name; + this.price = price; + } + + public static Product of (String name, int price){ + ProductValidator.validate(name, price); + return new Product(name, price); + } + +} From 020231181a0b948229b85469873cb87c626f1f1d Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 17:24:29 +0900 Subject: [PATCH 03/28] =?UTF-8?q?docs=20:=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20=EC=82=AC=ED=95=AD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/docs/README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/docs/README.md b/src/main/docs/README.md index 80547a44a..ab6d97ba7 100644 --- a/src/main/docs/README.md +++ b/src/main/docs/README.md @@ -1,17 +1,23 @@ # 자판기 ### 기능 : 상품을 구매하면 자판기가 가진 동전만으로 잔돈을 거슬러준다. -1. 투입 금액 받기 +1. 자판기의 보유 금액 입력받기 + - Coin으로 나누어 떨어져야 한다. 즉, 10원 단위로 나누어 떨어진다. + - 0원도 가능하다 (잔돈 반환 불가능 시, 자판기에 남는다.) +2. 투입 금액 받기 ```[콜라,1500,20];[사이다,1000,10]``` - 상품명 입력받기 - 가격 입력받기 + - [ ] 최소 상품 판매 금액은 100원 이상이다. + - [ ] 10원으로 나누어떨어져야 한다. - 수량 입력받기 -2. 자판이가 보유하고 있는 금액에서 동전을 무작위로 생성하기 + - [ ] 최소 1개 이상이다. +3. 자판이가 보유하고 있는 금액에서 동전을 무작위로 생성하기 - 자판기가 보유한 동전을 출력한다. -3. 잔돈 돌려주기 +4. 잔돈 돌려주기 - 동전의 개수를 최소한으로 잔돈 돌려주기 - 지폐 단위는 사용 불가하다. - 잔액 중 동전만 사용해 반환 불가능 시에 남은 금액은 자판기에 남는다. -4. 상품을 구매하기 +5. 상품을 구매하기 - 더이상 구매가 불가능한 경우(남은 금액이 상품의 최저 가격보다 적음, 모든 상품이 소진됨.) 잔돈을 반환한다 From f2f1c4b2e8421afd19b506a4970658d30733101c Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 17:42:38 +0900 Subject: [PATCH 04/28] =?UTF-8?q?feat(ProductPrice)=20:=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EC=9D=98=20=EA=B8=88=EC=95=A1=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=ED=95=9C=20=EA=B2=80=EC=A6=9D=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/docs/README.md | 4 +-- src/main/java/vendingmachine/domain/Coin.java | 8 ++++- .../java/vendingmachine/domain/Product.java | 2 +- .../validators/ProductValidator.java | 24 +++++++++++++ .../validators/ProductValidatorTest.java | 34 +++++++++++++++++++ 5 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 src/main/java/vendingmachine/validators/ProductValidator.java create mode 100644 src/test/java/vendingmachine/validators/ProductValidatorTest.java diff --git a/src/main/docs/README.md b/src/main/docs/README.md index ab6d97ba7..0177726f2 100644 --- a/src/main/docs/README.md +++ b/src/main/docs/README.md @@ -7,8 +7,8 @@ ```[콜라,1500,20];[사이다,1000,10]``` - 상품명 입력받기 - 가격 입력받기 - - [ ] 최소 상품 판매 금액은 100원 이상이다. - - [ ] 10원으로 나누어떨어져야 한다. + - [x] 최소 상품 판매 금액은 100원 이상이다. + - [x] 10원으로 나누어떨어져야 한다. - 수량 입력받기 - [ ] 최소 1개 이상이다. 3. 자판이가 보유하고 있는 금액에서 동전을 무작위로 생성하기 diff --git a/src/main/java/vendingmachine/domain/Coin.java b/src/main/java/vendingmachine/domain/Coin.java index 7bb89c146..17c1b30a5 100644 --- a/src/main/java/vendingmachine/domain/Coin.java +++ b/src/main/java/vendingmachine/domain/Coin.java @@ -12,5 +12,11 @@ public enum Coin { this.amount = amount; } - // 추가 기능 구현 + public boolean isDivided(int price){ + return (price % this.amount) == 0; + } + + public int getAmount() { + return amount; + } } diff --git a/src/main/java/vendingmachine/domain/Product.java b/src/main/java/vendingmachine/domain/Product.java index 6db85c1c2..613b859bc 100644 --- a/src/main/java/vendingmachine/domain/Product.java +++ b/src/main/java/vendingmachine/domain/Product.java @@ -12,7 +12,7 @@ private Product(final String name, final int price) { } public static Product of (String name, int price){ - ProductValidator.validate(name, price); + ProductValidator.validate(price); return new Product(name, price); } diff --git a/src/main/java/vendingmachine/validators/ProductValidator.java b/src/main/java/vendingmachine/validators/ProductValidator.java new file mode 100644 index 000000000..5923cf4d5 --- /dev/null +++ b/src/main/java/vendingmachine/validators/ProductValidator.java @@ -0,0 +1,24 @@ +package vendingmachine.validators; + +import vendingmachine.domain.Coin; + +public class ProductValidator { + private static final int MINIMAL_PRODUCT_MONEY = 100; + private static final String BOUNDARY_EXCEPTION = String.format("상품의 최소 금액은 %d원입니다", MINIMAL_PRODUCT_MONEY); + private static final String DIVIDED_BYCOIN_EXCEPTION = String.format("상품 금액은 10원 단위로 나누어 떨어집니다.", Coin.COIN_10.getAmount()); + + + public static void validate(final int price) { + isBoundary(price); + isDivided(price); + } + + private static void isDivided(final int price) { + if(Coin.COIN_10.isDivided(price)) return; + throw new IllegalArgumentException(DIVIDED_BYCOIN_EXCEPTION); + } + + private static void isBoundary(final int price) { + if(price < MINIMAL_PRODUCT_MONEY ) throw new IllegalArgumentException(BOUNDARY_EXCEPTION); + } +} diff --git a/src/test/java/vendingmachine/validators/ProductValidatorTest.java b/src/test/java/vendingmachine/validators/ProductValidatorTest.java new file mode 100644 index 000000000..7a24d3fe3 --- /dev/null +++ b/src/test/java/vendingmachine/validators/ProductValidatorTest.java @@ -0,0 +1,34 @@ +package vendingmachine.validators; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatNoException; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class ProductValidatorTest { + + @ParameterizedTest + @ValueSource(ints = {100, 10000, 130000}) + void validate는_가격을_검사한다(int price){ + assertThatNoException().isThrownBy(() -> ProductValidator.validate(price)); + } + + @ParameterizedTest + @ValueSource(ints = {99, 0, -1}) + void validate는_가격이_100원미만이면_예외반환(int lessThanMinimum) { + assertThatThrownBy(() -> ProductValidator.validate(lessThanMinimum)) + .isInstanceOf(IllegalArgumentException.class); + } + + @ParameterizedTest + @ValueSource(ints = {199, 123, 1000000001}) + void validate는_가격이_10원으로_나누어떨어지지않으면_예외반환(int nonDiveded) { + String name = "사이다"; + assertThatThrownBy(() -> ProductValidator.validate(nonDiveded)) + .isInstanceOf(IllegalArgumentException.class); + } + +} \ No newline at end of file From 8508f92ccc03ba477d5bb15e890c80ab4de2d129 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 17:45:07 +0900 Subject: [PATCH 05/28] =?UTF-8?q?refactor(Price)=20:=20Product=EC=9D=98=20?= =?UTF-8?q?Price=EB=A5=BC=20=EC=9D=BC=EA=B8=89=20=EC=BB=AC=EB=A0=89?= =?UTF-8?q?=EC=85=98=EC=9C=BC=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/vendingmachine/domain/Product.java | 7 +++---- .../vendingmachine/domain/ProductPrice.java | 17 +++++++++++++++++ ...alidator.java => ProductPriceValidator.java} | 13 +++++++++---- ...Test.java => ProductPriceValidatorTest.java} | 12 +++++------- 4 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 src/main/java/vendingmachine/domain/ProductPrice.java rename src/main/java/vendingmachine/validators/{ProductValidator.java => ProductPriceValidator.java} (71%) rename src/test/java/vendingmachine/validators/{ProductValidatorTest.java => ProductPriceValidatorTest.java} (67%) diff --git a/src/main/java/vendingmachine/domain/Product.java b/src/main/java/vendingmachine/domain/Product.java index 613b859bc..60d8c5346 100644 --- a/src/main/java/vendingmachine/domain/Product.java +++ b/src/main/java/vendingmachine/domain/Product.java @@ -1,18 +1,17 @@ package vendingmachine.domain; -import vendingmachine.validators.ProductValidator; +import vendingmachine.validators.ProductPriceValidator; public class Product { private final String name; - private final int price; + private final ProductPrice price; private Product(final String name, final int price) { this.name = name; - this.price = price; + this.price = ProductPrice.from(price); } public static Product of (String name, int price){ - ProductValidator.validate(price); return new Product(name, price); } diff --git a/src/main/java/vendingmachine/domain/ProductPrice.java b/src/main/java/vendingmachine/domain/ProductPrice.java new file mode 100644 index 000000000..ebf1a24f0 --- /dev/null +++ b/src/main/java/vendingmachine/domain/ProductPrice.java @@ -0,0 +1,17 @@ +package vendingmachine.domain; + +import vendingmachine.validators.ProductPriceValidator; + +public class ProductPrice { + + private final int price; + + public ProductPrice(final int price) { + this.price = price; + } + + public static ProductPrice from(int price){ + ProductPriceValidator.validate(price); + return new ProductPrice(price); + } +} diff --git a/src/main/java/vendingmachine/validators/ProductValidator.java b/src/main/java/vendingmachine/validators/ProductPriceValidator.java similarity index 71% rename from src/main/java/vendingmachine/validators/ProductValidator.java rename to src/main/java/vendingmachine/validators/ProductPriceValidator.java index 5923cf4d5..f8a2b05d7 100644 --- a/src/main/java/vendingmachine/validators/ProductValidator.java +++ b/src/main/java/vendingmachine/validators/ProductPriceValidator.java @@ -2,10 +2,11 @@ import vendingmachine.domain.Coin; -public class ProductValidator { +public class ProductPriceValidator { private static final int MINIMAL_PRODUCT_MONEY = 100; private static final String BOUNDARY_EXCEPTION = String.format("상품의 최소 금액은 %d원입니다", MINIMAL_PRODUCT_MONEY); - private static final String DIVIDED_BYCOIN_EXCEPTION = String.format("상품 금액은 10원 단위로 나누어 떨어집니다.", Coin.COIN_10.getAmount()); + private static final String DIVIDED_BYCOIN_EXCEPTION = String.format("상품 금액은 10원 단위로 나누어 떨어집니다.", + Coin.COIN_10.getAmount()); public static void validate(final int price) { @@ -14,11 +15,15 @@ public static void validate(final int price) { } private static void isDivided(final int price) { - if(Coin.COIN_10.isDivided(price)) return; + if (Coin.COIN_10.isDivided(price)) { + return; + } throw new IllegalArgumentException(DIVIDED_BYCOIN_EXCEPTION); } private static void isBoundary(final int price) { - if(price < MINIMAL_PRODUCT_MONEY ) throw new IllegalArgumentException(BOUNDARY_EXCEPTION); + if (price < MINIMAL_PRODUCT_MONEY) { + throw new IllegalArgumentException(BOUNDARY_EXCEPTION); + } } } diff --git a/src/test/java/vendingmachine/validators/ProductValidatorTest.java b/src/test/java/vendingmachine/validators/ProductPriceValidatorTest.java similarity index 67% rename from src/test/java/vendingmachine/validators/ProductValidatorTest.java rename to src/test/java/vendingmachine/validators/ProductPriceValidatorTest.java index 7a24d3fe3..f5773fd37 100644 --- a/src/test/java/vendingmachine/validators/ProductValidatorTest.java +++ b/src/test/java/vendingmachine/validators/ProductPriceValidatorTest.java @@ -1,25 +1,23 @@ package vendingmachine.validators; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatNoException; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -class ProductValidatorTest { +class ProductPriceValidatorTest { @ParameterizedTest @ValueSource(ints = {100, 10000, 130000}) - void validate는_가격을_검사한다(int price){ - assertThatNoException().isThrownBy(() -> ProductValidator.validate(price)); + void validate는_가격을_검사한다(int price) { + assertThatNoException().isThrownBy(() -> ProductPriceValidator.validate(price)); } @ParameterizedTest @ValueSource(ints = {99, 0, -1}) void validate는_가격이_100원미만이면_예외반환(int lessThanMinimum) { - assertThatThrownBy(() -> ProductValidator.validate(lessThanMinimum)) + assertThatThrownBy(() -> ProductPriceValidator.validate(lessThanMinimum)) .isInstanceOf(IllegalArgumentException.class); } @@ -27,7 +25,7 @@ class ProductValidatorTest { @ValueSource(ints = {199, 123, 1000000001}) void validate는_가격이_10원으로_나누어떨어지지않으면_예외반환(int nonDiveded) { String name = "사이다"; - assertThatThrownBy(() -> ProductValidator.validate(nonDiveded)) + assertThatThrownBy(() -> ProductPriceValidator.validate(nonDiveded)) .isInstanceOf(IllegalArgumentException.class); } From 9952b1e4589d43624dc7cc51eb22b9091a94416f Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 17:50:01 +0900 Subject: [PATCH 06/28] =?UTF-8?q?feat(Input)=20:=20=ED=94=84=EB=A1=9D?= =?UTF-8?q?=EC=8B=9C=20=EC=9D=B8=ED=92=8B=20=EB=B7=B0=20=EA=B5=AC=EC=A1=B0?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/vendingmachine/domain/Product.java | 4 +-- src/main/java/vendingmachine/view/Input.java | 9 ++++++ .../java/vendingmachine/view/InputView.java | 23 ++++++++++++++ .../vendingmachine/view/ProxyInputView.java | 30 +++++++++++++++++++ 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 src/main/java/vendingmachine/view/Input.java create mode 100644 src/main/java/vendingmachine/view/InputView.java create mode 100644 src/main/java/vendingmachine/view/ProxyInputView.java diff --git a/src/main/java/vendingmachine/domain/Product.java b/src/main/java/vendingmachine/domain/Product.java index 60d8c5346..62e58e416 100644 --- a/src/main/java/vendingmachine/domain/Product.java +++ b/src/main/java/vendingmachine/domain/Product.java @@ -1,7 +1,5 @@ package vendingmachine.domain; -import vendingmachine.validators.ProductPriceValidator; - public class Product { private final String name; private final ProductPrice price; @@ -11,7 +9,7 @@ private Product(final String name, final int price) { this.price = ProductPrice.from(price); } - public static Product of (String name, int price){ + public static Product of(String name, int price) { return new Product(name, price); } diff --git a/src/main/java/vendingmachine/view/Input.java b/src/main/java/vendingmachine/view/Input.java new file mode 100644 index 000000000..5ddcf3301 --- /dev/null +++ b/src/main/java/vendingmachine/view/Input.java @@ -0,0 +1,9 @@ +package vendingmachine.view; + +public interface Input { + String readMoney(); + String readProducts(); + String readInputAmount(); + String readWanted(); + +} diff --git a/src/main/java/vendingmachine/view/InputView.java b/src/main/java/vendingmachine/view/InputView.java new file mode 100644 index 000000000..12aa7e0f1 --- /dev/null +++ b/src/main/java/vendingmachine/view/InputView.java @@ -0,0 +1,23 @@ +package vendingmachine.view; + +public class InputView implements Input{ + @Override + public String readMoney() { + return null; + } + + @Override + public String readProducts() { + return null; + } + + @Override + public String readInputAmount() { + return null; + } + + @Override + public String readWanted() { + return null; + } +} diff --git a/src/main/java/vendingmachine/view/ProxyInputView.java b/src/main/java/vendingmachine/view/ProxyInputView.java new file mode 100644 index 000000000..a4980b939 --- /dev/null +++ b/src/main/java/vendingmachine/view/ProxyInputView.java @@ -0,0 +1,30 @@ +package vendingmachine.view; + +public class ProxyInputView implements Input { + + private final Input viewable; + + public ProxyInputView(Input viewable) { + this.viewable = viewable; + } + + @Override + public String readMoney() { + return null; + } + + @Override + public String readProducts() { + return null; + } + + @Override + public String readInputAmount() { + return null; + } + + @Override + public String readWanted() { + return null; + } +} From 1410922bb40be90e19b9a449a686e5705a74a78f Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 17:54:57 +0900 Subject: [PATCH 07/28] =?UTF-8?q?feat(InputValidator)=20:=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=EA=B0=92=20=EA=B2=80=EC=A6=9D=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validators/InputValidator.java | 11 ++++++++++ .../java/vendingmachine/view/InputView.java | 21 +++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 src/main/java/vendingmachine/validators/InputValidator.java diff --git a/src/main/java/vendingmachine/validators/InputValidator.java b/src/main/java/vendingmachine/validators/InputValidator.java new file mode 100644 index 000000000..8afcc5c8c --- /dev/null +++ b/src/main/java/vendingmachine/validators/InputValidator.java @@ -0,0 +1,11 @@ +package vendingmachine.validators; + +public class InputValidator { + public static String validateInt(final String intInput) { + return null; + } + + public static String validateStringint(final String stringInput) { + return null; + } +} diff --git a/src/main/java/vendingmachine/view/InputView.java b/src/main/java/vendingmachine/view/InputView.java index 12aa7e0f1..ac60f2b84 100644 --- a/src/main/java/vendingmachine/view/InputView.java +++ b/src/main/java/vendingmachine/view/InputView.java @@ -1,23 +1,36 @@ package vendingmachine.view; +import camp.nextstep.edu.missionutils.Console; +import vendingmachine.validators.InputValidator; + public class InputView implements Input{ @Override public String readMoney() { - return null; + return readInt(); } @Override public String readProducts() { - return null; + return readString(); } @Override public String readInputAmount() { - return null; + return readInt(); } @Override public String readWanted() { - return null; + return readString(); + } + + private String readInt(){ + String intInput = Console.readLine(); + return InputValidator.validateInt(intInput); + } + + private String readString(){ + String stringInput = Console.readLine(); + return InputValidator.validateStringint(stringInput); } } From b86b176d141e97ab607bbc7ba12a741bb49dd312 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 18:24:00 +0900 Subject: [PATCH 08/28] =?UTF-8?q?test(Product)=20:=20=EC=98=88=EC=99=B8=20?= =?UTF-8?q?=EB=B0=98=ED=99=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20coverage=201?= =?UTF-8?q?00%=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validators/ProductPriceValidator.java | 3 ++- .../vendingmachine/domain/ProductTest.java | 18 +++++++++++++++++ .../validators/ProductPriceValidatorTest.java | 20 +++++++++++-------- 3 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 src/test/java/vendingmachine/domain/ProductTest.java diff --git a/src/main/java/vendingmachine/validators/ProductPriceValidator.java b/src/main/java/vendingmachine/validators/ProductPriceValidator.java index f8a2b05d7..50567c404 100644 --- a/src/main/java/vendingmachine/validators/ProductPriceValidator.java +++ b/src/main/java/vendingmachine/validators/ProductPriceValidator.java @@ -5,7 +5,7 @@ public class ProductPriceValidator { private static final int MINIMAL_PRODUCT_MONEY = 100; private static final String BOUNDARY_EXCEPTION = String.format("상품의 최소 금액은 %d원입니다", MINIMAL_PRODUCT_MONEY); - private static final String DIVIDED_BYCOIN_EXCEPTION = String.format("상품 금액은 10원 단위로 나누어 떨어집니다.", + private static final String DIVIDED_BYCOIN_EXCEPTION = String.format("상품 금액은 %d원 단위로 나누어 떨어집니다.", Coin.COIN_10.getAmount()); @@ -23,6 +23,7 @@ private static void isDivided(final int price) { private static void isBoundary(final int price) { if (price < MINIMAL_PRODUCT_MONEY) { + System.out.println("Test"); throw new IllegalArgumentException(BOUNDARY_EXCEPTION); } } diff --git a/src/test/java/vendingmachine/domain/ProductTest.java b/src/test/java/vendingmachine/domain/ProductTest.java new file mode 100644 index 000000000..20a83846c --- /dev/null +++ b/src/test/java/vendingmachine/domain/ProductTest.java @@ -0,0 +1,18 @@ +package vendingmachine.domain; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +class ProductTest { + + @ParameterizedTest + @CsvSource(value = {"'사이다',1000","'콜라',1500000"}) + void 팩터리메서드_테스트(String name, int price) { + // when + Product result = Product.of(name, price); + // then + assertThat(result).isInstanceOf(Product.class); + } +} \ No newline at end of file diff --git a/src/test/java/vendingmachine/validators/ProductPriceValidatorTest.java b/src/test/java/vendingmachine/validators/ProductPriceValidatorTest.java index f5773fd37..9c3639b56 100644 --- a/src/test/java/vendingmachine/validators/ProductPriceValidatorTest.java +++ b/src/test/java/vendingmachine/validators/ProductPriceValidatorTest.java @@ -1,10 +1,12 @@ package vendingmachine.validators; import static org.assertj.core.api.AssertionsForClassTypes.assertThatNoException; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import vendingmachine.domain.Coin; class ProductPriceValidatorTest { @@ -16,17 +18,19 @@ class ProductPriceValidatorTest { @ParameterizedTest @ValueSource(ints = {99, 0, -1}) - void validate는_가격이_100원미만이면_예외반환(int lessThanMinimum) { - assertThatThrownBy(() -> ProductPriceValidator.validate(lessThanMinimum)) - .isInstanceOf(IllegalArgumentException.class); + void validate는_가격이_100원미만이면_실패(int lessThanMinimum) { + final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, + () -> ProductPriceValidator.validate(lessThanMinimum)); + assertEquals(exception.getMessage(), String.format("상품의 최소 금액은 %d원입니다", 100)); } @ParameterizedTest @ValueSource(ints = {199, 123, 1000000001}) - void validate는_가격이_10원으로_나누어떨어지지않으면_예외반환(int nonDiveded) { - String name = "사이다"; - assertThatThrownBy(() -> ProductPriceValidator.validate(nonDiveded)) - .isInstanceOf(IllegalArgumentException.class); + void validate는_가격이_10원으로_나누어떨어지지않으면_실패(int nonDiveded) { + final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, + () -> ProductPriceValidator.validate(nonDiveded)); + assertEquals(exception.getMessage(), String.format("상품 금액은 10원 단위로 나누어 떨어집니다.", + Coin.COIN_10.getAmount())); } } \ No newline at end of file From b4471745e80526b6fd55568a71159318f6df422a Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 18:24:30 +0900 Subject: [PATCH 09/28] =?UTF-8?q?feat(Products)=20:=20=EC=9E=90=ED=8C=90?= =?UTF-8?q?=EA=B8=B0=EC=9D=98=20=ED=8C=90=EB=A7=A4=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/vendingmachine/domain/Products.java | 20 +++++++++++ .../validators/ProductsValidator.java | 8 +++++ .../vendingmachine/domain/ProductsTest.java | 36 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 src/main/java/vendingmachine/domain/Products.java create mode 100644 src/main/java/vendingmachine/validators/ProductsValidator.java create mode 100644 src/test/java/vendingmachine/domain/ProductsTest.java diff --git a/src/main/java/vendingmachine/domain/Products.java b/src/main/java/vendingmachine/domain/Products.java new file mode 100644 index 000000000..1a906df9f --- /dev/null +++ b/src/main/java/vendingmachine/domain/Products.java @@ -0,0 +1,20 @@ +package vendingmachine.domain; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import vendingmachine.validators.ProductsValidator; + +public class Products { + private final Map products; + + private Products(final Map products) { + this.products = products; + } + + public static Products from(final Map input){ + List counts = input.values().stream().collect(Collectors.toList()); + ProductsValidator.valdate(counts); + return new Products(input); + } +} diff --git a/src/main/java/vendingmachine/validators/ProductsValidator.java b/src/main/java/vendingmachine/validators/ProductsValidator.java new file mode 100644 index 000000000..865574a3a --- /dev/null +++ b/src/main/java/vendingmachine/validators/ProductsValidator.java @@ -0,0 +1,8 @@ +package vendingmachine.validators; + +import java.util.List; + +public class ProductsValidator { + public static void valdate(final List counts) { + } +} diff --git a/src/test/java/vendingmachine/domain/ProductsTest.java b/src/test/java/vendingmachine/domain/ProductsTest.java new file mode 100644 index 000000000..06cf3064b --- /dev/null +++ b/src/test/java/vendingmachine/domain/ProductsTest.java @@ -0,0 +1,36 @@ +package vendingmachine.domain; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Stream; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +class ProductsTest { + + @ParameterizedTest + @MethodSource("createProducts") + void 생성자_테스트(){ + // given + Map products = new HashMap<>(); + // when + Products result = Products.from(products); + // then + assertThat(result).isInstanceOf(Products.class); + } + + private static Stream> createProducts(){ + Map test1 = new HashMap<>(); + test1.put(Product.of("사이다", 1000), 1); + test1.put(Product.of("콜라", 1000), 101); + + return Stream.of( + new HashMap<>(), + test1 + ); + } +} \ No newline at end of file From 8e7308a0f226ee29378c75d6efc00686aa79c20f Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 18:58:08 +0900 Subject: [PATCH 10/28] =?UTF-8?q?feat(ProductsValidator)=20:=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=EB=AA=A9=EB=A1=9D=20=EA=B2=80=EC=A6=9D=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++++++------- src/main/docs/README.md | 2 +- .../validators/ProductPriceValidator.java | 1 - .../validators/ProductsValidator.java | 10 + .../validators/ProductsValidatorTest.java | 31 +++ 8 files changed, 198 insertions(+), 108 deletions(-) create mode 100644 src/test/java/vendingmachine/validators/ProductsValidatorTest.java diff --git a/build.gradle b/build.gradle index 67e032179..f89cef282 100644 --- a/build.gradle +++ b/build.gradle @@ -16,10 +16,11 @@ dependencies { java { toolchain { - languageVersion = JavaLanguageVersion.of(8) + languageVersion = JavaLanguageVersion.of(17) } } + test { useJUnitPlatform() } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 28ff446a2..ffed3a254 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c8..1b6c78733 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/src/main/docs/README.md b/src/main/docs/README.md index 0177726f2..02221c375 100644 --- a/src/main/docs/README.md +++ b/src/main/docs/README.md @@ -10,7 +10,7 @@ - [x] 최소 상품 판매 금액은 100원 이상이다. - [x] 10원으로 나누어떨어져야 한다. - 수량 입력받기 - - [ ] 최소 1개 이상이다. + - [x] 최소 1개 이상이다. 3. 자판이가 보유하고 있는 금액에서 동전을 무작위로 생성하기 - 자판기가 보유한 동전을 출력한다. 4. 잔돈 돌려주기 diff --git a/src/main/java/vendingmachine/validators/ProductPriceValidator.java b/src/main/java/vendingmachine/validators/ProductPriceValidator.java index 50567c404..b262b3311 100644 --- a/src/main/java/vendingmachine/validators/ProductPriceValidator.java +++ b/src/main/java/vendingmachine/validators/ProductPriceValidator.java @@ -23,7 +23,6 @@ private static void isDivided(final int price) { private static void isBoundary(final int price) { if (price < MINIMAL_PRODUCT_MONEY) { - System.out.println("Test"); throw new IllegalArgumentException(BOUNDARY_EXCEPTION); } } diff --git a/src/main/java/vendingmachine/validators/ProductsValidator.java b/src/main/java/vendingmachine/validators/ProductsValidator.java index 865574a3a..5615bcdd6 100644 --- a/src/main/java/vendingmachine/validators/ProductsValidator.java +++ b/src/main/java/vendingmachine/validators/ProductsValidator.java @@ -3,6 +3,16 @@ import java.util.List; public class ProductsValidator { + private static final int MINIMAL_PRODUCT_COUNT = 1; + private static final String BOUNDARY_EXCEPTION = String.format("상품의 최소 수량은 %d개 이상입니다", MINIMAL_PRODUCT_COUNT); + public static void valdate(final List counts) { + counts.stream().forEach(ProductsValidator::isBoundary); + } + + private static void isBoundary(final int count) { + if (count < MINIMAL_PRODUCT_COUNT) { + throw new IllegalArgumentException(BOUNDARY_EXCEPTION); + } } } diff --git a/src/test/java/vendingmachine/validators/ProductsValidatorTest.java b/src/test/java/vendingmachine/validators/ProductsValidatorTest.java new file mode 100644 index 000000000..b116bfe34 --- /dev/null +++ b/src/test/java/vendingmachine/validators/ProductsValidatorTest.java @@ -0,0 +1,31 @@ +package vendingmachine.validators; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatNoException; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.List; +import org.junit.jupiter.api.Test; + +class ProductsValidatorTest { + + @Test + void validate는_최소수량_이상인지_검사한다() { + // given + List given = List.of(1, 2, 3, 4, 5, 6); + // when&then + assertThatNoException().isThrownBy(() -> ProductsValidator.valdate(given)); + } + + @Test + void validate는_최소수량_미만이면_실패() { + // given + List given = List.of(1, 2, 3, 4, 0, 6); + // when&then + final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, + () -> ProductsValidator.valdate(given)); + assertEquals(exception.getMessage(), String.format("상품의 최소 수량은 %d개 이상입니다", 1)); + + } +} \ No newline at end of file From 00be49c2544f8141427580230b958b49bd462624 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 19:05:01 +0900 Subject: [PATCH 11/28] =?UTF-8?q?feat(OutputView)=20:=20=EC=9E=90=ED=8C=90?= =?UTF-8?q?=EA=B8=B0=20=EB=B3=B4=EC=9C=A0=20=EA=B8=88=EC=95=A1=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EC=9A=94=EC=B2=AD=20=EC=B6=9C=EB=A0=A5=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/vendingmachine/view/InputView.java | 1 + .../java/vendingmachine/view/OutputView.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 src/main/java/vendingmachine/view/OutputView.java diff --git a/src/main/java/vendingmachine/view/InputView.java b/src/main/java/vendingmachine/view/InputView.java index ac60f2b84..ad3bfbc6e 100644 --- a/src/main/java/vendingmachine/view/InputView.java +++ b/src/main/java/vendingmachine/view/InputView.java @@ -34,3 +34,4 @@ private String readString(){ return InputValidator.validateStringint(stringInput); } } + diff --git a/src/main/java/vendingmachine/view/OutputView.java b/src/main/java/vendingmachine/view/OutputView.java new file mode 100644 index 000000000..eb782f9e2 --- /dev/null +++ b/src/main/java/vendingmachine/view/OutputView.java @@ -0,0 +1,16 @@ +package vendingmachine.view; + +public class OutputView { + public static void printRequestMachinHoldMoney(){ + System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY); + } +} + +enum OutputViewMessage{ + REQUEST_MACHINE_HOLD_MONEY("자판기가 보유하고 있는 금액을 입력해 주세요."); + + private final String message; + private OutputViewMessage(final String message) { + this.message = message; + } +} \ No newline at end of file From 79134b5503f3beb3e004615aaac9f8fd27a1f6e5 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 19:19:21 +0900 Subject: [PATCH 12/28] =?UTF-8?q?feat(InputValidator)=20:=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=EB=B0=9B=EC=9D=80=20=EC=A0=95=EC=88=98=EB=A5=BC=20?= =?UTF-8?q?=EA=B2=80=EC=82=AC=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/docs/README.md | 1 + .../java/vendingmachine/domain/Products.java | 2 +- .../validators/InputValidator.java | 28 ++++++++++++++- .../validators/ProductsValidator.java | 2 +- .../validators/InputValidatorTest.java | 36 +++++++++++++++++++ .../validators/ProductsValidatorTest.java | 4 +-- 6 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 src/test/java/vendingmachine/validators/InputValidatorTest.java diff --git a/src/main/docs/README.md b/src/main/docs/README.md index 02221c375..ccb988e2c 100644 --- a/src/main/docs/README.md +++ b/src/main/docs/README.md @@ -3,6 +3,7 @@ 1. 자판기의 보유 금액 입력받기 - Coin으로 나누어 떨어져야 한다. 즉, 10원 단위로 나누어 떨어진다. - 0원도 가능하다 (잔돈 반환 불가능 시, 자판기에 남는다.) + - 0원 미만은 불가능 하다 2. 투입 금액 받기 ```[콜라,1500,20];[사이다,1000,10]``` - 상품명 입력받기 diff --git a/src/main/java/vendingmachine/domain/Products.java b/src/main/java/vendingmachine/domain/Products.java index 1a906df9f..b6e715d3e 100644 --- a/src/main/java/vendingmachine/domain/Products.java +++ b/src/main/java/vendingmachine/domain/Products.java @@ -14,7 +14,7 @@ private Products(final Map products) { public static Products from(final Map input){ List counts = input.values().stream().collect(Collectors.toList()); - ProductsValidator.valdate(counts); + ProductsValidator.validate(counts); return new Products(input); } } diff --git a/src/main/java/vendingmachine/validators/InputValidator.java b/src/main/java/vendingmachine/validators/InputValidator.java index 8afcc5c8c..a6d79e404 100644 --- a/src/main/java/vendingmachine/validators/InputValidator.java +++ b/src/main/java/vendingmachine/validators/InputValidator.java @@ -1,8 +1,34 @@ package vendingmachine.validators; +import static java.util.regex.Pattern.compile; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class InputValidator { + private static final String NUMBER_MATCH_REGEX = "^[0-9]*$"; + private static final Pattern NUMBER = compile(NUMBER_MATCH_REGEX); + private static final String NUMBERFORMAT_EXCEPTION = "정수의 범위를 벗어났습니다"; + private static final String NOT_NUMBER_EXCEPTION = "숫자0-9만 입력 가능합니다"; + public static String validateInt(final String intInput) { - return null; + isNumberPattern(intInput); + isInIntegerRange(intInput); + return intInput; + } + + private static void isInIntegerRange(final String intInput) { + try{ + Integer.parseInt(intInput); + }catch (NumberFormatException e){ + throw new IllegalArgumentException(NUMBERFORMAT_EXCEPTION); + } + } + + private static void isNumberPattern(final String intInput) { + Matcher matcher = NUMBER.matcher(intInput); + if(!matcher.matches()) throw new IllegalArgumentException(NOT_NUMBER_EXCEPTION); + } public static String validateStringint(final String stringInput) { diff --git a/src/main/java/vendingmachine/validators/ProductsValidator.java b/src/main/java/vendingmachine/validators/ProductsValidator.java index 5615bcdd6..8325b40b6 100644 --- a/src/main/java/vendingmachine/validators/ProductsValidator.java +++ b/src/main/java/vendingmachine/validators/ProductsValidator.java @@ -6,7 +6,7 @@ public class ProductsValidator { private static final int MINIMAL_PRODUCT_COUNT = 1; private static final String BOUNDARY_EXCEPTION = String.format("상품의 최소 수량은 %d개 이상입니다", MINIMAL_PRODUCT_COUNT); - public static void valdate(final List counts) { + public static void validate(final List counts) { counts.stream().forEach(ProductsValidator::isBoundary); } diff --git a/src/test/java/vendingmachine/validators/InputValidatorTest.java b/src/test/java/vendingmachine/validators/InputValidatorTest.java new file mode 100644 index 000000000..0eab7e17e --- /dev/null +++ b/src/test/java/vendingmachine/validators/InputValidatorTest.java @@ -0,0 +1,36 @@ +package vendingmachine.validators; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatNoException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class InputValidatorTest { + @ParameterizedTest + @ValueSource(strings = {"1", "111", "0"}) + void validateInt는_0이상의_정수의_범위만_가능하다(String given) { + // when&then + assertThatNoException().isThrownBy(() -> InputValidator.validateInt(given)); + } + + + @ParameterizedTest + @ValueSource(strings = {"1s", "111원", "3000원", "0.0"}) + void validateInt는_숫자만_입력가능하다(String given) { + final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, + () -> InputValidator.validateInt(given)); + + assertEquals(exception.getMessage(), "숫자0-9만 입력 가능합니다"); + } + + @ParameterizedTest + @ValueSource(strings = {"10000000000000000000000000000000", "1000000000000000000"}) + void validateInt는_정수범위만_입력가능하다(String given) { + final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, + () -> InputValidator.validateInt(given)); + + assertEquals(exception.getMessage(), "정수의 범위를 벗어났습니다"); + } +} \ No newline at end of file diff --git a/src/test/java/vendingmachine/validators/ProductsValidatorTest.java b/src/test/java/vendingmachine/validators/ProductsValidatorTest.java index b116bfe34..5787e0a56 100644 --- a/src/test/java/vendingmachine/validators/ProductsValidatorTest.java +++ b/src/test/java/vendingmachine/validators/ProductsValidatorTest.java @@ -15,7 +15,7 @@ class ProductsValidatorTest { // given List given = List.of(1, 2, 3, 4, 5, 6); // when&then - assertThatNoException().isThrownBy(() -> ProductsValidator.valdate(given)); + assertThatNoException().isThrownBy(() -> ProductsValidator.validate(given)); } @Test @@ -24,7 +24,7 @@ class ProductsValidatorTest { List given = List.of(1, 2, 3, 4, 0, 6); // when&then final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, - () -> ProductsValidator.valdate(given)); + () -> ProductsValidator.validate(given)); assertEquals(exception.getMessage(), String.format("상품의 최소 수량은 %d개 이상입니다", 1)); } From 5c277075b4e9053f26ca6b3e8550afe8c770db27 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 19:19:49 +0900 Subject: [PATCH 13/28] =?UTF-8?q?feat(Convertor)=20:=20=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=EC=97=B4=EC=9D=84=20=EC=A0=95=EC=88=98=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=ED=99=98=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/vendingmachine/utils/Convertor.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/java/vendingmachine/utils/Convertor.java diff --git a/src/main/java/vendingmachine/utils/Convertor.java b/src/main/java/vendingmachine/utils/Convertor.java new file mode 100644 index 000000000..7d2203c78 --- /dev/null +++ b/src/main/java/vendingmachine/utils/Convertor.java @@ -0,0 +1,7 @@ +package vendingmachine.utils; + +public class Convertor { + public static int covertToInt(String input){ + return Integer.parseInt(input); + } +} From 2005c791ed5831186fa9569e3a8d53a804345f05 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 20:16:26 +0900 Subject: [PATCH 14/28] =?UTF-8?q?feat(Convertor)=20:=20=EC=83=81=ED=92=88?= =?UTF-8?q?=EC=9D=84=20=EB=B3=80=ED=99=98=ED=95=98=EA=B3=A0,=20=EB=B3=80?= =?UTF-8?q?=ED=99=98=EC=9D=B4=20=EB=B6=88=EA=B0=80=EB=8A=A5=ED=95=98?= =?UTF-8?q?=EB=A9=B4=20=EC=98=88=EC=99=B8=EB=A5=BC=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/docs/README.md | 2 +- .../java/vendingmachine/domain/Products.java | 3 +- .../java/vendingmachine/utils/Convertor.java | 50 ++++++++++++++++++- .../vendingmachine/utils/ConvertorTest.java | 50 +++++++++++++++++++ .../validators/ProductsValidatorTest.java | 1 - 5 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 src/test/java/vendingmachine/utils/ConvertorTest.java diff --git a/src/main/docs/README.md b/src/main/docs/README.md index ccb988e2c..6f14be930 100644 --- a/src/main/docs/README.md +++ b/src/main/docs/README.md @@ -3,7 +3,7 @@ 1. 자판기의 보유 금액 입력받기 - Coin으로 나누어 떨어져야 한다. 즉, 10원 단위로 나누어 떨어진다. - 0원도 가능하다 (잔돈 반환 불가능 시, 자판기에 남는다.) - - 0원 미만은 불가능 하다 + - 0원 미만은 불가능 하다. 2. 투입 금액 받기 ```[콜라,1500,20];[사이다,1000,10]``` - 상품명 입력받기 diff --git a/src/main/java/vendingmachine/domain/Products.java b/src/main/java/vendingmachine/domain/Products.java index b6e715d3e..e29e38134 100644 --- a/src/main/java/vendingmachine/domain/Products.java +++ b/src/main/java/vendingmachine/domain/Products.java @@ -12,9 +12,10 @@ private Products(final Map products) { this.products = products; } - public static Products from(final Map input){ + public static Products from(final Map input) { List counts = input.values().stream().collect(Collectors.toList()); ProductsValidator.validate(counts); return new Products(input); } + } diff --git a/src/main/java/vendingmachine/utils/Convertor.java b/src/main/java/vendingmachine/utils/Convertor.java index 7d2203c78..d27b26101 100644 --- a/src/main/java/vendingmachine/utils/Convertor.java +++ b/src/main/java/vendingmachine/utils/Convertor.java @@ -1,7 +1,55 @@ package vendingmachine.utils; +import static java.util.regex.Pattern.compile; + +import java.util.AbstractMap; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import vendingmachine.domain.Product; +import vendingmachine.domain.Products; + public class Convertor { - public static int covertToInt(String input){ + private static final String PRODUCTS_DELIMITTER = ";"; + private static final String PRODUCT_PREFIX = "["; + private static final String PRODUCT_SUFFIX = "]"; + private static final String PRODUCT_DELIMITTER = ","; + private static final String DELIMITTER_EXCEPTION = "상품명, 가격, 수량은 쉼표로, 개별 상품은 대괄호([])로 묶어야 합니다."; + private static final String PRODUCT_MATCH_REGEX = "\\"+PRODUCT_PREFIX+"^*.*"+"\\"+PRODUCT_SUFFIX+"$"; + private static final Pattern PRODUCT_PATTERN = compile(PRODUCT_MATCH_REGEX); + + private static int covertToInt(String input){ return Integer.parseInt(input); } + + public static Products convertToProducts(String input){ + List productSplited = Arrays.stream(input.split(PRODUCTS_DELIMITTER)) + .filter(Convertor::matchProduct) + .map(product -> product.replace(PRODUCT_PREFIX, "").replace(PRODUCT_SUFFIX, "")) + .collect(Collectors.toList()); + Map products = productSplited.stream() + .map(Convertor::convertToProduct) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + return Products.from(products); + } + + private static boolean matchProduct(final String product) { + Matcher matcher = PRODUCT_PATTERN.matcher(product); + if(!matcher.matches()) throw new IllegalArgumentException(DELIMITTER_EXCEPTION); + return true; + } + + private static AbstractMap.SimpleEntry convertToProduct(String product) { + String[] productInformation = product.split(PRODUCT_DELIMITTER); + if(productInformation.length != 3) throw new IllegalArgumentException(DELIMITTER_EXCEPTION); + + String name = productInformation[0]; + int price = covertToInt(productInformation[1]); + int count = covertToInt(productInformation[2]); + + return new AbstractMap.SimpleEntry<>(Product.of(name, price), count); + } } diff --git a/src/test/java/vendingmachine/utils/ConvertorTest.java b/src/test/java/vendingmachine/utils/ConvertorTest.java new file mode 100644 index 000000000..93febb3fb --- /dev/null +++ b/src/test/java/vendingmachine/utils/ConvertorTest.java @@ -0,0 +1,50 @@ +package vendingmachine.utils; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatNoException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.HashMap; +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import vendingmachine.domain.Product; +import vendingmachine.domain.Products; + +class ConvertorTest { + + @Test + void convertToProducts는_문자열을_상품목록으로_반환한다() { + // given + String input = "[콜라,1500,20];[사이다,1000,10]"; + // when&then + Products products = Convertor.convertToProducts(input); + assertThat(products).isInstanceOf(Products.class); + assertThatNoException().isThrownBy(() -> Convertor.convertToProducts(input)); + } + + @ParameterizedTest + @ValueSource(strings = {"[콜라,1500,,];[사이다,1000,10]", "[사이다,1000,10];[,", " ", "[]", "사이다,1000,10]", "[콜라,1500,,];;[사이다,1000,10]", + "[콜라,1500,1"}) + void convertToProducts는_상품입력형식이_맞지않으면_실패(String input) { + final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, + () -> Convertor.convertToProducts(input)); + assertEquals(exception.getMessage(), "상품명, 가격, 수량은 쉼표로, 개별 상품은 대괄호([])로 묶어야 합니다."); + } + + private static Products createProducts() { + Map test = new HashMap<>(); + test.put(Product.of("콜라", 1500), 20); + test.put(Product.of("사이다", 1000), 10); + return Products.from(test); + } + + @Test + void splitTest(){ + String input = "[콜라,1500,20]"; + String pattern = "\\[^*.*\\]$"; + System.out.println("TESTTTT"+input.matches(pattern)); + } +} \ No newline at end of file diff --git a/src/test/java/vendingmachine/validators/ProductsValidatorTest.java b/src/test/java/vendingmachine/validators/ProductsValidatorTest.java index 5787e0a56..9da48f48e 100644 --- a/src/test/java/vendingmachine/validators/ProductsValidatorTest.java +++ b/src/test/java/vendingmachine/validators/ProductsValidatorTest.java @@ -1,7 +1,6 @@ package vendingmachine.validators; import static org.assertj.core.api.AssertionsForClassTypes.assertThatNoException; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; From ae3facd62e43fc9e525cd4ce2275935acb6fb04d Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 20:16:59 +0900 Subject: [PATCH 15/28] =?UTF-8?q?feat(OutputView)=20:=20=EC=9E=90=ED=8C=90?= =?UTF-8?q?=EA=B8=B0=20=EC=83=81=ED=92=88=EC=9D=84=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EB=B0=9B=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/vendingmachine/view/OutputView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vendingmachine/view/OutputView.java b/src/main/java/vendingmachine/view/OutputView.java index eb782f9e2..0ed4f7fbe 100644 --- a/src/main/java/vendingmachine/view/OutputView.java +++ b/src/main/java/vendingmachine/view/OutputView.java @@ -4,10 +4,14 @@ public class OutputView { public static void printRequestMachinHoldMoney(){ System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY); } + public static void printRequestProducts(){ + System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY); + } } enum OutputViewMessage{ - REQUEST_MACHINE_HOLD_MONEY("자판기가 보유하고 있는 금액을 입력해 주세요."); + REQUEST_MACHINE_HOLD_MONEY("자판기가 보유하고 있는 금액을 입력해 주세요."), + REQUEST_PRODUCTS("상품명과 가격, 수량을 입력해 주세요."); private final String message; private OutputViewMessage(final String message) { From ca93aa287d9c94f6128e015afbffd7ba8ce2e6b3 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 20:36:49 +0900 Subject: [PATCH 16/28] =?UTF-8?q?feat(controller)=20:=20view-domain=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EA=B5=AC=EC=A1=B0=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 자판기 보유 금액 설정 - 상품 설정 - 투입 금액 설정 --- src/main/java/vendingmachine/Application.java | 8 +++- .../controller/VendingMachineController.java | 44 +++++++++++++++++++ .../java/vendingmachine/utils/Convertor.java | 13 ++++-- .../java/vendingmachine/view/InputView.java | 9 +++- .../java/vendingmachine/view/OutputView.java | 6 ++- 5 files changed, 73 insertions(+), 7 deletions(-) create mode 100644 src/main/java/vendingmachine/controller/VendingMachineController.java diff --git a/src/main/java/vendingmachine/Application.java b/src/main/java/vendingmachine/Application.java index 9d3be447b..aad3ee57d 100644 --- a/src/main/java/vendingmachine/Application.java +++ b/src/main/java/vendingmachine/Application.java @@ -1,7 +1,13 @@ package vendingmachine; +import vendingmachine.controller.VendingMachineController; +import vendingmachine.view.Input; +import vendingmachine.view.InputView; + public class Application { public static void main(String[] args) { - // TODO: 프로그램 구현 + Input input = InputView.getInstance(); + VendingMachineController controller = VendingMachineController.from(input); + controller.run(); } } diff --git a/src/main/java/vendingmachine/controller/VendingMachineController.java b/src/main/java/vendingmachine/controller/VendingMachineController.java new file mode 100644 index 000000000..5298d8c23 --- /dev/null +++ b/src/main/java/vendingmachine/controller/VendingMachineController.java @@ -0,0 +1,44 @@ +package vendingmachine.controller; + +import vendingmachine.domain.Products; +import vendingmachine.utils.Convertor; +import vendingmachine.view.Input; +import vendingmachine.view.OutputView; + +public class VendingMachineController { + private final Input input; + + private VendingMachineController(final Input input) { + this.input = input; + } + + public static VendingMachineController from(final Input input) { + return new VendingMachineController(input); + } + + public void run(){ + setHoldCoin(); + setProducts(); + setInputAmount(); + } + + private void setHoldCoin() { + OutputView.printRequestMachinHoldMoney(); + String inputString = input.readHoldMoney(); + int holdMoney = Convertor.convertToMoney(inputString); + //coinService.setCoinsByMoney + //printHoldCoin + } + + private void setProducts() { + OutputView.printRequestProducts(); + String inputString = input.readProducts(); + Products products = Convertor.convertToProducts(inputString); + } + + private void setInputAmount() { + OutputView.printInputAmount(); + String inputString = input.readInputAmount(); + int inputAmount = Convertor.convertToMoney(inputString); + } +} diff --git a/src/main/java/vendingmachine/utils/Convertor.java b/src/main/java/vendingmachine/utils/Convertor.java index d27b26101..3e7eb967b 100644 --- a/src/main/java/vendingmachine/utils/Convertor.java +++ b/src/main/java/vendingmachine/utils/Convertor.java @@ -21,10 +21,6 @@ public class Convertor { private static final String PRODUCT_MATCH_REGEX = "\\"+PRODUCT_PREFIX+"^*.*"+"\\"+PRODUCT_SUFFIX+"$"; private static final Pattern PRODUCT_PATTERN = compile(PRODUCT_MATCH_REGEX); - private static int covertToInt(String input){ - return Integer.parseInt(input); - } - public static Products convertToProducts(String input){ List productSplited = Arrays.stream(input.split(PRODUCTS_DELIMITTER)) .filter(Convertor::matchProduct) @@ -52,4 +48,13 @@ private static AbstractMap.SimpleEntry convertToProduct(String return new AbstractMap.SimpleEntry<>(Product.of(name, price), count); } + + public static int convertToMoney(final String inputString) { + return covertToInt(inputString); + } + + private static int covertToInt(String input){ + return Integer.parseInt(input); + } + } diff --git a/src/main/java/vendingmachine/view/InputView.java b/src/main/java/vendingmachine/view/InputView.java index ad3bfbc6e..0103fcd19 100644 --- a/src/main/java/vendingmachine/view/InputView.java +++ b/src/main/java/vendingmachine/view/InputView.java @@ -4,8 +4,15 @@ import vendingmachine.validators.InputValidator; public class InputView implements Input{ + + private static final InputView inputView = new InputView(); + + public static Input getInstance() { + return new ProxyInputView(inputView); + } + @Override - public String readMoney() { + public String readHoldMoney() { return readInt(); } diff --git a/src/main/java/vendingmachine/view/OutputView.java b/src/main/java/vendingmachine/view/OutputView.java index 0ed4f7fbe..8f4bd4601 100644 --- a/src/main/java/vendingmachine/view/OutputView.java +++ b/src/main/java/vendingmachine/view/OutputView.java @@ -7,11 +7,15 @@ public static void printRequestMachinHoldMoney(){ public static void printRequestProducts(){ System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY); } + public static void printInputAmount() { + System.out.println(OutputViewMessage.REQUEST_INPUT_AMOUNT); + } } enum OutputViewMessage{ REQUEST_MACHINE_HOLD_MONEY("자판기가 보유하고 있는 금액을 입력해 주세요."), - REQUEST_PRODUCTS("상품명과 가격, 수량을 입력해 주세요."); + REQUEST_PRODUCTS("상품명과 가격, 수량을 입력해 주세요."), + REQUEST_INPUT_AMOUNT("투입 금액을 입력해 주세요."); private final String message; private OutputViewMessage(final String message) { From 96745c6439457da28ff88c235cb45b7bedc188ba Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 20:37:22 +0900 Subject: [PATCH 17/28] =?UTF-8?q?refactor(Input)=20:=20=EB=B3=B4=EC=9C=A0?= =?UTF-8?q?=20=EA=B8=88=EC=95=A1=20=EC=9E=85=EB=A0=A5=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit readMoney -> readHoldMoney --- src/main/java/vendingmachine/view/Input.java | 2 +- src/main/java/vendingmachine/view/ProxyInputView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vendingmachine/view/Input.java b/src/main/java/vendingmachine/view/Input.java index 5ddcf3301..faba7f66b 100644 --- a/src/main/java/vendingmachine/view/Input.java +++ b/src/main/java/vendingmachine/view/Input.java @@ -1,7 +1,7 @@ package vendingmachine.view; public interface Input { - String readMoney(); + String readHoldMoney(); String readProducts(); String readInputAmount(); String readWanted(); diff --git a/src/main/java/vendingmachine/view/ProxyInputView.java b/src/main/java/vendingmachine/view/ProxyInputView.java index a4980b939..c8cbf4c6b 100644 --- a/src/main/java/vendingmachine/view/ProxyInputView.java +++ b/src/main/java/vendingmachine/view/ProxyInputView.java @@ -9,7 +9,7 @@ public ProxyInputView(Input viewable) { } @Override - public String readMoney() { + public String readHoldMoney() { return null; } From 91d431015887c76781c946c15e650fd181b3d3e4 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 20:50:12 +0900 Subject: [PATCH 18/28] =?UTF-8?q?feat(ExceptionHandler)=20:=20=EC=9E=98?= =?UTF-8?q?=EB=AA=BB=EB=90=9C=20=EC=9E=85=EB=A0=A5=EC=8B=9C=20[ERROR]=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=9D=B4=EC=9C=A0=EB=A5=BC=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=ED=95=98=EA=B3=A0=20=EC=9E=AC=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EB=B0=9B=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/ExceptionHandler.java | 37 +++++++++++++++++++ .../vendingmachine/view/ProxyInputView.java | 10 +++-- 2 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 src/main/java/vendingmachine/utils/ExceptionHandler.java diff --git a/src/main/java/vendingmachine/utils/ExceptionHandler.java b/src/main/java/vendingmachine/utils/ExceptionHandler.java new file mode 100644 index 000000000..0717669db --- /dev/null +++ b/src/main/java/vendingmachine/utils/ExceptionHandler.java @@ -0,0 +1,37 @@ +package vendingmachine.utils; + +import java.util.function.BiFunction; +import java.util.function.Supplier; +import vendingmachine.view.OutputView; + +public class ExceptionHandler { + private static final String ERROR_PREFIX = "[ERROR]"; + private static final int MAX_RECUR_DEPTH = 10; + + public static T input(Supplier supplier, int depth) { + if (depth >= MAX_RECUR_DEPTH) { + throw new IllegalArgumentException( + String.format("[ERROR] 입력 재시도 최대 가능한 %d회를 초과하였습니다.", MAX_RECUR_DEPTH)); + } + try { + return supplier.get(); + } catch (IllegalArgumentException e) { + printExceptionMessage(e); + return input(supplier, depth + 1); + } + } + + public static R convert(BiFunction function, T inputString, U validator) { + try { + return function.apply(inputString, validator); + } catch (IllegalArgumentException e) { + printExceptionMessage(e); + return null; + } + } + + private static void printExceptionMessage(final IllegalArgumentException e) { + OutputView.printExceptionMessage(String.format("%s %s", ERROR_PREFIX, e.getMessage())); + } + +} \ No newline at end of file diff --git a/src/main/java/vendingmachine/view/ProxyInputView.java b/src/main/java/vendingmachine/view/ProxyInputView.java index c8cbf4c6b..8abb0b260 100644 --- a/src/main/java/vendingmachine/view/ProxyInputView.java +++ b/src/main/java/vendingmachine/view/ProxyInputView.java @@ -1,5 +1,7 @@ package vendingmachine.view; +import vendingmachine.utils.ExceptionHandler; + public class ProxyInputView implements Input { private final Input viewable; @@ -10,21 +12,21 @@ public ProxyInputView(Input viewable) { @Override public String readHoldMoney() { - return null; + return ExceptionHandler.input(viewable::readHoldMoney, 0); } @Override public String readProducts() { - return null; + return ExceptionHandler.input(viewable::readProducts, 0); } @Override public String readInputAmount() { - return null; + return ExceptionHandler.input(viewable::readInputAmount, 0); } @Override public String readWanted() { - return null; + return ExceptionHandler.input(viewable::readWanted, 0); } } From 072a08e04aacbe321d09fb718b49faef10473ee9 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 20:50:39 +0900 Subject: [PATCH 19/28] =?UTF-8?q?feat(controller)=20:=20=EA=B2=8C=EC=9E=84?= =?UTF-8?q?=20=ED=9D=90=EB=A6=84=20=EC=A7=84=ED=96=89=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VendingMachineController.java | 21 ++++++++++++--- .../java/vendingmachine/view/OutputView.java | 27 +++++++++++++++---- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/main/java/vendingmachine/controller/VendingMachineController.java b/src/main/java/vendingmachine/controller/VendingMachineController.java index 5298d8c23..a40164b81 100644 --- a/src/main/java/vendingmachine/controller/VendingMachineController.java +++ b/src/main/java/vendingmachine/controller/VendingMachineController.java @@ -20,14 +20,18 @@ public void run(){ setHoldCoin(); setProducts(); setInputAmount(); + //TODO : while(isStilRemainMoney) + requestWanted(); + spendAll(); } private void setHoldCoin() { OutputView.printRequestMachinHoldMoney(); String inputString = input.readHoldMoney(); int holdMoney = Convertor.convertToMoney(inputString); - //coinService.setCoinsByMoney - //printHoldCoin + //TODO : coinService.create + //TODO : coinService.setCoinsByMoney + //TODO : printHoldCoin } private void setProducts() { @@ -37,8 +41,19 @@ private void setProducts() { } private void setInputAmount() { - OutputView.printInputAmount(); + OutputView.printRequestInputAmount(); String inputString = input.readInputAmount(); int inputAmount = Convertor.convertToMoney(inputString); + //TODO : purchaseService create + } + + private void requestWanted() { + OutputView.printRequestWanted(); + String inputString = input.readWanted(); + //TODO : purchaseService.purchase + } + + private void spendAll() { + //TODO : coinService getRemainCoins() } } diff --git a/src/main/java/vendingmachine/view/OutputView.java b/src/main/java/vendingmachine/view/OutputView.java index 8f4bd4601..f6f6188ab 100644 --- a/src/main/java/vendingmachine/view/OutputView.java +++ b/src/main/java/vendingmachine/view/OutputView.java @@ -2,23 +2,40 @@ public class OutputView { public static void printRequestMachinHoldMoney(){ - System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY); + System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY.getMessage()); } public static void printRequestProducts(){ - System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY); + System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY.getMessage()); } - public static void printInputAmount() { - System.out.println(OutputViewMessage.REQUEST_INPUT_AMOUNT); + public static void printRequestInputAmount() { + System.out.println(OutputViewMessage.REQUEST_INPUT_AMOUNT.getMessage()); + } + public static void printRemainAmount(int inputAmount) { + System.out.printf(OutputViewMessage.REQUEST_INPUT_AMOUNT.getMessage(), inputAmount); + } + + public static void printRequestWanted() { + //TODO : 기능 구현 + } + + public static void printExceptionMessage(final String error) { + System.out.println(error); } } enum OutputViewMessage{ REQUEST_MACHINE_HOLD_MONEY("자판기가 보유하고 있는 금액을 입력해 주세요."), REQUEST_PRODUCTS("상품명과 가격, 수량을 입력해 주세요."), - REQUEST_INPUT_AMOUNT("투입 금액을 입력해 주세요."); + REQUEST_INPUT_AMOUNT("투입 금액을 입력해 주세요."), + REQUEST_WANTED("구매할 상품명을 입력해 주세요."), + REMAIN_AMOUNT("투입 금액: %d원\n"); private final String message; private OutputViewMessage(final String message) { this.message = message; } + + public String getMessage() { + return message; + } } \ No newline at end of file From a22b57b43bf75b8a1ecc94c105868dfd125b804d Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 20:52:01 +0900 Subject: [PATCH 20/28] =?UTF-8?q?fix(OutputView)=20:=20=EC=83=81=ED=92=88?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=9E=85=EB=A0=A5=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EA=B4=80=EB=A0=A8=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/vendingmachine/view/OutputView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vendingmachine/view/OutputView.java b/src/main/java/vendingmachine/view/OutputView.java index f6f6188ab..da5bdd486 100644 --- a/src/main/java/vendingmachine/view/OutputView.java +++ b/src/main/java/vendingmachine/view/OutputView.java @@ -5,7 +5,7 @@ public static void printRequestMachinHoldMoney(){ System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY.getMessage()); } public static void printRequestProducts(){ - System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY.getMessage()); + System.out.println(OutputViewMessage.REQUEST_INPUT_AMOUNT.getMessage()); } public static void printRequestInputAmount() { System.out.println(OutputViewMessage.REQUEST_INPUT_AMOUNT.getMessage()); From 42a85db2f7ef31c543fd323977f0a7c9f1c0b8cd Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 21:17:41 +0900 Subject: [PATCH 21/28] =?UTF-8?q?feat(ExceptionHandlier)=20:=20=EB=B3=80?= =?UTF-8?q?=ED=99=98=EC=8B=9C=20=EC=98=88=EC=99=B8=20=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=EC=8B=9C=20=EC=9E=85=EB=A0=A5=EC=9D=84=20=EB=8B=A4=EC=8B=9C=20?= =?UTF-8?q?=EB=B0=9B=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VendingMachineController.java | 14 +++++++--- .../utils/ExceptionHandler.java | 6 +++-- .../validators/InputValidator.java | 27 +++++++++++++++---- .../java/vendingmachine/view/InputView.java | 2 +- .../java/vendingmachine/view/OutputView.java | 6 ++--- 5 files changed, 40 insertions(+), 15 deletions(-) diff --git a/src/main/java/vendingmachine/controller/VendingMachineController.java b/src/main/java/vendingmachine/controller/VendingMachineController.java index a40164b81..5028d6dea 100644 --- a/src/main/java/vendingmachine/controller/VendingMachineController.java +++ b/src/main/java/vendingmachine/controller/VendingMachineController.java @@ -2,7 +2,9 @@ import vendingmachine.domain.Products; import vendingmachine.utils.Convertor; +import vendingmachine.utils.ExceptionHandler; import vendingmachine.view.Input; +import vendingmachine.view.InputView; import vendingmachine.view.OutputView; public class VendingMachineController { @@ -28,7 +30,8 @@ public void run(){ private void setHoldCoin() { OutputView.printRequestMachinHoldMoney(); String inputString = input.readHoldMoney(); - int holdMoney = Convertor.convertToMoney(inputString); + Integer holdMoney = ExceptionHandler.convert(Convertor::convertToMoney, inputString); + if(holdMoney == null) setHoldCoin(); //TODO : coinService.create //TODO : coinService.setCoinsByMoney //TODO : printHoldCoin @@ -37,19 +40,22 @@ private void setHoldCoin() { private void setProducts() { OutputView.printRequestProducts(); String inputString = input.readProducts(); - Products products = Convertor.convertToProducts(inputString); + Products products = ExceptionHandler.convert(Convertor::convertToProducts, inputString); + if(products == null) setProducts(); + //TODO : purchaseService create } private void setInputAmount() { OutputView.printRequestInputAmount(); String inputString = input.readInputAmount(); - int inputAmount = Convertor.convertToMoney(inputString); - //TODO : purchaseService create + Integer inputAmount = ExceptionHandler.convert(Convertor::convertToMoney, inputString); + if(inputAmount == null) setInputAmount(); } private void requestWanted() { OutputView.printRequestWanted(); String inputString = input.readWanted(); + //TODO : purchaseService.purchase } diff --git a/src/main/java/vendingmachine/utils/ExceptionHandler.java b/src/main/java/vendingmachine/utils/ExceptionHandler.java index 0717669db..34135de67 100644 --- a/src/main/java/vendingmachine/utils/ExceptionHandler.java +++ b/src/main/java/vendingmachine/utils/ExceptionHandler.java @@ -1,6 +1,8 @@ package vendingmachine.utils; +import java.util.Optional; import java.util.function.BiFunction; +import java.util.function.Function; import java.util.function.Supplier; import vendingmachine.view.OutputView; @@ -21,9 +23,9 @@ public static T input(Supplier supplier, int depth) { } } - public static R convert(BiFunction function, T inputString, U validator) { + public static R convert(Function function, T inputString) { try { - return function.apply(inputString, validator); + return function.apply(inputString); } catch (IllegalArgumentException e) { printExceptionMessage(e); return null; diff --git a/src/main/java/vendingmachine/validators/InputValidator.java b/src/main/java/vendingmachine/validators/InputValidator.java index a6d79e404..d6f47428c 100644 --- a/src/main/java/vendingmachine/validators/InputValidator.java +++ b/src/main/java/vendingmachine/validators/InputValidator.java @@ -10,6 +10,7 @@ public class InputValidator { private static final Pattern NUMBER = compile(NUMBER_MATCH_REGEX); private static final String NUMBERFORMAT_EXCEPTION = "정수의 범위를 벗어났습니다"; private static final String NOT_NUMBER_EXCEPTION = "숫자0-9만 입력 가능합니다"; + private static final String EMPTY_INPUT_EXCEPTION = "사용자의 입력이 비어있습니다."; public static String validateInt(final String intInput) { isNumberPattern(intInput); @@ -18,20 +19,36 @@ public static String validateInt(final String intInput) { } private static void isInIntegerRange(final String intInput) { - try{ + try { Integer.parseInt(intInput); - }catch (NumberFormatException e){ + } catch (NumberFormatException e) { throw new IllegalArgumentException(NUMBERFORMAT_EXCEPTION); } } private static void isNumberPattern(final String intInput) { Matcher matcher = NUMBER.matcher(intInput); - if(!matcher.matches()) throw new IllegalArgumentException(NOT_NUMBER_EXCEPTION); + if (!matcher.matches()) { + throw new IllegalArgumentException(NOT_NUMBER_EXCEPTION); + } + + } + public static String validateString(final String stringInput) { + isEmptyString(stringInput); + isBlankString(stringInput); + return stringInput; } - public static String validateStringint(final String stringInput) { - return null; + private static void isBlankString(final String stringInput) { + if (stringInput.isEmpty()) { + throw new IllegalArgumentException(EMPTY_INPUT_EXCEPTION); + } + } + + private static void isEmptyString(final String stringInput) { + if (stringInput.isEmpty()) { + throw new IllegalArgumentException(EMPTY_INPUT_EXCEPTION); + } } } diff --git a/src/main/java/vendingmachine/view/InputView.java b/src/main/java/vendingmachine/view/InputView.java index 0103fcd19..0d5c37234 100644 --- a/src/main/java/vendingmachine/view/InputView.java +++ b/src/main/java/vendingmachine/view/InputView.java @@ -38,7 +38,7 @@ private String readInt(){ private String readString(){ String stringInput = Console.readLine(); - return InputValidator.validateStringint(stringInput); + return InputValidator.validateString(stringInput); } } diff --git a/src/main/java/vendingmachine/view/OutputView.java b/src/main/java/vendingmachine/view/OutputView.java index da5bdd486..716dba113 100644 --- a/src/main/java/vendingmachine/view/OutputView.java +++ b/src/main/java/vendingmachine/view/OutputView.java @@ -5,17 +5,17 @@ public static void printRequestMachinHoldMoney(){ System.out.println(OutputViewMessage.REQUEST_MACHINE_HOLD_MONEY.getMessage()); } public static void printRequestProducts(){ - System.out.println(OutputViewMessage.REQUEST_INPUT_AMOUNT.getMessage()); + System.out.println(OutputViewMessage.REQUEST_PRODUCTS.getMessage()); } public static void printRequestInputAmount() { System.out.println(OutputViewMessage.REQUEST_INPUT_AMOUNT.getMessage()); } public static void printRemainAmount(int inputAmount) { - System.out.printf(OutputViewMessage.REQUEST_INPUT_AMOUNT.getMessage(), inputAmount); + System.out.printf(OutputViewMessage.REMAIN_AMOUNT.getMessage(), inputAmount); } public static void printRequestWanted() { - //TODO : 기능 구현 + System.out.println(OutputViewMessage.REQUEST_WANTED.getMessage()); } public static void printExceptionMessage(final String error) { From 4fd103370a8bd17c37954985e6c11741e7db6eb4 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 21:23:18 +0900 Subject: [PATCH 22/28] =?UTF-8?q?feat(PurchaseService)=20:=20=EA=B5=AC?= =?UTF-8?q?=EB=A7=A4=20=EA=B4=80=EB=A0=A8=20=EB=B9=84=EC=A7=80=EB=8B=88?= =?UTF-8?q?=EC=8A=A4=20=EB=A1=9C=EC=A7=81=EC=9D=84=20=EC=88=98=ED=96=89?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EB=A9=94=EC=84=9C=EB=93=9C=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VendingMachineController.java | 8 ++++++-- .../service/PurchaseService.java | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vendingmachine/service/PurchaseService.java diff --git a/src/main/java/vendingmachine/controller/VendingMachineController.java b/src/main/java/vendingmachine/controller/VendingMachineController.java index 5028d6dea..6909fcddd 100644 --- a/src/main/java/vendingmachine/controller/VendingMachineController.java +++ b/src/main/java/vendingmachine/controller/VendingMachineController.java @@ -1,6 +1,7 @@ package vendingmachine.controller; import vendingmachine.domain.Products; +import vendingmachine.service.PurchaseService; import vendingmachine.utils.Convertor; import vendingmachine.utils.ExceptionHandler; import vendingmachine.view.Input; @@ -9,6 +10,8 @@ public class VendingMachineController { private final Input input; + private Products products; + private PurchaseService purchaseService; private VendingMachineController(final Input input) { this.input = input; @@ -42,7 +45,7 @@ private void setProducts() { String inputString = input.readProducts(); Products products = ExceptionHandler.convert(Convertor::convertToProducts, inputString); if(products == null) setProducts(); - //TODO : purchaseService create + this.products = products; } private void setInputAmount() { @@ -50,12 +53,13 @@ private void setInputAmount() { String inputString = input.readInputAmount(); Integer inputAmount = ExceptionHandler.convert(Convertor::convertToMoney, inputString); if(inputAmount == null) setInputAmount(); + purchaseService = PurchaseService.of(products, inputAmount); + } private void requestWanted() { OutputView.printRequestWanted(); String inputString = input.readWanted(); - //TODO : purchaseService.purchase } diff --git a/src/main/java/vendingmachine/service/PurchaseService.java b/src/main/java/vendingmachine/service/PurchaseService.java new file mode 100644 index 000000000..d3ff8dba4 --- /dev/null +++ b/src/main/java/vendingmachine/service/PurchaseService.java @@ -0,0 +1,18 @@ +package vendingmachine.service; + +import vendingmachine.domain.Products; + +public class PurchaseService { + private final Products products; + private final int inputAmount; + + public PurchaseService(final Products products, final int inputAmount) { + this.products = products; + this.inputAmount = inputAmount; + } + + + public static PurchaseService of(final Products products, final Integer inputAmount) { + return new PurchaseService(products, inputAmount); + } +} From 917e9c33563b586bec4fb0a67fc87012c08a113f Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 21:26:33 +0900 Subject: [PATCH 23/28] =?UTF-8?q?docs=20:=20=EC=83=81=ED=92=88=20=EA=B5=AC?= =?UTF-8?q?=EB=A7=A4=20=EA=B4=80=EB=A0=A8=20=EC=83=81=EC=84=B8=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/docs/README.md | 7 +++++-- src/main/java/vendingmachine/service/PurchaseService.java | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/docs/README.md b/src/main/docs/README.md index 6f14be930..84483f351 100644 --- a/src/main/docs/README.md +++ b/src/main/docs/README.md @@ -18,8 +18,11 @@ - 동전의 개수를 최소한으로 잔돈 돌려주기 - 지폐 단위는 사용 불가하다. - 잔액 중 동전만 사용해 반환 불가능 시에 남은 금액은 자판기에 남는다. -5. 상품을 구매하기 - - 더이상 구매가 불가능한 경우(남은 금액이 상품의 최저 가격보다 적음, 모든 상품이 소진됨.) 잔돈을 반환한다 +5. 상품을 구매하기 + - [ ] ```구매할 상품명```이 자판기에 존재하는지 검사한다. + - [ ] 현재 금액으로 구매가 가능한지 검사한다. + - [ ] 상품을 구매하여 최초 투입 금액에서 차감한다. + - [ ] 더이상 구매가 불가능한 경우(남은 금액이 상품의 최저 가격보다 적음, 모든 상품이 소진됨.) 잔돈을 반환한다 # 프로그래밍 요구사항 - Coin diff --git a/src/main/java/vendingmachine/service/PurchaseService.java b/src/main/java/vendingmachine/service/PurchaseService.java index d3ff8dba4..64421a22c 100644 --- a/src/main/java/vendingmachine/service/PurchaseService.java +++ b/src/main/java/vendingmachine/service/PurchaseService.java @@ -11,8 +11,12 @@ public PurchaseService(final Products products, final int inputAmount) { this.inputAmount = inputAmount; } - public static PurchaseService of(final Products products, final Integer inputAmount) { return new PurchaseService(products, inputAmount); } + + public void purchase() { + //TODO : products에 존재하나? + //현재 금액으로 구매가 가능한가? + } } From d65349951a1d016a19d33359688d9258aac481a7 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 21:39:35 +0900 Subject: [PATCH 24/28] =?UTF-8?q?test(CoinGenrator)=20:=20=EC=BD=94?= =?UTF-8?q?=EC=9D=B8=20=EA=B0=9C=EC=88=98=20=EC=83=9D=EC=84=B1=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=ED=95=A8=EC=88=98=20pickNumberInList()=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vendingmachine/utils/CoinGeneratorTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/test/java/vendingmachine/utils/CoinGeneratorTest.java diff --git a/src/test/java/vendingmachine/utils/CoinGeneratorTest.java b/src/test/java/vendingmachine/utils/CoinGeneratorTest.java new file mode 100644 index 000000000..121d5b92d --- /dev/null +++ b/src/test/java/vendingmachine/utils/CoinGeneratorTest.java @@ -0,0 +1,16 @@ +package vendingmachine.utils; + +import static camp.nextstep.edu.missionutils.Randoms.pickNumberInList; + +import java.util.List; +import org.junit.jupiter.api.Test; + +class CoinGeneratorTest { + + @Test + void pickNumberInList는_주어진동전금액에서_무작위로_하나의동전을선택한다() { + int result = pickNumberInList(List.of(500, 100, 50, 10)); + System.out.println(result); + } + +} \ No newline at end of file From ca7bd9ea2b512067766b6fc41bf7ad692c55d0c5 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 21:44:12 +0900 Subject: [PATCH 25/28] =?UTF-8?q?feat(CoinGenerator)=20:=20=EC=9E=90?= =?UTF-8?q?=ED=8C=90=EA=B8=B0=EC=9D=98=20=EB=B3=B4=EC=9C=A0=20=EA=B8=88?= =?UTF-8?q?=EC=95=A1=EB=A7=8C=ED=81=BC=20=EC=BD=94=EC=9D=B8=EC=9D=84=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VendingMachineController.java | 4 +- .../service/PurchaseService.java | 5 +-- .../vendingmachine/utils/CoinGenerator.java | 41 +++++++++++++++++++ 3 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vendingmachine/utils/CoinGenerator.java diff --git a/src/main/java/vendingmachine/controller/VendingMachineController.java b/src/main/java/vendingmachine/controller/VendingMachineController.java index 6909fcddd..949113bcf 100644 --- a/src/main/java/vendingmachine/controller/VendingMachineController.java +++ b/src/main/java/vendingmachine/controller/VendingMachineController.java @@ -54,13 +54,13 @@ private void setInputAmount() { Integer inputAmount = ExceptionHandler.convert(Convertor::convertToMoney, inputString); if(inputAmount == null) setInputAmount(); purchaseService = PurchaseService.of(products, inputAmount); - + } private void requestWanted() { OutputView.printRequestWanted(); String inputString = input.readWanted(); - //TODO : purchaseService.purchase + purchaseService.purchase(inputString); } private void spendAll() { diff --git a/src/main/java/vendingmachine/service/PurchaseService.java b/src/main/java/vendingmachine/service/PurchaseService.java index 64421a22c..816d13283 100644 --- a/src/main/java/vendingmachine/service/PurchaseService.java +++ b/src/main/java/vendingmachine/service/PurchaseService.java @@ -15,8 +15,7 @@ public static PurchaseService of(final Products products, final Integer inputAmo return new PurchaseService(products, inputAmount); } - public void purchase() { - //TODO : products에 존재하나? - //현재 금액으로 구매가 가능한가? + public void purchase(final String inputString) { + } } diff --git a/src/main/java/vendingmachine/utils/CoinGenerator.java b/src/main/java/vendingmachine/utils/CoinGenerator.java new file mode 100644 index 000000000..3c1932e70 --- /dev/null +++ b/src/main/java/vendingmachine/utils/CoinGenerator.java @@ -0,0 +1,41 @@ +package vendingmachine.utils; + +import static camp.nextstep.edu.missionutils.Randoms.pickNumberInList; + +import java.util.HashMap; +import java.util.List; +import vendingmachine.domain.Coin; + +public class CoinGenerator { + private static final int COIN10 = 0; + private static final int COIN50 = 1; + private static final int COIN100 = 2; + private static final int COIN500 = 3; + + HashMap countCoin(int holdMoney) { + HashMap map = new HashMap<>(); + int coins[][] = generateByHoldMoney(holdMoney); + map.put(Coin.COIN_10, coins[COIN10][0]); + map.put(Coin.COIN_50, coins[COIN50][0]); + map.put(Coin.COIN_100, coins[COIN100][0]); + map.put(Coin.COIN_500, coins[COIN500][0]); + return map; + } + + private int[][] generateByHoldMoney(int holdMoney) { + int coins[][] = new int[Coin.values().length][1]; + while (holdMoney > 0) { + int random = pickNumberInList(List.of( + COIN10, + COIN50, + COIN100, + COIN500)); + if (holdMoney > random) { + holdMoney -= random; + coins[random][0]++; + } + } + return coins; + } + +} From ab243dfd54aa546c9e2c9879ca33e0929b26f2d5 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 21:50:57 +0900 Subject: [PATCH 26/28] =?UTF-8?q?feat(CoinService)=20:=20=EB=8F=99?= =?UTF-8?q?=EC=A0=84=EC=9D=84=20=EA=B4=80=EB=A6=AC=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=83=9D=EC=84=B1=EB=A9=94?= =?UTF-8?q?=EC=86=8C=EB=93=9C=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vendingmachine/controller/CoinService.java | 14 ++++++++++++++ .../controller/VendingMachineController.java | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/main/java/vendingmachine/controller/CoinService.java diff --git a/src/main/java/vendingmachine/controller/CoinService.java b/src/main/java/vendingmachine/controller/CoinService.java new file mode 100644 index 000000000..c19cd8060 --- /dev/null +++ b/src/main/java/vendingmachine/controller/CoinService.java @@ -0,0 +1,14 @@ +package vendingmachine.controller; + +public class CoinService { + + private final int holdMoney; + + public CoinService(final int holdMoney) { + this.holdMoney = holdMoney; + } + + public static CoinService from(final int holdMoney) { + return new CoinService(holdMoney); + } +} diff --git a/src/main/java/vendingmachine/controller/VendingMachineController.java b/src/main/java/vendingmachine/controller/VendingMachineController.java index 949113bcf..7d7fdf89a 100644 --- a/src/main/java/vendingmachine/controller/VendingMachineController.java +++ b/src/main/java/vendingmachine/controller/VendingMachineController.java @@ -12,6 +12,7 @@ public class VendingMachineController { private final Input input; private Products products; private PurchaseService purchaseService; + private CoinService coinService; private VendingMachineController(final Input input) { this.input = input; @@ -35,7 +36,7 @@ private void setHoldCoin() { String inputString = input.readHoldMoney(); Integer holdMoney = ExceptionHandler.convert(Convertor::convertToMoney, inputString); if(holdMoney == null) setHoldCoin(); - //TODO : coinService.create + coinService = CoinService.from(holdMoney); //TODO : coinService.setCoinsByMoney //TODO : printHoldCoin } From e27dbdf24dc8567d018a56a350f6d89d31ea7553 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 21:55:29 +0900 Subject: [PATCH 27/28] =?UTF-8?q?feat(CoinService)=20:=20coinGenerator?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=B4=EC=9C=A0=EA=B8=88=EC=95=A1=EC=9D=84=20?= =?UTF-8?q?=EC=BD=94=EC=9D=B8=EC=9C=BC=EB=A1=9C=20=EB=B3=80=ED=99=98?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CoinService.java | 14 ++++++------ .../controller/VendingMachineController.java | 22 ++++++++++++------- .../vendingmachine/utils/CoinGenerator.java | 2 +- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/java/vendingmachine/controller/CoinService.java b/src/main/java/vendingmachine/controller/CoinService.java index c19cd8060..90414de9f 100644 --- a/src/main/java/vendingmachine/controller/CoinService.java +++ b/src/main/java/vendingmachine/controller/CoinService.java @@ -1,14 +1,14 @@ package vendingmachine.controller; -public class CoinService { +import java.util.HashMap; +import vendingmachine.domain.Coin; +import vendingmachine.utils.CoinGenerator; - private final int holdMoney; +public class CoinService { - public CoinService(final int holdMoney) { - this.holdMoney = holdMoney; - } + private HashMap coins; - public static CoinService from(final int holdMoney) { - return new CoinService(holdMoney); + public void setCoinsByMoney(final Integer holdMoney, CoinGenerator generator) { + coins = generator.countCoin(holdMoney); } } diff --git a/src/main/java/vendingmachine/controller/VendingMachineController.java b/src/main/java/vendingmachine/controller/VendingMachineController.java index 7d7fdf89a..d8aeb82c7 100644 --- a/src/main/java/vendingmachine/controller/VendingMachineController.java +++ b/src/main/java/vendingmachine/controller/VendingMachineController.java @@ -2,17 +2,18 @@ import vendingmachine.domain.Products; import vendingmachine.service.PurchaseService; +import vendingmachine.utils.CoinGenerator; import vendingmachine.utils.Convertor; import vendingmachine.utils.ExceptionHandler; import vendingmachine.view.Input; -import vendingmachine.view.InputView; import vendingmachine.view.OutputView; public class VendingMachineController { private final Input input; + private final CoinGenerator coinGenerator = new CoinGenerator(); + private final CoinService coinService = new CoinService(); private Products products; private PurchaseService purchaseService; - private CoinService coinService; private VendingMachineController(final Input input) { this.input = input; @@ -22,7 +23,7 @@ public static VendingMachineController from(final Input input) { return new VendingMachineController(input); } - public void run(){ + public void run() { setHoldCoin(); setProducts(); setInputAmount(); @@ -35,9 +36,10 @@ private void setHoldCoin() { OutputView.printRequestMachinHoldMoney(); String inputString = input.readHoldMoney(); Integer holdMoney = ExceptionHandler.convert(Convertor::convertToMoney, inputString); - if(holdMoney == null) setHoldCoin(); - coinService = CoinService.from(holdMoney); - //TODO : coinService.setCoinsByMoney + if (holdMoney == null) { + setHoldCoin(); + } + coinService.setCoinsByMoney(holdMoney, coinGenerator); //TODO : printHoldCoin } @@ -45,7 +47,9 @@ private void setProducts() { OutputView.printRequestProducts(); String inputString = input.readProducts(); Products products = ExceptionHandler.convert(Convertor::convertToProducts, inputString); - if(products == null) setProducts(); + if (products == null) { + setProducts(); + } this.products = products; } @@ -53,7 +57,9 @@ private void setInputAmount() { OutputView.printRequestInputAmount(); String inputString = input.readInputAmount(); Integer inputAmount = ExceptionHandler.convert(Convertor::convertToMoney, inputString); - if(inputAmount == null) setInputAmount(); + if (inputAmount == null) { + setInputAmount(); + } purchaseService = PurchaseService.of(products, inputAmount); } diff --git a/src/main/java/vendingmachine/utils/CoinGenerator.java b/src/main/java/vendingmachine/utils/CoinGenerator.java index 3c1932e70..4d3a49226 100644 --- a/src/main/java/vendingmachine/utils/CoinGenerator.java +++ b/src/main/java/vendingmachine/utils/CoinGenerator.java @@ -12,7 +12,7 @@ public class CoinGenerator { private static final int COIN100 = 2; private static final int COIN500 = 3; - HashMap countCoin(int holdMoney) { + public HashMap countCoin(int holdMoney) { HashMap map = new HashMap<>(); int coins[][] = generateByHoldMoney(holdMoney); map.put(Coin.COIN_10, coins[COIN10][0]); From 5db58c655b4c00ece575cdfa422643e204c8e751 Mon Sep 17 00:00:00 2001 From: oyoungsun Date: Mon, 20 Nov 2023 21:59:17 +0900 Subject: [PATCH 28/28] =?UTF-8?q?feat(CoinService)=20:=20=EA=B5=AC?= =?UTF-8?q?=EB=A7=A4=20=ED=9B=84=20=EB=82=A8=EC=9D=80=20=EA=B8=88=EC=95=A1?= =?UTF-8?q?=EC=9D=84=20=EC=BD=94=EC=9D=B8=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=ED=99=98=ED=95=98=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/docs/README.md | 4 ++-- src/main/java/vendingmachine/controller/CoinService.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/docs/README.md b/src/main/docs/README.md index 84483f351..68086b718 100644 --- a/src/main/docs/README.md +++ b/src/main/docs/README.md @@ -15,9 +15,9 @@ 3. 자판이가 보유하고 있는 금액에서 동전을 무작위로 생성하기 - 자판기가 보유한 동전을 출력한다. 4. 잔돈 돌려주기 - - 동전의 개수를 최소한으로 잔돈 돌려주기 + - [ ] 동전의 개수를 최소한으로 잔돈 돌려주기 - 지폐 단위는 사용 불가하다. - - 잔액 중 동전만 사용해 반환 불가능 시에 남은 금액은 자판기에 남는다. + - [ ] 잔액 중 동전만 사용해 반환 불가능 시에 남은 금액은 자판기에 남는다. 5. 상품을 구매하기 - [ ] ```구매할 상품명```이 자판기에 존재하는지 검사한다. - [ ] 현재 금액으로 구매가 가능한지 검사한다. diff --git a/src/main/java/vendingmachine/controller/CoinService.java b/src/main/java/vendingmachine/controller/CoinService.java index 90414de9f..a14a28847 100644 --- a/src/main/java/vendingmachine/controller/CoinService.java +++ b/src/main/java/vendingmachine/controller/CoinService.java @@ -7,8 +7,13 @@ public class CoinService { private HashMap coins; + private int remainMoney; public void setCoinsByMoney(final Integer holdMoney, CoinGenerator generator) { coins = generator.countCoin(holdMoney); } + + public void change(){ + //TODO : 잔돈을 가능한 적은 코인으로 교환한다 + } }