From 789d7372d9b8ea6e438ac50a067fcd6a2f591c19 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 14 Apr 2022 14:41:25 -0400 Subject: [PATCH] General clean up. --- app/routers/event_file.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/routers/event_file.py b/app/routers/event_file.py index c06be82..6050921 100644 --- a/app/routers/event_file.py +++ b/app/routers/event_file.py @@ -223,25 +223,26 @@ async def delete_event_file_obj( hosted_file_id: str = Query(..., min_length=11, max_length=22), for_type: str = Query(..., min_length=1, max_length=25), for_id: str = Query(..., min_length=11, max_length=22), - delete_hosted_file: bool = False, - x_account_id: str = Header(...), - response: Response = Response, + + delete_hosted_file: bool = False, # Not currently used + + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if event_file_id := redis_lookup_id_random(record_id_random=event_file_id, table_name='event_file'): pass - else: return mk_resp(data=None, status_code=404, response=response) + else: return mk_resp(data=None, status_code=404, response=commons.response) if hosted_file_id := redis_lookup_id_random(record_id_random=hosted_file_id, table_name='hosted_file'): pass else: return mk_resp(data=None, status_code=404, response=response) if for_id := redis_lookup_id_random(record_id_random=for_id, table_name=for_type): pass - else: return mk_resp(data=None, status_code=404, response=response) + else: return mk_resp(data=None, status_code=404, response=commons.response) if event_file_delete_result := sql_delete(table_name='event_file', record_id=event_file_id): log.info(f'Deleted Event File ID: {event_file_id}') - else: return mk_resp(data=False, status_code=500, response=response) # Internal Server Error + else: return mk_resp(data=False, status_code=500, response=commons.response) # Internal Server Error sql = f""" DELETE FROM hosted_file_link @@ -257,7 +258,7 @@ async def delete_event_file_obj( if event_file_delete_result := sql_delete(sql=sql, data=hosted_file_link_data): log.info(f'Deleted Hosted File Link. Hosted File ID: {hosted_file_id}, Link To Type: {for_type}, Link To ID: {for_id}') - else: return mk_resp(data=False, status_code=500, response=response) # Internal Server Error + else: return mk_resp(data=False, status_code=500, response=commons.response) # Internal Server Error - return mk_resp(data=True, response=response) + return mk_resp(data=True, response=commons.response) # ### END ### API Event File ### delete_event_file_obj() ###