Code clean up. Working on returning proper 404 vs 400 responses if the results are empty and nothing went wrong.
This commit is contained in:
@@ -404,7 +404,7 @@ 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:
|
||||
elif isinstance(event_rec_list_result, list) or event_rec_list_result is None: # Empty list or None
|
||||
log.info('No results')
|
||||
return mk_resp(data=None, status_code=404, response=response) # Not Found
|
||||
else:
|
||||
@@ -412,6 +412,7 @@ async def get_account_obj_event_list(
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
|
||||
log.debug(response_data)
|
||||
|
||||
return mk_resp(data=response_data, response=response)
|
||||
# ### END ### API Event ### get_account_obj_event_list() ###
|
||||
|
||||
@@ -454,7 +455,7 @@ 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:
|
||||
elif isinstance(event_meeting_rec_list_result, list) or event_meeting_rec_list_result is None: # Empty list or None
|
||||
log.info('No results')
|
||||
return mk_resp(data=None, status_code=404, response=response) # Not Found
|
||||
else:
|
||||
@@ -462,6 +463,7 @@ async def get_account_obj_event_meeting_list_flat(
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
|
||||
log.debug(response_data)
|
||||
|
||||
return mk_resp(data=response_data, response=response)
|
||||
# ### END ### API Event ### get_account_obj_event_list() ###
|
||||
|
||||
@@ -532,6 +534,8 @@ async def get_person_event_obj_li(
|
||||
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)
|
||||
# ### END ### API Event Methods ### get_person_event_obj_li() ###
|
||||
|
||||
|
||||
Reference in New Issue
Block a user