Merge pull request #197 from ioet/196-include-customer-info-on-entries

closes: #196 include customer information for time-entries

Author: enriquezrene

time_tracker_api/time_entries/time_entries_model.py

@@ -19,7 +19,7 @@
 from time_tracker_api.activities import activities_model
 
 from utils.extend_model import (
-    add_project_name_to_time_entries,
+    add_project_info_to_time_entries,
     add_activity_name_to_time_entries,
     create_in_condition,
     create_custom_query_from_str,
@@ -223,7 +223,8 @@ def find_all(
             projects = project_dao.get_all(
                 custom_sql_conditions=[custom_conditions], visible_only=False
             )
-            add_project_name_to_time_entries(time_entries, projects)
+
+            add_project_info_to_time_entries(time_entries, projects)
 
             activity_dao = activities_model.create_dao()
             activities = activity_dao.get_all(

time_tracker_api/time_entries/time_entries_namespace.py

@@ -138,6 +138,20 @@
         description='Email of the user that owns the time-entry',
         example=faker.email(),
     ),
+    'customer_id': fields.String(
+        required=False,
+        title='Customer ID',
+        max_length=50,
+        description='Unique ID for the customer the entry belongs to',
+        example=faker.uuid4(),
+    ),
+    'customer_name': fields.String(
+        required=False,
+        title='Customer Name',
+        max_length=50,
+        description='Name of the customer the entry belongs to',
+        example=faker.company(),
+    ),
 }
 time_entry_response_fields.update(common_fields)
 

utils/extend_model.py

@@ -16,9 +16,9 @@ def add_customer_name_to_projects(projects, customers):
                 setattr(project, 'customer_name', customer.name)
 
 
-def add_project_name_to_time_entries(time_entries, projects):
+def add_project_info_to_time_entries(time_entries, projects):
     """
-    Add attribute project_name in time-entry model, based on project_id of the
+    Add project info in time-entry model, based on project_id of the
     time_entry
     :param (list) time_entries: time_entries retrieved from time-entry repository
     :param (list) projects: projects retrieved from project repository
@@ -30,6 +30,8 @@ def add_project_name_to_time_entries(time_entries, projects):
             if time_entry.project_id == project.id:
                 name = project.name + " (archived)" if project.is_deleted() else project.name
                 setattr(time_entry, 'project_name', name)
+                setattr(time_entry, 'customer_id', project.customer_id)
+                setattr(time_entry, 'customer_name', project.customer_name)
 
 
 def add_activity_name_to_time_entries(time_entries, activities):