Forráskód Böngészése

Minor refactoring

Vsevolod Levitan 1 éve
szülő
commit
d335abba76

+ 1 - 0
src/errors/argument_exception.py

@@ -1,5 +1,6 @@
 from src.errors.base_exception import base_exception
 
+
 class argument_exception(base_exception):
     def __init__(self, *args):
         super().__init__(args)

+ 1 - 0
src/errors/file_exception.py

@@ -1,5 +1,6 @@
 from src.errors.base_exception import base_exception
 
+
 class file_exception(base_exception):
     def __init__(self, *args):
         super().__init__(args)

+ 1 - 0
src/errors/instance_exception.py

@@ -1,5 +1,6 @@
 from src.errors.base_exception import base_exception
 
+
 class instance_exception(base_exception):
     def __init__(self, *args):
         super().__init__(args)

+ 0 - 14
src/logic/start_factory.py

@@ -3,7 +3,6 @@ from src.models.ingredient_model import ingredient_model
 from src.models.nomenclature_group_model import nomenclature_group_model
 from src.models.measurement_unit_model import measurement_unit_model
 from src.models.nomenclature_model import nomenclature_model
-from src.errors.error_proxy import error_proxy
 from src.settings.settings import settings
 from src.storage.storage import storage
 from src.validation.validator import validator
@@ -117,16 +116,3 @@ class start_factory:
             self.__save(storage.recipe_key(), recipes)
 
         return result
-
-        
-        
-    
-    
-        
-        
-        
-        
-    
-    
-    
-    

+ 1 - 0
src/models/abstract_reference.py

@@ -3,6 +3,7 @@ from abc import ABC
 from src.errors.error_proxy import error_proxy
 from src.validation.validator import validator
 
+
 class abstract_reference(ABC):
     __id: uuid.UUID
     __name:str = ""

+ 1 - 0
src/models/company_model.py

@@ -2,6 +2,7 @@ from src.models.abstract_reference import abstract_reference
 from src.settings.settings import settings
 from src.validation.validator import validator
 
+
 class company_model (abstract_reference):
     # ИНН
     __tax_id = 0

+ 1 - 0
src/models/ingredient_model.py

@@ -3,6 +3,7 @@ from src.models.nomenclature_model import nomenclature_model
 from src.models.abstract_reference import abstract_reference
 from src.validation.validator import validator
 
+
 class ingredient_model (abstract_reference):
     # Номенклатура ингредиента
     __nomenclature = None

+ 1 - 0
src/models/measurement_unit_model.py

@@ -1,6 +1,7 @@
 from src.models.abstract_reference import abstract_reference
 from src.validation.validator import validator
 
+
 class measurement_unit_model (abstract_reference):
     # Базовая единица измерения
     __base_measurement_unit = None

+ 1 - 0
src/models/nomenclature_group_model.py

@@ -1,5 +1,6 @@
 from src.models.abstract_reference import abstract_reference
 
+
 class nomenclature_group_model (abstract_reference):
     def __init__(self, name):
         super().__init__(name)

+ 1 - 0
src/models/nomenclature_model.py

@@ -3,6 +3,7 @@ from src.models.measurement_unit_model import measurement_unit_model
 from src.models.nomenclature_group_model import nomenclature_group_model
 from src.validation.validator import validator
 
+
 class nomenclature_model(abstract_reference):
     # Полное наименование
     __full_name = ""

+ 1 - 0
src/models/recipe_model.py

@@ -2,6 +2,7 @@ from src.models.ingredient_model import ingredient_model
 from src.models.abstract_reference import abstract_reference
 from src.validation.validator import validator
 
+
 class recipe_model (abstract_reference):
     # Ингредиенты рецепта
     __ingredients = list()

+ 1 - 0
src/models/warehouse_model.py

@@ -1,5 +1,6 @@
 from src.models.abstract_reference import abstract_reference
 
+
 class warehouse_model (abstract_reference):
     def __init__(self, name):
         super().__init__(name)

+ 5 - 1
src/settings/settings.py

@@ -189,4 +189,8 @@ class settings:
             value (bool): Значение
         Raises:
             argument_exception: Некорректный тип аргумента
-        """
+        """
+
+        self.__vtor.check_type(value, bool)
+
+        self.__is_first_run = value

+ 1 - 0
src/settings/settings_manager.py

@@ -4,6 +4,7 @@ from src.errors.instance_exception import instance_exception
 from src.validation.validator import validator
 from src.errors.file_exception import file_exception
 
+
 class settings_manager (object):
     # Объект настроек
     __settings = settings()

+ 1 - 0
src/validation/validator.py

@@ -2,6 +2,7 @@ import re
 from numbers import Number
 from src.errors.argument_exception import argument_exception
 
+
 class validator:
     # Singleton
     def __new__(cls):

+ 0 - 1
tests/test_models.py

@@ -108,5 +108,4 @@ class test_models(unittest.TestCase):
     
         # Проверка
         assert some.name == fn
-    
     

+ 2 - 1
tests/test_validator.py

@@ -2,6 +2,7 @@ from src.validation.validator import validator
 from src.errors.argument_exception import argument_exception
 import unittest
 
+
 class test_validator(unittest.TestCase):
 
     def test_validator_lambda(self):
@@ -107,4 +108,4 @@ class test_validator(unittest.TestCase):
 
         # Проверка
         assert vtor.check_collection_types_all(col1, str)
-        self.assertRaises(argument_exception, lambda: vtor.check_collection_types_all(col2, str))
+        self.assertRaises(argument_exception, lambda: vtor.check_collection_types_all(col2, str))