Merge pull request #81 from jetbrains-academy/fix-cooking-soup

Fix cooking soup
jetbrains-academy · Oct 16, 2024 · 0efb5f2 · 0efb5f2
2 parents 9472c2b + 7312fbb
commit 0efb5f2
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 30 deletions.
diff --git a/...ServerAddSpices/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...ServerAddSpices/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...es/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...es/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {

diff --git a/...ServerCookSalad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...ServerCookSalad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...ad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...ad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {

diff --git a/...verCookSmoothie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...verCookSmoothie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...ie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...ie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {

diff --git a/...verFridgeRefill/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...verFridgeRefill/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...ll/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...ll/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {

diff --git a/...yServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...yServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...un/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...un/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {

diff --git a/...verIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...verIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...on/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...on/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {

diff --git a/...erKitchenModels/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...erKitchenModels/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...ls/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...ls/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {

diff --git a/...tSequenceTheory/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...tSequenceTheory/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...ry/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...ry/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {

diff --git a/...eInitialization/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt b/...eInitialization/src/main/kotlin/org/jetbrains/kotlin/course/culinary/game/GameResource.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.course.culinary.game
 import org.jetbrains.kotlin.course.culinary.converters.toItemType
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUMBER_OF_TOMATOES
 import org.jetbrains.kotlin.course.culinary.game.recipes.NUM_VEGETABLES_FOR_SALAD
+import org.jetbrains.kotlin.course.culinary.implementation.cooking.PotImpl
 import org.jetbrains.kotlin.course.culinary.implementation.storage.FridgeImpl
 import org.jetbrains.kotlin.course.culinary.models.ItemType
 import org.jetbrains.kotlin.course.culinary.models.Task
@@ -24,22 +25,24 @@ class CookingFunction(val service: CookingService) {
     @GetMapping("/tomato-soup")
     fun tomatoSoup(): List<Action> {
         clearActions()
+        PotImpl.reset()
         if (FridgeImpl.vegetables.count{ it.type == VegetableType.Tomato && it.isFresh } < NUMBER_OF_TOMATOES) {
             // Show an error
             return emptyList()
         }
 
         service.cookTomatoSoup()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 
     @CrossOrigin
     @GetMapping("/soup-spices")
     fun soupSpices(): List<Action> {
         clearActions()
+        PotImpl.reset()
         service.cookWithSpices()
-        clearKitchen()
+        PotImpl.simmering = false
         return actions
     }
 

diff --git a/...on/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt b/...on/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/cooking/PotImpl.kt
@@ -14,7 +14,7 @@ data object PotImpl : Pot {
     override fun doesTastePerfect(): Boolean = filling.filter{ it is Spice }
         .groupingBy{ it }
         .eachCount()
-        .filter{ (_, n) -> n > 2 }
+        .filter{ (_, n) -> n >= 2 }
         .isEmpty()
 
     override fun <T: Ingredient> put(ingredient: T) {