Merge pull request #134 from ioet/feature/include-project-name-in-time-entry-response#129

Feat(time-entries): include project name in time-entries response

Author: Angeluz-07

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

@@ -1,6 +1,7 @@
 import abc
 from dataclasses import dataclass, field
 from typing import List, Callable
+from flask import jsonify
 
 from azure.cosmos import PartitionKey
 from flask_restplus._http import HTTPStatus
@@ -18,6 +19,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 +111,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 +142,18 @@ 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,
         )
 
+        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)