From 92a44b9f415cafb112739fa349b52bf4ba3c49eb Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 13 Dec 2021 17:07:45 -0500 Subject: [PATCH] Code clean up. Working on returning proper 404 vs 400 responses if the results are empty and nothing went wrong. --- app/methods/user_methods.py | 9 +++++---- app/routers/user.py | 10 +++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/methods/user_methods.py b/app/methods/user_methods.py index 31048c1..f1419d8 100644 --- a/app/methods/user_methods.py +++ b/app/methods/user_methods.py @@ -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 {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 - else: - user_rec_li = [] - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + else: # None or False + user_rec_li = user_rec_li_result # [] + log.debug(user_rec_li_result) return user_rec_li diff --git a/app/routers/user.py b/app/routers/user.py index 9a3e997..eb45bff 100644 --- a/app/routers/user.py +++ b/app/routers/user.py @@ -471,7 +471,8 @@ async def 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) async def get_account_user_obj_li( 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 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( account_id = account_id, hidden = hidden, # hidden, not_hidden, all @@ -519,12 +520,15 @@ async def get_account_user_obj_li( else: user_result_list.append(None) 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 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) +# ### END ### API User ### get_account_user_obj_li() ### @router.get('/user/list', response_model=Resp_Body_Base)