Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: implemented the reading of the blob storage to the endpoint act…
…ivity
  • Loading branch information
Jobzi authored Nov 5, 2021
commit da9c1b342344c454d1f61aa71f445da9ca17530c
20 changes: 12 additions & 8 deletions time_tracker_api/activities/activities_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,16 @@ def find_all(
function_mapper = self.get_mapper_or_dict(mapper)
return list(map(function_mapper, result))

def find_all_from_blob_storage(self,conditions: dict = None, mapper: Callable = None):
def find_all_from_blob_storage(self, event_context: EventContext, mapper: Callable = None):
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 []

import json
fs = FileStream("storagefiles2","ioetfiles")
fs = FileStream("storageaccounteystr82c5","tt-common-files")
result = fs.get_file_stream("activity.json")

function_mapper = self.get_mapper_or_dict(mapper)
return list(map(function_mapper, json.load(result)))
return list(map(function_mapper, json.load(result))) if result is not None else []

class ActivityCosmosDBDao(APICosmosDBDao, ActivityDao):
def __init__(self, repository):
Expand Down Expand Up @@ -154,9 +157,10 @@ def get_all_old(
)
return activities

def get_all(self,conditions: dict = None) -> list:
activities = self.repository.find_all_from_blob_storage()
return activities
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

def create(self, activity_payload: dict):
event_ctx = self.create_event_context('create')
Expand Down
2 changes: 1 addition & 1 deletion time_tracker_api/activities/activities_namespace.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class Activities(Resource):
def get(self):
"""List all activities"""
conditions = list_activities_attribs_parser.parse_args()
return activity_dao.get_all(conditions=conditions)
return activity_dao.get_all(conditions)

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