General code clean up.

app/db_sql.py

@@ -4,7 +4,7 @@ from timeit import default_timer as timer
 
 from app.config import settings
 from app.log import log, logging
-#from .lib_general import lookup_id_random_pop
+# from .lib_general import lookup_id_random_pop
 
 from sqlalchemy import create_engine, text, Time
 from sqlalchemy.exc import IntegrityError, OperationalError
@@ -671,7 +671,7 @@ def sql_delete(
 
 
 
-# ### BEGIN ### API Lib General ### redis_lookup_id_random() ###
+# ### BEGIN ### API DB SQL ### redis_lookup_id_random() ###
 # Just return the value if it is an integer
 # Check if the id_random value is a string and the correct length
 # Attempt to look up id_random key in Redis
@@ -757,11 +757,13 @@ def redis_lookup_id_random(record_id_random:int|str, table_name:str):
     # log.setLevel(logging.ERROR) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.error('We should not be here. Something unexpected happened.')
     return False # Just in case
-# ### END ### API Lib General ### redis_lookup_id_random() ###
+# ### END ### API DB SQL ### redis_lookup_id_random() ###
 
 
-# ### BEGIN ### API Lib General ### lookup_id_random() ###
-def lookup_id_random(record_id:int, table_name:str):
+# ### BEGIN ### API DB SQL ### get_id_random() ###
+# Changed name from lookup_id_random() to get_id_random()
+# Updated 2021-08-23
+def get_id_random(record_id:int, table_name:str):
     log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
@@ -793,10 +795,10 @@ def lookup_id_random(record_id:int, table_name:str):
         #log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.info('Record ID random was not found')
         return None
-# ### END ### API Lib General ### lookup_id_random() ###
+# ### END ### API DB SQL ### get_id_random() ###
 
 
-# ### BEGIN ### API Lib General ### lookup_id_random_pop() ###
+# ### BEGIN ### API DB SQL ### lookup_id_random_pop() ###
 # Look up and resolve id_random values to their id
 # Remove the unneeded *_id_random key from the dict
 # This really needs to be simplified... Use a list of dicts instead. Can store as JSON in the DB.
@@ -1023,4 +1025,4 @@ def lookup_id_random_pop(obj_data:dict):
         obj_data.pop('from_object_id_random')
 
     return obj_data
-# ### END ### API Lib General ### lookup_id_random_pop() ###
+# ### END ### API DB SQL ### lookup_id_random_pop() ###

app/models/event_file_models.py

@@ -4,7 +4,7 @@ import datetime, hashlib, logging, os, pytz, redis, secrets
 from typing import Dict, List, Optional, Set, Union
 from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
 
-from app.db_sql import redis_lookup_id_random, lookup_id_random
+from app.db_sql import redis_lookup_id_random, get_id_random
 from app.lib_general import log, logging
 
 from app.models.common_field_schema import base_fields, default_num_bytes
@@ -139,7 +139,7 @@ class Event_File_Base(BaseModel):
         log.debug(locals())
 
         if values['for_id'] and values['for_type']:
-            return lookup_id_random(record_id=values['for_id'], table_name=values['for_type'])
+            return get_id_random(record_id=values['for_id'], table_name=values['for_type'])
         return None
 
 #Event_File_Base.update_forward_refs()

app/models/order_line_models.py

@@ -4,7 +4,7 @@ import datetime, hashlib, logging, os, pytz, redis, secrets
 from typing import Dict, List, Optional, Set, Union
 from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
 
-from app.db_sql import redis_lookup_id_random, lookup_id_random
+from app.db_sql import redis_lookup_id_random, get_id_random
 from app.lib_general import log, logging
 
 from .common_field_schema import base_fields, default_num_bytes
@@ -145,7 +145,7 @@ class Order_Line_Base(BaseModel):
         log.debug(locals())
 
         if values['curr_product_for_id'] and values['curr_product_for_type']:
-            return lookup_id_random(record_id=values['curr_product_for_id'], table_name=values['curr_product_for_type'])
+            return get_id_random(record_id=values['curr_product_for_id'], table_name=values['curr_product_for_type'])
         return None
 
     # @validator('curr_product_for_id', always=True)

app/routers/event_session.py

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Set, Union
 
 from app.lib_general import log, logging
 from app.config import settings
-from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, lookup_id_random, redis_lookup_id_random
+from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, get_id_random, redis_lookup_id_random
 
 from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
@@ -70,7 +70,7 @@ async def post_event_session_obj_new(
                 data = False
         else:
             event_session_id = create_event_session_obj_result
-            event_session_id_random = lookup_id_random(record_id=event_session_id, table_name='event_session')
+            event_session_id_random = get_id_random(record_id=event_session_id, table_name='event_session')
             data = {}
             data['event_session_id'] = event_session_id
             data['event_session_id_random'] = event_session_id_random
@@ -115,7 +115,7 @@ async def patch_event_session_obj_exist(
             else:
                 data = False
         else:
-            event_session_id_random = lookup_id_random(record_id=event_session_id, table_name='event_session')
+            event_session_id_random = get_id_random(record_id=event_session_id, table_name='event_session')
             data = {}
             data['event_session_id'] = event_session_id
             data['event_session_id_random'] = event_session_id_random

app/routers/user.py

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Set, Union
 
 from app.lib_general import log, logging, secure_hash_string, verify_secure_hash_string
 from app.config import settings
-from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, lookup_id_random,redis_lookup_id_random
+from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, get_id_random,redis_lookup_id_random
 
 from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
@@ -72,7 +72,7 @@ async def post_user_obj_new(
                 data = False
         else:
             user_id = create_user_obj_result
-            user_id_random = lookup_id_random(record_id=user_id, table_name='user')
+            user_id_random = get_id_random(record_id=user_id, table_name='user')
             data = {}
             data['user_id'] = user_id
             data['user_id_random'] = user_id_random