feat: TT-384-re add activity name to time entries

Author: Jobzi

commons/data_access_layer/file_stream.py

@@ -1,5 +1,8 @@
 import os
-from azure.storage.blob.blockblobservice import BlockBlobService
+import tempfile 
+
+from azure.storage.blob import BlockBlobService, ContainerPermissions
+from datetime import datetime, timedelta
 
 ACCOUNT_KEY = os.environ.get('AZURE_STORAGE_ACCOUNT_KEY')
 
@@ -15,10 +18,14 @@ def __init__(self, account_name:str, container_name:str):
         self.blob_service = BlockBlobService(account_name=self.account_name, account_key=ACCOUNT_KEY)
 
     def get_file_stream(self, filename:str):
-        import tempfile 
         try:
             local_file = tempfile.NamedTemporaryFile()
-            self.blob_service.get_blob_to_stream(self.container_name, filename, stream=local_file)
+            self.blob_service.get_blob_to_stream(
+                container_name=self.container_name,
+                blob_name= filename,
+                stream=local_file,
+                max_connections=200
+            )
 
             local_file.seek(0)
             return local_file

tests/time_tracker_api/activities/activities_model_test.py

@@ -87,4 +87,4 @@ def test__find_all_from_blob_storage__return_empty_list__when_send_event_context
       event_context=event_context,
       file_name="incorrect.json"
     )
-    assert result == []
+    assert result == [{"result": "error", "message": "file not found"}]

time_tracker_api/activities/activities_model.py

@@ -123,11 +123,11 @@ def find_all_from_blob_storage(
         tenant_id_value = self.find_partition_key_value(event_context)
         function_mapper = self.get_mapper_or_dict(mapper)
         if tenant_id_value is None:
-            return []
+            return [{"result": "error", "message": "tenant_id is None"}]
 
         fs = FileStream("storageaccounteystr82c5","tt-common-files")
         result = fs.get_file_stream(file_name)
-        return list(map(function_mapper, json.load(result))) if result is not None else []
+        return list(map(function_mapper, json.load(result))) if result is not None else [{"result": "error", "message": "file not found"}]
 
 class ActivityCosmosDBDao(APICosmosDBDao, ActivityDao):
     def __init__(self, repository):
@@ -143,7 +143,7 @@ def get_all_with_id_in_list(
             activity_ids,
         )
 
-    def get_all(
+    def get_all_v1(
         self,
         conditions: dict = None,
         activities_id: List = None,
@@ -162,7 +162,7 @@ def get_all(
         )
         return activities
 
-    def get_all_test(self, conditions: dict = None) -> list:
+    def get_all(self, conditions: dict = None) -> list:
         event_ctx = self.create_event_context("read-many")
         activities = self.repository.find_all_from_blob_storage(event_context=event_ctx)
         return activities

time_tracker_api/time_entries/time_entries_dao.py

@@ -153,9 +153,7 @@ def get_lastest_entries_by_project(
         projects_ids = [project.id for project in projects]
 
         activity_dao = activities_model.create_dao()
-        activities = activity_dao.get_all(
-            visible_only=False,
-        )
+        activities = activity_dao.get_all()
 
         result = []
         for id_project in projects_ids:

time_tracker_api/time_entries/time_entries_repository.py

@@ -110,11 +110,7 @@ def add_complementary_info(
             add_project_info_to_time_entries(time_entries, projects)
 
             activity_dao = activities_model.create_dao()
-            activities = activity_dao.get_all(
-                activities_id=activity_ids,
-                visible_only=False,
-                max_count=max_count,
-            )
+            activities = activity_dao.get_all()
 
             add_activity_name_to_time_entries(time_entries, activities)
 

utils/extend_model.py

@@ -96,7 +96,7 @@ def add_project_info_to_time_entries(time_entries, projects):
                 setattr(time_entry, 'customer_name', project.customer_name)
 
 
-def add_activity_name_to_time_entries(time_entries, activities):
+def add_activity_name_to_time_entries_v1(time_entries, activities):
     for time_entry in time_entries:
         for activity in activities:
             if time_entry.activity_id == activity.id:
@@ -107,6 +107,19 @@ def add_activity_name_to_time_entries(time_entries, activities):
                 )
                 setattr(time_entry, 'activity_name', name)
 
+def add_activity_name_to_time_entries(time_entries, activities):
+    for time_entry in time_entries:
+        result = [x for x in activities if time_entry.activity_id == x.id]
+        if result:
+            name = (
+                    result[0].name + " (archived)"
+                    if result[0].is_deleted()
+                    else result[0].name
+                )
+            setattr(time_entry, 'activity_name', name)
+        else:
+            setattr(time_entry, 'activity_name', "Unknown")
+
 
 def add_user_email_to_time_entries(time_entries, users):
     for time_entry in time_entries: