From c77e066f9edc3b77df284962ac1df5f1ebb05e5a Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Wed, 29 Sep 2021 16:16:04 -0400
Subject: [PATCH] Code clean up. Better debugging

---
 app/db_sql.py                      |  8 +++++++-
 app/log.py                         | 14 ++++++++------
 app/methods/event_methods.py       |  6 +++---
 app/models/event_session_models.py |  2 +-
 app/routers/event_session.py       |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/db_sql.py b/app/db_sql.py
index 0ea5a0b..2f003da 100644
--- a/app/db_sql.py
+++ b/app/db_sql.py
@@ -34,12 +34,15 @@ def sql_insert(
         rm_id_random: bool = False,
         id_random_length: int = 8,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if sql:
+        log.info(f'SQL INSERT using sql string.')
+        log.debug(sql)
         sql_insert = text(sql)
     elif table_name and data:
+        log.info(f'SQL INSERT using table_name and data. Table Name: {table_name}')
         if rm_id_random:
             data = lookup_id_random_pop(obj_data=data)
         if not data.get('id_random', None) and id_random_length:
@@ -76,6 +79,9 @@ def sql_insert(
             """
             )
 
+    log.debug(sql_insert)
+    log.debug(data)
+
     trans = db.begin()
     try:
         result_insert = db.execute(sql_insert, data)
diff --git a/app/log.py b/app/log.py
index 87173b0..9bbba97 100644
--- a/app/log.py
+++ b/app/log.py
@@ -1,4 +1,4 @@
-import logging
+import functools, logging
 
 
 log = logging.getLogger('root')
@@ -9,19 +9,21 @@ logging.basicConfig(
 
 
 # ### BEGIN ### Log ### logger_reset() ###
+# https://realpython.com/primer-on-python-decorators/
 # Updated 2021-09-29
 def logger_reset(func):
     # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     # log.debug(locals())
-
+    @functools.wraps(func)
     def wrapper(*args, **kwargs):
-        log.info(f'Saving logger level... Log level: {log.level}')
+        log.info(f'Function "{func.__name__}()" called. Saving logger level... Log level: {log.level}')
         init_log_level = log.level
-        func(*args, **kwargs)
-        log.info(f'Resetting logger level... Log level: {log.level}')
+        returned_result = func(*args, **kwargs)
+        log.info(f'Function "{func.__name__}()" finished. Resetting logger level... Log level: {log.level}')
         log.setLevel(init_log_level)
         log.info(f'Reset logger level. Log level: {log.level}')
-        return func(*args, **kwargs)
+        # return func(*args, **kwargs)
+        return returned_result
 
     return wrapper
 # ### END ### Log ### logger_reset() ###
\ No newline at end of file
diff --git a/app/methods/event_methods.py b/app/methods/event_methods.py
index aa69ac2..a385f11 100644
--- a/app/methods/event_methods.py
+++ b/app/methods/event_methods.py
@@ -219,9 +219,9 @@ def load_event_obj(
         if event_session_rec_list_result := get_event_session_rec_list(
                 event_id = event_id,
                 enabled = enabled, # enabled, disabled, all
-                approved = 'all', # approve(d), not_approved, all
-                hidden = 'not_hidden', # hidden, not_hidden, all
-                review = 'all', # ready, not_ready, all
+                approved = approved, # approve(d), not_approved, all
+                hidden = hidden, # hidden, not_hidden, all
+                review = review, # ready, not_ready, all
                 limit = limit,
                 ):
             event_session_result_list = []
diff --git a/app/models/event_session_models.py b/app/models/event_session_models.py
index bf236f0..c0bf17a 100644
--- a/app/models/event_session_models.py
+++ b/app/models/event_session_models.py
@@ -164,7 +164,7 @@ class Event_Session_Base(BaseModel):
         log.setLevel(logging.WARNING)
         log.debug(locals())
 
-        if values['event_location_id_random']:
+        if values.get('event_location_id_random', None):
             return redis_lookup_id_random(record_id_random=values['event_location_id_random'], table_name='event_location')
         return None
 
diff --git a/app/routers/event_session.py b/app/routers/event_session.py
index ef5b18f..2176c21 100644
--- a/app/routers/event_session.py
+++ b/app/routers/event_session.py
@@ -92,7 +92,7 @@ async def patch_event_session_obj_exist_v4(
         exclude_none: 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 event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass