Merge branch 'master' into fix/return-all-time-metries-range-time#122

Author: fabidick22

commons/data_access_layer/cosmos_db.py

@@ -156,7 +156,7 @@ def create_custom_sql_conditions(custom_sql_conditions: List[str]) -> str:
             return ''
 
     @staticmethod
-    def generate_params(conditions: dict) -> dict:
+    def generate_params(conditions: dict) -> list:
         result = []
         for k, v in conditions.items():
             result.append({"name": "@%s" % k, "value": v})
@@ -345,9 +345,10 @@ class CosmosDBDao(CRUDDao):
     def __init__(self, repository: CosmosDBRepository):
         self.repository = repository
 
-    def get_all(self, conditions: dict = {}) -> list:
+    def get_all(self, conditions: dict = None, **kwargs) -> list:
+        conditions = conditions if conditions else {}
         event_ctx = self.create_event_context("read-many")
-        return self.repository.find_all(event_ctx, conditions=conditions)
+        return self.repository.find_all(event_ctx, conditions=conditions, **kwargs)
 
     def get(self, id):
         event_ctx = self.create_event_context("read")

time_tracker_api/database.py

@@ -16,7 +16,7 @@
 
 class CRUDDao(abc.ABC):
     @abc.abstractmethod
-    def get_all(self, conditions: dict):
+    def get_all(self, conditions: dict = None, **kwargs):
         raise NotImplementedError  # pragma: no cover
 
     @abc.abstractmethod

time_tracker_api/projects/projects_model.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
-
 from azure.cosmos import PartitionKey
-
 from commons.data_access_layer.cosmos_db import CosmosDBModel, CosmosDBDao, CosmosDBRepository
 from time_tracker_api.database import CRUDDao, APICosmosDBDao
+from time_tracker_api.customers.customers_model import create_dao as customers_create_dao
+from time_tracker_api.customers.customers_model import CustomerCosmosDBModel
 
 
 class ProjectDao(CRUDDao):
@@ -35,19 +35,48 @@ class ProjectCosmosDBModel(CosmosDBModel):
     def __init__(self, data):
         super(ProjectCosmosDBModel, self).__init__(data)  # pragma: no cover 
 
+    def __contains__(self, item):
+        if type(item) is CustomerCosmosDBModel:
+            return True if item.id == self.customer_id else False
+        else:
+            raise NotImplementedError
+
     def __repr__(self):
         return '<Project %r>' % self.name  # pragma: no cover
 
     def __str___(self):
         return "the project \"%s\"" % self.name  # pragma: no cover
 
 
-def create_dao() -> ProjectDao:
-    repository = CosmosDBRepository.from_definition(container_definition,
-                                                    mapper=ProjectCosmosDBModel)
+class ProjectCosmosDBRepository(CosmosDBRepository):
+    def __init__(self):
+        CosmosDBRepository.__init__(self, container_id=container_definition['id'],
+                                    partition_key_attribute='tenant_id',
+                                    mapper=ProjectCosmosDBModel)
+
 
-    class ProjectCosmosDBDao(APICosmosDBDao, ProjectDao):
-        def __init__(self):
-            CosmosDBDao.__init__(self, repository)
+class ProjectCosmosDBDao(APICosmosDBDao, ProjectDao):
+    def __init__(self, repository):
+        CosmosDBDao.__init__(self, repository)
+
+    def get_all(self, conditions: dict = None, **kwargs) -> list:
+        """
+        Get all the projects an active client has
+        :param (dict) conditions: Conditions for querying the database
+        :param (dict) kwargs: Pass arguments
+        :return (list): ProjectCosmosDBModel object list
+        """
+        event_ctx = self.create_event_context("read-many")
+        customer_dao = customers_create_dao()
+        customers = customer_dao.get_all()
+
+        customers_id = [customer.id for customer in customers]
+        conditions = conditions if conditions else {}
+        custom_condition = "c.customer_id IN {}".format(str(tuple(customers_id)))
+        return self.repository.find_all(event_ctx, conditions,  custom_sql_conditions=[custom_condition], **kwargs)
+
+
+def create_dao() -> ProjectDao:
+    repository = ProjectCosmosDBRepository()
 
-    return ProjectCosmosDBDao()
+    return ProjectCosmosDBDao(repository)

time_tracker_api/time_entries/custom_modules/utils.py

@@ -0,0 +1,5 @@
+def add_project_name_to_time_entries(time_entries, projects):
+    for time_entry in time_entries:
+        for project in projects:
+            if time_entry.project_id == project.id:
+                setattr(time_entry, 'project_name', project.name)

time_tracker_api/time_entries/time_entries_model.py

@@ -18,6 +18,10 @@
 from commons.data_access_layer.database import EventContext
 
 from time_tracker_api.time_entries.custom_modules import worked_time
+from time_tracker_api.time_entries.custom_modules.utils import (
+    add_project_name_to_time_entries,
+)
+from time_tracker_api.projects import projects_model
 from time_tracker_api.database import CRUDDao, APICosmosDBDao
 from time_tracker_api.security import current_user_id
 
@@ -106,6 +110,24 @@ def create_sql_date_range_filter(date_range: dict) -> str:
         else:
             return ''
 
+    def find(
+        self,
+        id: str,
+        event_context: EventContext,
+        peeker: 'function' = None,
+        visible_only=True,
+        mapper: Callable = None,
+    ):
+        time_entry = CosmosDBRepository.find(
+            self, id, event_context, peeker, visible_only, mapper,
+        )
+
+        project_dao = projects_model.create_dao()
+        project = project_dao.get(time_entry.project_id)
+        setattr(time_entry, 'project_name', project.name)
+
+        return time_entry
+
     def find_all(
         self,
         event_context: EventContext,
@@ -119,14 +141,19 @@ def find_all(
 
         custom_params = self.generate_params(date_range)
 
-        return CosmosDBRepository.find_all(
+        time_entries = CosmosDBRepository.find_all(
             self,
             event_context=event_context,
             conditions=conditions,
             custom_sql_conditions=custom_sql_conditions,
             custom_params=custom_params,
         )
 
+        project_dao = projects_model.create_dao()
+        projects = project_dao.get_all()
+        add_project_name_to_time_entries(time_entries, projects)
+        return time_entries
+
     def on_create(self, new_item_data: dict, event_context: EventContext):
         CosmosDBRepository.on_create(self, new_item_data, event_context)
 

time_tracker_api/time_entries/time_entries_namespace.py

@@ -115,6 +115,13 @@
         description='User who owns the time entry',
         example=faker.uuid4(),
     ),
+    'project_name': fields.String(
+        required=True,
+        title='Project Name',
+        max_length=50,
+        description='Name of the project where time-entry was registered',
+        example=faker.word(['mobile app', 'web app']),
+    ),
 }
 time_entry_response_fields.update(common_fields)
 

time_tracker_api/version.py

@@ -1 +1 @@
-__version__ = '0.11.1'
+__version__ = '0.12.1'