Jelajahi Sumber

Replaced validator.check_collection_all() calls with validator.check_collection_types_all() for collection typechecks in recipe_model

Vsevolod Levitan 1 tahun lalu
induk
melakukan
e5df729fe0
1 mengubah file dengan 2 tambahan dan 4 penghapusan
  1. 2 4
      src/models/recipe_model.py

+ 2 - 4
src/models/recipe_model.py

@@ -55,8 +55,7 @@ class recipe_model (abstract_reference):
         """
         """
 
 
         self.__vtor.check_type(ingredients, list)
         self.__vtor.check_type(ingredients, list)
-        self.__vtor.check_collection_all(ingredients,
-                                               lambda item: self.__vtor.check_type(item, ingredient_model))
+        self.__vtor.check_collection_types_all(ingredients, ingredient_model)
         
         
         self.__ingredients = ingredients
         self.__ingredients = ingredients
 
 
@@ -81,7 +80,6 @@ class recipe_model (abstract_reference):
         self.__vtor.check_type(steps, list)
         self.__vtor.check_type(steps, list)
         self.__vtor.check_collection_all(steps,
         self.__vtor.check_collection_all(steps,
                                                lambda item: self.__vtor.check_type(item, str))
                                                lambda item: self.__vtor.check_type(item, str))
-        self.__vtor.check_collection_all(steps,
-                                               lambda item: self.__vtor.check_length_greater(item, 0))
+        self.__vtor.check_collection_types_all(steps, str)
         
         
         self.__steps = steps
         self.__steps = steps