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

Code clean up and made sql_select function return an actual empty list if requested as_list but no results.

Browse Source
This commit is contained in:
Scott Idem
2021-12-13 16:19:23 -05:00
parent 59e96d7d3c
commit 2ef53d7a51
5 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/db_sql.py
View File

@@ -660,10 +660,16 @@ def sql_select(
return record_li # Successful return record_li # Successful
else: else:
log.info('No records found. Returning None.') if as_list:
log.debug(result) 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() ### # ### END ### Core Help CRUD ### sql_select() ###

14
app/methods/cont_edu_cert_person_methods.py
View File

@@ -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() ### # ### 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( def get_cont_edu_cert_person_rec_list(
account_id: str = None, account_id: str = None,
person_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 to_datetime: Optional[datetime.datetime] = None, # based on created_on
limit: int = 1000, limit: int = 1000,
enabled: str = 'enabled', # enabled, disabled, all enabled: str = 'enabled', # enabled, disabled, all
) -> list|bool: ) -> None|list|bool:
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if cont_edu_cert_id: if cont_edu_cert_id:
@@ -133,11 +133,11 @@ def get_cont_edu_cert_person_rec_list(
{sql_limit}; {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 cont_edu_cert_person_rec_li = cont_edu_cert_person_rec_li_result
else: else: # None or False
cont_edu_cert_person_rec_li = [] cont_edu_cert_person_rec_li = cont_edu_cert_person_rec_li_result # []
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(cont_edu_cert_person_rec_li_result) log.debug(cont_edu_cert_person_rec_li_result)
return cont_edu_cert_person_rec_li return cont_edu_cert_person_rec_li

4
app/methods/order_methods.py
View File

@@ -278,7 +278,7 @@ def load_order_obj(
# ### BEGIN ### API Order Methods ### get_order_rec_list() ### # ### BEGIN ### API Order Methods ### get_order_rec_list() ###
# Updated 2021-12-01 # Updated 2021-12-13
def get_order_rec_list( def get_order_rec_list(
for_obj_type: str, for_obj_type: str,
for_obj_id: str, for_obj_id: str,
@@ -365,7 +365,7 @@ def get_order_rec_list(
""" """
log.debug(sql) 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 order_rec_li = order_rec_li_result
else: # None or False else: # None or False
order_rec_li = order_rec_li_result order_rec_li = order_rec_li_result

5
app/routers/cont_edu_cert_person.py
View File

@@ -373,7 +373,7 @@ async def get_person_obj_cont_edu_cert_person_list(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, 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()) log.debug(locals())
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass 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: else:
cont_edu_cert_person_result_list.append(None) cont_edu_cert_person_result_list.append(None)
response_data = cont_edu_cert_person_result_list 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: else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=False, status_code=400, response=response) # Bad Request

8
app/routers/event.py
View File

@@ -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 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)
response_data = None
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# Updated 2021-12-13 # Updated 2021-12-13
if event_rec_list_result := get_event_rec_list( if event_rec_list_result := get_event_rec_list(
account_id = account_id, 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 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)
response_data = None
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# Updated 2021-12-13 # Updated 2021-12-13
if event_meeting_rec_list_result := get_event_meeting_rec_list( if event_meeting_rec_list_result := get_event_meeting_rec_list(
account_id = account_id, account_id = account_id,
@@ -453,7 +447,7 @@ async def get_account_obj_event_meeting_list_flat(
log.debug(event_obj) log.debug(event_obj)
except ValidationError as e: except ValidationError as e:
log.error(e.json()) log.error(e.json())
return False continue
event_result_list.append(event_obj) event_result_list.append(event_obj)
response_data = event_result_list response_data = event_result_list
else: else: