From 2ef53d7a51cb3893e342f8c79e6204f5bf8e6914 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 13 Dec 2021 16:19:23 -0500 Subject: [PATCH] Code clean up and made sql_select function return an actual empty list if requested as_list but no results. --- app/db_sql.py | 12 +++++++++--- app/methods/cont_edu_cert_person_methods.py | 14 +++++++------- app/methods/order_methods.py | 4 ++-- app/routers/cont_edu_cert_person.py | 5 ++++- app/routers/event.py | 8 +------- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/db_sql.py b/app/db_sql.py index 29f6303..1ba3b02 100644 --- a/app/db_sql.py +++ b/app/db_sql.py @@ -660,10 +660,16 @@ def sql_select( return record_li # Successful else: - log.info('No records found. Returning None.') - log.debug(result) + if as_list: + log.info('No records found. Returning as empty list.') + log.debug(result) - return None # Successful + return None # Successful + else: + log.info('No records found. Returning None.') + log.debug(result) + + return None # Successful # ### END ### Core Help CRUD ### sql_select() ### diff --git a/app/methods/cont_edu_cert_person_methods.py b/app/methods/cont_edu_cert_person_methods.py index 6f5420b..905aa5c 100644 --- a/app/methods/cont_edu_cert_person_methods.py +++ b/app/methods/cont_edu_cert_person_methods.py @@ -61,7 +61,7 @@ def load_cont_edu_cert_person_obj( # ### BEGIN ### API Cont Edu Cert Person Methods ### get_cont_edu_cert_person_rec_list() ### -# Updated 2021-10-01 +# Updated 2021-12-13 def get_cont_edu_cert_person_rec_list( account_id: str = None, person_id: str = None, @@ -72,8 +72,8 @@ def get_cont_edu_cert_person_rec_list( to_datetime: Optional[datetime.datetime] = None, # based on created_on limit: int = 1000, enabled: str = 'enabled', # enabled, disabled, all - ) -> list|bool: - # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + ) -> None|list|bool: + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if cont_edu_cert_id: @@ -133,11 +133,11 @@ def get_cont_edu_cert_person_rec_list( {sql_limit}; """ - if cont_edu_cert_person_rec_li_result := sql_select(data=data, sql=sql, as_list=True): + if cont_edu_cert_person_rec_li_result := sql_select(data=data, sql=sql): cont_edu_cert_person_rec_li = cont_edu_cert_person_rec_li_result - else: - cont_edu_cert_person_rec_li = [] - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + else: # None or False + cont_edu_cert_person_rec_li = cont_edu_cert_person_rec_li_result # [] + log.debug(cont_edu_cert_person_rec_li_result) return cont_edu_cert_person_rec_li diff --git a/app/methods/order_methods.py b/app/methods/order_methods.py index c2557e6..be225a9 100644 --- a/app/methods/order_methods.py +++ b/app/methods/order_methods.py @@ -278,7 +278,7 @@ def load_order_obj( # ### BEGIN ### API Order Methods ### get_order_rec_list() ### -# Updated 2021-12-01 +# Updated 2021-12-13 def get_order_rec_list( for_obj_type: str, for_obj_id: str, @@ -365,7 +365,7 @@ def get_order_rec_list( """ log.debug(sql) - if order_rec_li_result := sql_select(data=data, sql=sql, as_list=True): + if order_rec_li_result := sql_select(data=data, sql=sql): order_rec_li = order_rec_li_result else: # None or False order_rec_li = order_rec_li_result diff --git a/app/routers/cont_edu_cert_person.py b/app/routers/cont_edu_cert_person.py index 81a29a2..da66058 100644 --- a/app/routers/cont_edu_cert_person.py +++ b/app/routers/cont_edu_cert_person.py @@ -373,7 +373,7 @@ async def get_person_obj_cont_edu_cert_person_list( exclude_unset: Optional[bool] = True, response: Response = Response, ): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass @@ -399,6 +399,9 @@ async def get_person_obj_cont_edu_cert_person_list( else: cont_edu_cert_person_result_list.append(None) response_data = cont_edu_cert_person_result_list + elif cont_edu_cert_person_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=400, response=response) # Bad Request diff --git a/app/routers/event.py b/app/routers/event.py index 18ce146..1e9f72b 100644 --- a/app/routers/event.py +++ b/app/routers/event.py @@ -355,9 +355,6 @@ async def get_account_obj_event_list( 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) - response_data = None - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - # Updated 2021-12-13 if event_rec_list_result := get_event_rec_list( account_id = account_id, @@ -435,9 +432,6 @@ async def get_account_obj_event_meeting_list_flat( 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) - response_data = None - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - # Updated 2021-12-13 if event_meeting_rec_list_result := get_event_meeting_rec_list( account_id = account_id, @@ -453,7 +447,7 @@ async def get_account_obj_event_meeting_list_flat( log.debug(event_obj) except ValidationError as e: log.error(e.json()) - return False + continue event_result_list.append(event_obj) response_data = event_result_list else: