fix: TT-384 add enviroment var into MSConfig

Author: Jobzi

commons/data_access_layer/file_stream.py

@@ -1,12 +1,15 @@
-import os
 import tempfile 
 
-from azure.storage.blob import BlockBlobService, ContainerPermissions
-from datetime import datetime, timedelta
+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.
@@ -15,16 +18,16 @@ 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):
         try:
             local_file = tempfile.NamedTemporaryFile()
+            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=200
+                max_connections=300
             )
 
             local_file.seek(0)

time_tracker_api/activities/activities_model.py

@@ -127,7 +127,7 @@ def find_all_from_blob_storage(
 
         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 [{"result": "error", "message": "file not found"}]
+        return list(map(function_mapper, json.load(result))) if result is not None else []
 
 class ActivityCosmosDBDao(APICosmosDBDao, ActivityDao):
     def __init__(self, repository):

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,