diff --git a/app/db_sql.py b/app/db_sql.py index bcba42c..f759d67 100644 --- a/app/db_sql.py +++ b/app/db_sql.py @@ -300,7 +300,8 @@ def sql_select( as_list: bool|None = False, max_count: int = 100000 ): - #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + current_log_level = log.level + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if table_name and not (record_id or record_id_random or field_name or field_value or sql or data): @@ -482,10 +483,13 @@ def sql_select( #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(record_li) + log.setLevel(current_log_level) # Reset log level; should be decorator return record_li # Successful else: #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(record) + + log.setLevel(current_log_level) # Reset log level; should be decorator return record # Successful elif result.rowcount > 1: log.info(f'Found {result.rowcount} records. as_dict={as_dict}, as_list={as_list}') @@ -504,10 +508,14 @@ def sql_select( else: record_li = result.fetchall() log.debug(record_li) + + log.setLevel(current_log_level) # Reset log level; should be decorator return record_li # Successful else: log.info('No records found. Returning None.') log.debug(result) + + log.setLevel(current_log_level) # Reset log level; should be decorator return None # Successful # ### END ### Core Help CRUD ### sql_select() ### @@ -671,13 +679,15 @@ def sql_delete( # If not success and there is a table_name then check the database table passed # If found in database table then store in Redis and return the ID number def redis_lookup_id_random(record_id_random:int|str, table_name:str): - # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + current_log_level = log.level + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if isinstance(record_id_random, str) and len(record_id_random) >= 11 and len(record_id_random) <= 22: pass elif isinstance(record_id_random, int): return record_id_random else: log.info(f'Unexpected data type or string format: {str(type(record_id_random))} Expected type is a string 11 or 22 characters long.') + log.setLevel(current_log_level) # Reset log level; should be decorator return False if record_id_random and table_name: @@ -710,6 +720,7 @@ def redis_lookup_id_random(record_id_random:int|str, table_name:str): if record_id: log.info('The record ID was found using the record_id_random value.') log.info(f'TTL for: {key_name} : {str(record_id)} is {str(r.ttl(key_name))} seconds') + log.setLevel(current_log_level) # Reset log level; should be decorator return int(record_id) elif table_name: data = { 'id_random': record_id_random } @@ -727,6 +738,7 @@ def redis_lookup_id_random(record_id_random:int|str, table_name:str): log.info(f"""Record ID random found: {str(select_results['id'])}""") if record_id := select_results.get('id'): r.setex(key_name, datetime.timedelta(minutes=90), value=record_id) + log.setLevel(current_log_level) # Reset log level; should be decorator return int(record_id) else: # log.setLevel(logging.ERROR) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL diff --git a/app/routers/cont_edu_cert_person.py b/app/routers/cont_edu_cert_person.py index 68fdc8d..e20eafc 100644 --- a/app/routers/cont_edu_cert_person.py +++ b/app/routers/cont_edu_cert_person.py @@ -174,6 +174,7 @@ async def get_cont_edu_cert_person_obj_li( @router.get('/cont_edu/cert/person/search', response_model=Resp_Body_Base) async def search_cont_edu_cert_person_obj_li( account_id: str = Query(None, min_length=11, max_length=22), + cont_edu_cert_id_list: List[str] = Query(['']), external_id: str = Query('%', max_length=50), given_name: str = Query('%', max_length=25), family_name: str = Query('%', max_length=25), @@ -189,7 +190,21 @@ async def search_cont_edu_cert_person_obj_li( log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - cont_edu_cert_id_list = [1, 2] + log.debug(cont_edu_cert_id_list) + print('---- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ----') + print(cont_edu_cert_id_list) + print('---- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ----') + + if cont_edu_cert_id_list: + # Do something to change from id_random to id + cont_edu_cert_id_list_new = [] + for cont_edu_cert_id in cont_edu_cert_id_list: + cont_edu_cert_id = redis_lookup_id_random(record_id_random=cont_edu_cert_id, table_name='cont_edu_cert') + cont_edu_cert_id_list_new.append(cont_edu_cert_id) + cont_edu_cert_id_list = cont_edu_cert_id_list_new + log.debug(cont_edu_cert_id_list) + + # cont_edu_cert_id_list = [1, 2] # cont_edu_cert_id_list = [3, 4] # cont_edu_cert_id_list = ['3vqsbpWjd9s', 'bCv8WBzdRJQ']