Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code clean up. Working on returning proper 404 vs 400 responses if the results are empty and nothing went wrong.

Browse Source
This commit is contained in:
Scott Idem
2021-12-13 17:02:21 -05:00
parent 2ef53d7a51
commit 133cfab42f
10 changed files with 131 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/routers/event.py
View File

@@ -205,7 +205,7 @@ async def get_event_obj_li(
# ### BEGIN ### API Event ### get_event_obj() ###
# Working well as of 2021-06-30. Using as a template for other routes.
# Updated 2021-12-13
@router.get('/event/{event_id}', response_model=Resp_Body_Base)
async def get_event_obj(
event_id: str = Query(..., min_length=11, max_length=22),
@@ -253,8 +253,7 @@ async def get_event_obj(
log.debug(locals())
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else:
return mk_resp(data=None, status_code=404, response=response)
else: return mk_resp(data=None, status_code=404, response=response)
if event_obj := load_event_obj(
event_id = event_id,
@@ -299,6 +298,7 @@ async def get_event_obj(
# event_dict = event_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
pass
else:
log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=event_obj, response=response)
@@ -404,7 +404,11 @@ async def get_account_obj_event_list(
else:
event_result_list.append(None)
response_data = event_result_list
elif event_rec_list_result is None:
log.info('No results')
return mk_resp(data=None, status_code=404, response=response) # Not Found
else:
log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=response) # Bad Request
log.debug(response_data)
@@ -450,8 +454,12 @@ async def get_account_obj_event_meeting_list_flat(
continue
event_result_list.append(event_obj)
response_data = event_result_list
elif event_meeting_rec_list_result is None:
log.info('No results')
return mk_resp(data=None, status_code=404, response=response) # Not Found
else:
return mk_resp(data=False, status_code=404, response=response) # Not Found
log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=response) # Bad Request
log.debug(response_data)
return mk_resp(data=response_data, response=response)
@@ -517,7 +525,11 @@ async def get_person_event_obj_li(
else:
event_result_list.append(None)
response_data = event_result_list
elif event_rec_list_result is None:
log.info('No results')
return mk_resp(data=None, status_code=404, response=response) # Not Found
else:
log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data, response=response)