From 4e5d11565970af1bee01843eb9ddbeb1b6378207 Mon Sep 17 00:00:00 2001 From: stevenkim18 <11882@naver.com> Date: Mon, 8 Mar 2021 11:46:50 +0900 Subject: [PATCH 1/3] =?UTF-8?q?docs:=20README.md=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..226b072a6 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# steven-test From e97c7ecb0d9d049a6f67e003853242ddee9f2a04 Mon Sep 17 00:00:00 2001 From: stevenkim18 <11882@naver.com> Date: Mon, 8 Mar 2021 16:26:10 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20step1=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20=EC=A3=BC=EC=8A=A4=20=EB=A9=94=EC=9D=B4?= =?UTF-8?q?=EC=BB=A4=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=9E=AC=EA=B3=A0=20=ED=99=95=EC=9D=B8=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=20=EC=9E=AC=EA=B3=A0=EA=B0=80=20=EC=9E=88=EB=8A=94?= =?UTF-8?q?=EC=A7=80=20=ED=99=95=EC=9D=B8=ED=95=98=EB=8A=94=20=EB=A9=94?= =?UTF-8?q?=EC=86=8C=EB=93=9C=20=EA=B3=BC=EC=9D=BC=20=EC=86=8C=EB=B9=84?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=A3=BC?= =?UTF-8?q?=EC=8A=A4=20=EB=A7=8C=EB=93=A4=EA=B8=B0=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=20=EA=B3=BC=EC=9D=BC=20=EC=9E=AC=EA=B3=A0=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=A9=94=EC=86=8C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JuiceMaker/JuiceMaker/JuiceMaker.swift | 53 +++++++++++++++++++++- JuiceMaker/JuiceMaker/ViewController.swift | 10 +++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/JuiceMaker/JuiceMaker/JuiceMaker.swift b/JuiceMaker/JuiceMaker/JuiceMaker.swift index 930465fdb..bd757bcb2 100644 --- a/JuiceMaker/JuiceMaker/JuiceMaker.swift +++ b/JuiceMaker/JuiceMaker/JuiceMaker.swift @@ -6,4 +6,55 @@ import Foundation -/// 쥬스 메이커 타입 +enum Fruit: Int, CaseIterable { + case strawberry, banana, pineapple, kiwi, mango + + var index: Int { + return self.rawValue + } +} + +enum FruitJuice { + case strawberry, banana, kiwi, pineapple, strawberryBanana, mango, mangoKiwi +} + +class JuiceMaker { + private var fruitStocks = [Int](repeating: 10, count: Fruit.allCases.count) + + func checkStock(fruit: Fruit) -> Int { + return fruitStocks[fruit.index] + } + func checkStockAvailable(fruit: Fruit, stock: Int) -> Bool { + if (checkStock(fruit: fruit) < stock) { + return false + } + return true + } + func consumeFriut(fruit: Fruit, stock: Int) { + fruitStocks[fruit.index] -= stock + } + func makeFruitJuice(juice: FruitJuice) { + switch juice { + case .strawberry: + consumeFriut(fruit: .strawberry, stock: 16) + case .banana: + consumeFriut(fruit: .banana, stock: 2) + case .kiwi: + consumeFriut(fruit: .kiwi, stock: 3) + case .pineapple: + consumeFriut(fruit: .pineapple, stock: 2) + case .strawberryBanana: + consumeFriut(fruit: .strawberry, stock: 10) + consumeFriut(fruit: .banana, stock: 1) + case .mango: + consumeFriut(fruit: .mango, stock: 3) + case .mangoKiwi: + consumeFriut(fruit: .mango, stock: 2) + consumeFriut(fruit: .kiwi, stock: 1) + } + } + func addStock(fruit: Fruit) { + fruitStocks[fruit.index] += 1 + } +} + diff --git a/JuiceMaker/JuiceMaker/ViewController.swift b/JuiceMaker/JuiceMaker/ViewController.swift index 19f26dc83..d0571ddad 100644 --- a/JuiceMaker/JuiceMaker/ViewController.swift +++ b/JuiceMaker/JuiceMaker/ViewController.swift @@ -11,8 +11,14 @@ class ViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + + let j = JuiceMaker() + print(j.fruitStocks) + + j.consumeFriut(fruit: .banana, stock: 12) + + print(j.fruitStocks) + } - - } From 48267db30a16d7bf67c6d266b41e1e8292d69fcf Mon Sep 17 00:00:00 2001 From: stevenkim18 <11882@naver.com> Date: Wed, 10 Mar 2021 00:07:11 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=EC=BB=A4=EB=B0=8B=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JuiceMaker/Base.lproj/Main.storyboard | 18 +++++++++++----- JuiceMaker/JuiceMaker/JuiceMaker.swift | 21 +++++++++---------- JuiceMaker/JuiceMaker/ViewController.swift | 7 +++---- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/JuiceMaker/JuiceMaker/Base.lproj/Main.storyboard b/JuiceMaker/JuiceMaker/Base.lproj/Main.storyboard index 25a763858..62c96495a 100644 --- a/JuiceMaker/JuiceMaker/Base.lproj/Main.storyboard +++ b/JuiceMaker/JuiceMaker/Base.lproj/Main.storyboard @@ -1,24 +1,32 @@ - + + - + + - + - + - + + + + + + + diff --git a/JuiceMaker/JuiceMaker/JuiceMaker.swift b/JuiceMaker/JuiceMaker/JuiceMaker.swift index bd757bcb2..13d5c1398 100644 --- a/JuiceMaker/JuiceMaker/JuiceMaker.swift +++ b/JuiceMaker/JuiceMaker/JuiceMaker.swift @@ -30,31 +30,30 @@ class JuiceMaker { } return true } - func consumeFriut(fruit: Fruit, stock: Int) { + func consumeFruit(fruit: Fruit, stock: Int) { fruitStocks[fruit.index] -= stock } func makeFruitJuice(juice: FruitJuice) { switch juice { case .strawberry: - consumeFriut(fruit: .strawberry, stock: 16) + consumeFruit(fruit: .strawberry, stock: 16) case .banana: - consumeFriut(fruit: .banana, stock: 2) + consumeFruit(fruit: .banana, stock: 2) case .kiwi: - consumeFriut(fruit: .kiwi, stock: 3) + consumeFruit(fruit: .kiwi, stock: 3) case .pineapple: - consumeFriut(fruit: .pineapple, stock: 2) + consumeFruit(fruit: .pineapple, stock: 2) case .strawberryBanana: - consumeFriut(fruit: .strawberry, stock: 10) - consumeFriut(fruit: .banana, stock: 1) + consumeFruit(fruit: .strawberry, stock: 10) + consumeFruit(fruit: .banana, stock: 1) case .mango: - consumeFriut(fruit: .mango, stock: 3) + consumeFruit(fruit: .mango, stock: 3) case .mangoKiwi: - consumeFriut(fruit: .mango, stock: 2) - consumeFriut(fruit: .kiwi, stock: 1) + consumeFruit(fruit: .mango, stock: 2) + consumeFruit(fruit: .kiwi, stock: 1) } } func addStock(fruit: Fruit) { fruitStocks[fruit.index] += 1 } } - diff --git a/JuiceMaker/JuiceMaker/ViewController.swift b/JuiceMaker/JuiceMaker/ViewController.swift index d0571ddad..1f9dba499 100644 --- a/JuiceMaker/JuiceMaker/ViewController.swift +++ b/JuiceMaker/JuiceMaker/ViewController.swift @@ -13,11 +13,10 @@ class ViewController: UIViewController { // Do any additional setup after loading the view. let j = JuiceMaker() - print(j.fruitStocks) + print(j.checkStock(fruit: .strawberry)) + j.addStock(fruit: .strawberry) + print(j.checkStock(fruit: .strawberry)) - j.consumeFriut(fruit: .banana, stock: 12) - - print(j.fruitStocks) } }