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:07:45 -05:00
parent 133cfab42f
commit 92a44b9f41
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/methods/user_methods.py
View File

@@ -478,12 +478,13 @@ def get_user_rec_list(
ORDER BY user.name, user.email, user.username, `user`.created_on DESC, `user`.updated_on DESC ORDER BY user.name, user.email, user.username, `user`.created_on DESC, `user`.updated_on DESC
{sql_limit}; {sql_limit};
""" """
log.debug(sql)
if user_rec_li_result := sql_select(data=data, sql=sql, as_list=True): if user_rec_li_result := sql_select(data=data, sql=sql):
user_rec_li = user_rec_li_result user_rec_li = user_rec_li_result
else: else: # None or False
user_rec_li = [] user_rec_li = user_rec_li_result # []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(user_rec_li_result) log.debug(user_rec_li_result)
return user_rec_li return user_rec_li

10
app/routers/user.py
View File

@@ -471,7 +471,8 @@ async def user_verify_password(
# ### END ### API User ### user_verify_password() ### # ### END ### API User ### user_verify_password() ###
# ### BEGIN ### API User ### get_account_user_obj_li() ###
# Updated 2021-12-13
@router.get('/account/{account_id}/user/list', response_model=Resp_Body_Base) @router.get('/account/{account_id}/user/list', response_model=Resp_Body_Base)
async def get_account_user_obj_li( async def get_account_user_obj_li(
account_id: str = Query(..., min_length=11, max_length=22), account_id: str = Query(..., min_length=11, max_length=22),
@@ -493,7 +494,7 @@ async def get_account_user_obj_li(
if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
else: return mk_resp(data=None, status_code=404, response=response) else: return mk_resp(data=None, status_code=404, response=response)
# Updated 2021-11-18 # Updated 2021-12-13
if user_rec_list_result := get_user_rec_list( if user_rec_list_result := get_user_rec_list(
account_id = account_id, account_id = account_id,
hidden = hidden, # hidden, not_hidden, all hidden = hidden, # hidden, not_hidden, all
@@ -519,12 +520,15 @@ async def get_account_user_obj_li(
else: else:
user_result_list.append(None) user_result_list.append(None)
response_data = user_result_list response_data = user_result_list
elif isinstance(user_rec_list_result, list): elif user_rec_list_result is None:
log.info('No results')
return mk_resp(data=False, status_code=404, response=response) # Not Found return mk_resp(data=False, status_code=404, response=response) # Not Found
else: else:
log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data, response=response) return mk_resp(data=response_data, response=response)
# ### END ### API User ### get_account_user_obj_li() ###
@router.get('/user/list', response_model=Resp_Body_Base) @router.get('/user/list', response_model=Resp_Body_Base)