Merge pull request #82 from jetbrains-academy/remove-action

Remove REMOVE_FROM_COUNTER action
jetbrains-academy · Oct 16, 2024 · 941de9d · 941de9d
2 parents 0efb5f2 + ef01a1b
commit 941de9d
Show file tree

Hide file tree

Showing 24 changed files with 0 additions and 26 deletions.
diff --git a/...Spices/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...Spices/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...ddSpices/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...ddSpices/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/culinaryServer/culinaryServerAddSpices/test/Tests.kt b/culinaryServer/culinaryServerAddSpices/test/Tests.kt
@@ -93,7 +93,6 @@ class Test {
             }
             repeat(NUMBER_OF_TOMATOES) {
                 addAll(listOf(
-                    Action(ActionType.REMOVE_FROM_COUNTER, ItemType.CUT_TOMATO),
                     Action(ActionType.PUT_IN_POT, ItemType.CUT_TOMATO)
                 ))
             }

diff --git a/...kSalad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...kSalad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...ookSalad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...ookSalad/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/culinaryServer/culinaryServerCookSalad/test/Tests.kt b/culinaryServer/culinaryServerCookSalad/test/Tests.kt
@@ -73,7 +73,6 @@ class Test {
             repeat(vegetables.size) {
                 addAll(listOf(ActionType.CUT_ON_COUNTER, ActionType.SHOW_ON_COUNTER))
             }
-            addAll(List(NUM_VEGETABLES_FOR_SALAD) { ActionType.REMOVE_FROM_COUNTER })
         }
         assert(expectedActions == actions.map{ it.type }) { "The ${method.name} method should take vegetables and cut them: take each of them from the fridge, and then cut" }
     }
@@ -153,7 +152,6 @@ class Test {
             }
             repeat(NUMBER_OF_TOMATOES) {
                 addAll(listOf(
-                    Action(ActionType.REMOVE_FROM_COUNTER, ItemType.CUT_TOMATO),
                     Action(ActionType.PUT_IN_POT, ItemType.CUT_TOMATO)
                 ))
             }

diff --git a/...oothie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...oothie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...Smoothie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...Smoothie/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/culinaryServer/culinaryServerCookSmoothie/test/Tests.kt b/culinaryServer/culinaryServerCookSmoothie/test/Tests.kt
@@ -73,7 +73,6 @@ class Test {
             repeat(vegetables.size) {
                 addAll(listOf(ActionType.CUT_ON_COUNTER, ActionType.SHOW_ON_COUNTER))
             }
-            addAll(List(NUM_VEGETABLES_FOR_SALAD) { ActionType.REMOVE_FROM_COUNTER })
         }
         assert(expectedActions == actions.map{ it.type }) { "The ${method.name} method should take vegetables and cut them: take each of them from the fridge, and then cut" }
     }
@@ -153,7 +152,6 @@ class Test {
             }
             repeat(NUMBER_OF_TOMATOES) {
                 addAll(listOf(
-                    Action(ActionType.REMOVE_FROM_COUNTER, ItemType.CUT_TOMATO),
                     Action(ActionType.PUT_IN_POT, ItemType.CUT_TOMATO)
                 ))
             }

diff --git a/...Refill/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...Refill/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...geRefill/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...geRefill/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/...wToRun/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...wToRun/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...HowToRun/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...HowToRun/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/...uction/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...uction/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...oduction/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...oduction/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/...Models/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...Models/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...enModels/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...enModels/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/...Theory/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...Theory/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...ceTheory/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...ceTheory/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/...zation/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...zation/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...lization/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...lization/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/...toSoup/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt b/...toSoup/src/main/kotlin/org/jetbrains/kotlin/course/culinary/implementation/KitchenImpl.kt
@@ -33,7 +33,6 @@ data object KitchenImpl : Kitchen {
     override fun <T : Ingredient> take(item: T): T {
         require(item in filling) { "You cannot remove an item from the kitchen if this item does not exist!" }
         filling.remove(item)
-        actions += buildAction(ActionType.REMOVE_FROM_COUNTER, item)
         return item
     }
 

diff --git a/...matoSoup/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt b/...matoSoup/src/main/kotlin/org/jetbrains/kotlin/course/culinary/models/action/ActionType.kt
@@ -8,6 +8,5 @@ enum class ActionType {
     MIX_SALAD, // null
     BLEND, // null
     ADD_TO_BLENDER, // fruits
-    REMOVE_FROM_COUNTER, // baskets, fruits, vegetables
     CUT_ON_COUNTER, // Cut a fruit or a vegetable
 }
diff --git a/culinaryServer/culinaryServerTomatoSoup/test/Tests.kt b/culinaryServer/culinaryServerTomatoSoup/test/Tests.kt
@@ -56,7 +56,6 @@ class Test {
             }
             repeat(NUMBER_OF_TOMATOES) {
                 addAll(listOf(
-                    Action(ActionType.REMOVE_FROM_COUNTER, ItemType.CUT_TOMATO),
                     Action(ActionType.PUT_IN_POT, ItemType.CUT_TOMATO)
                 ))
             }