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

Author: Jobzi

commons/data_access_layer/file_stream.py

@@ -1,9 +1,15 @@
-import os
-from azure.storage.blob.blockblobservice import BlockBlobService
+import tempfile 
+
+from azure.storage.blob import BlockBlobService
+from utils.azure_users import AzureConnection
 
-ACCOUNT_KEY = os.environ.get('AZURE_STORAGE_ACCOUNT_KEY')
 
 class FileStream:
+    ACCOUNT_KEY = AzureConnection().get_blob_storage_key()
+    account_name:str
+    container_name:str
+    blob_service:BlockBlobService
+    
     def __init__(self, account_name:str, container_name:str):
         """
         Initialize the FileStream object. which is used to get the file stream from Azure Blob Storage.
@@ -12,13 +18,17 @@ def __init__(self, account_name:str, container_name:str):
         """
         self.account_name = account_name
         self.container_name = container_name
-        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 = BlockBlobService(account_name=self.account_name, account_key=self.ACCOUNT_KEY)
+            self.blob_service.get_blob_to_stream(
+                container_name=self.container_name,
+                blob_name= filename,
+                stream=local_file,
+                max_connections=300
+            )
 
             local_file.seek(0)
             return local_file

time_tracker_api/activities/activities_model.py

@@ -123,7 +123,7 @@ 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)
@@ -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,**kwargs) -> list:
         event_ctx = self.create_event_context("read-many")
         activities = self.repository.find_all_from_blob_storage(event_context=event_ctx)
         return activities

utils/azure_users.py

@@ -13,7 +13,8 @@ class MSConfig:
         'MS_SECRET',
         'MS_SCOPE',
         'MS_ENDPOINT',
-        'USERID'
+        'USERID',
+        'AZURE_STORAGE_ACCOUNT_KEY'
     ]
 
     check_variables_are_defined(ms_variables)
@@ -24,6 +25,7 @@ class MSConfig:
     SCOPE = os.environ.get('MS_SCOPE')
     ENDPOINT = os.environ.get('MS_ENDPOINT')
     USERID = os.environ.get('USERID')
+    AZURE_STORAGE_ACCOUNT_KEY = os.environ.get('AZURE_STORAGE_ACCOUNT_KEY')
 
 
 class BearerAuth(requests.auth.AuthBase):
@@ -68,6 +70,9 @@ def __init__(self, config=MSConfig):
         self.access_token = self.get_token()
         self.groups_and_users = None
 
+    def get_blob_storage_key(self) -> str:
+        return self.config.AZURE_STORAGE_ACCOUNT_KEY
+
     def get_msal_client(self):
         client = msal.ConfidentialClientApplication(
             self.config.CLIENT_ID,

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', "activity")
+
 
 def add_user_email_to_time_entries(time_entries, users):
     for time_entry in time_entries: