Skip to content

Commit da9c1b3

Browse files
authored
feat: implemented the reading of the blob storage to the endpoint activity
1 parent be714fd commit da9c1b3

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

time_tracker_api/activities/activities_model.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,16 @@ def find_all(
113113
function_mapper = self.get_mapper_or_dict(mapper)
114114
return list(map(function_mapper, result))
115115

116-
def find_all_from_blob_storage(self,conditions: dict = None, mapper: Callable = None):
116+
def find_all_from_blob_storage(self, event_context: EventContext, mapper: Callable = None):
117+
tenant_id_value = self.find_partition_key_value(event_context)
118+
function_mapper = self.get_mapper_or_dict(mapper)
119+
if tenant_id_value is None:
120+
return []
121+
117122
import json
118-
fs = FileStream("storagefiles2","ioetfiles")
123+
fs = FileStream("storageaccounteystr82c5","tt-common-files")
119124
result = fs.get_file_stream("activity.json")
120-
121-
function_mapper = self.get_mapper_or_dict(mapper)
122-
return list(map(function_mapper, json.load(result)))
125+
return list(map(function_mapper, json.load(result))) if result is not None else []
123126

124127
class ActivityCosmosDBDao(APICosmosDBDao, ActivityDao):
125128
def __init__(self, repository):
@@ -154,9 +157,10 @@ def get_all_old(
154157
)
155158
return activities
156159

157-
def get_all(self,conditions: dict = None) -> list:
158-
activities = self.repository.find_all_from_blob_storage()
159-
return activities
160+
def get_all(self, conditions: dict = None) -> list:
161+
event_ctx = self.create_event_context("read-many")
162+
activities = self.repository.find_all_from_blob_storage(event_context=event_ctx)
163+
return activities
160164

161165
def create(self, activity_payload: dict):
162166
event_ctx = self.create_event_context('create')

time_tracker_api/activities/activities_namespace.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class Activities(Resource):
7575
def get(self):
7676
"""List all activities"""
7777
conditions = list_activities_attribs_parser.parse_args()
78-
return activity_dao.get_all(conditions=conditions)
78+
return activity_dao.get_all(conditions)
7979

8080
@ns.doc('create_activity')
8181
@ns.response(HTTPStatus.CONFLICT, 'This activity already exists')

0 commit comments

Comments
 (0)