fix: TT-43 Fixing decorators errors on tests

Author: jcalarcon98

tests/utils/extend_model_test.py

@@ -15,33 +15,37 @@ def test_add_custom_attribute(customers_create_dao, projects_create_dao):
         "technologies": "['python', 'restplus', 'openapi']",
         "status": "active",
         "customer_name": "Tucker Inc",
-        "customer": {
-            "name": None,
-            "description": None
-        },
-        "project_type": {
-            "name": None,
-            "description": None
-        },
+        "customer": {"name": None, "description": None},
+        "project_type": {"name": None, "description": None},
         "id": "768c924e-4501-457f-99c5-7198440d3c60",
         "tenant_id": "e2953984-03e7-4730-be29-1753d24df3b0",
-        "deleted": "null"
+        "deleted": "null",
     }
 
-    @add_custom_attribute('project_type', projects_create_dao())
-    @add_custom_attribute('customer', customers_create_dao())
+    @add_custom_attribute('project_type', projects_create_dao)
+    @add_custom_attribute('customer', customers_create_dao)
     @patch('time_tracker_api.projects.projects_model.ProjectCosmosDBModel')
     def fn(project):
-        project.return_value.name = "Franklin, Mcdonald and Morrison",
-        project.return_value.description = "Include speech feeling court almost country smile economy. True quality mention key. Similar provide yard.",
-        project.return_value.customer_id = "9afbfa3a-9de4-4b90-a1b7-a53d2c17a178",
-        project.return_value.project_type_id = "208aadb7-1ec1-4a67-a0b0-e0308d27045b",
-        project.return_value.technologies = "['python', 'restplus', 'openapi']",
-        project.return_value.status = "active",
-        project.return_value.customer_name = "Tucker Inc",
-        project.return_value.id = "768c924e-4501-457f-99c5-7198440d3c60",
-        project.return_value.tenant_id = "e2953984-03e7-4730-be29-1753d24df3b0",
-        project.return_value.deleted = None,
+        project.return_value.name = ("Franklin, Mcdonald and Morrison",)
+        project.return_value.description = (
+            "Include speech feeling court almost country smile economy. True quality mention key. Similar provide yard.",
+        )
+        project.return_value.customer_id = (
+            "9afbfa3a-9de4-4b90-a1b7-a53d2c17a178",
+        )
+        project.return_value.project_type_id = (
+            "208aadb7-1ec1-4a67-a0b0-e0308d27045b",
+        )
+        project.return_value.technologies = (
+            "['python', 'restplus', 'openapi']",
+        )
+        project.return_value.status = ("active",)
+        project.return_value.customer_name = ("Tucker Inc",)
+        project.return_value.id = ("768c924e-4501-457f-99c5-7198440d3c60",)
+        project.return_value.tenant_id = (
+            "e2953984-03e7-4730-be29-1753d24df3b0",
+        )
+        project.return_value.deleted = (None,)
 
         return project.return_value
 

time_tracker_api/projects/projects_model.py

@@ -19,7 +19,7 @@
 from utils.extend_model import (
     add_customer_name_to_projects,
     add_custom_attribute_in_list,
-    add_custom_attribute
+    add_custom_attribute,
 )
 
 
@@ -108,18 +108,20 @@ class ProjectCosmosDBDao(APICosmosDBDao, ProjectDao):
     def __init__(self, repository):
         CosmosDBDao.__init__(self, repository)
 
-    @add_custom_attribute('customer', customers_create_dao())
-    @add_custom_attribute('project_type', project_types_create_dao())
+    @add_custom_attribute('customer', customers_create_dao)
+    @add_custom_attribute('project_type', project_types_create_dao)
     def get(self, id) -> ProjectCosmosDBModel:
         """
         Get one project an active client
         :param (str) id: project's id
         """
         return super().get(id)
 
-    @add_custom_attribute_in_list('customer', customers_create_dao())
-    @add_custom_attribute_in_list('project_type', project_types_create_dao())
-    def get_all(self, conditions: dict = None, project_ids: List = None, **kwargs) -> list:
+    @add_custom_attribute_in_list('customer', customers_create_dao)
+    @add_custom_attribute_in_list('project_type', project_types_create_dao)
+    def get_all(
+        self, conditions: dict = None, project_ids: List = None, **kwargs
+    ) -> list:
         """
         Get all the projects an active client has
         :param (dict) conditions: Conditions for querying the database

utils/extend_model.py

@@ -8,21 +8,25 @@ def add_custom_attribute(attr, dao):
     :param (attr) attribute: name of the new attribute
     :param (dao) dao: related entity to the model
     """
+
     def decorator_for_single_item(func):
         @wraps(func)
         def wrapper(*args, **kwargs):
+            current_dao = dao()
             entity_model = func(*args, **kwargs)
             attribute_id = f"{attr}_id"
-            value_id = entity_model.__dict__[attribute_id]
 
             try:
-                related_entity = dao.get(value_id)
+                value_id = entity_model.__dict__[attribute_id]
+                related_entity = current_dao.get(value_id)
                 setattr(entity_model, attr, related_entity)
             except:
                 print(f"This item isn't related a {attribute_id}")
 
             return entity_model
+
         return wrapper
+
     return decorator_for_single_item
 
 
@@ -32,22 +36,27 @@ def add_custom_attribute_in_list(attr, dao):
     :param (attr) attribute: name of the new attribute
     :param (dao) dao: related entity to the model
     """
+
     def decorator_for_list_item(func):
         @wraps(func)
         def wrapper(*args, **kwargs):
+            current_dao = dao()
             entity_model_list = func(*args, **kwargs)
             attribute_id = f"{attr}_id"
 
-            related_entity_list = dao.get_all()
+            related_entity_list = current_dao.get_all()
             related_entities_ids_dict = {x.id: x for x in related_entity_list}
 
             for entity_model in entity_model_list:
                 value_id = entity_model.__dict__[attribute_id]
-                setattr(entity_model, attr,
-                        related_entities_ids_dict.get(value_id))
+                setattr(
+                    entity_model, attr, related_entities_ids_dict.get(value_id)
+                )
 
             return entity_model_list
+
         return wrapper
+
     return decorator_for_list_item