Code clean up. Working on returning proper 404 vs 400 responses if the results are empty and nothing went wrong.

app/methods/event_methods.py

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Set, Union
 from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
 
 from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
-from app.lib_general import log, logging
+from app.lib_general import log, logging, logger_reset
 
 from app.methods.address_methods import load_address_obj
 from app.methods.contact_methods import load_contact_obj
@@ -21,6 +21,7 @@ from app.models.event_cfg_models import Event_Cfg_Base
 
 
 # ### BEGIN ### API Event Methods ### load_event_obj() ###
+@logger_reset
 def load_event_obj(
         event_id: int|str,
         enabled: str = 'enabled', # enabled, disabled, all
@@ -315,6 +316,8 @@ def load_event_obj(
 
 
 # ### BEGIN ### API Event Methods ### get_event_rec_list() ###
+# Updated 2021-12-13
+@logger_reset
 def get_event_rec_list(
         account_id: str = None,
         organization_id: str = None,
@@ -446,13 +449,13 @@ def get_event_rec_list(
             """
     log.debug(sql)
 
-    if event_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
-        log.info('Got a list of events')
-        log.debug(event_rec_li_result)
+    if event_rec_li_result := sql_select(data=data, sql=sql):
+        log.info('Got a list result')
         event_rec_li = event_rec_li_result
-    else:
-        log.info('No events were found')
-        event_rec_li = []
+    else: # None or False
+        log.info('No results or something went wrong')
+        event_rec_li = event_rec_li_result # []
+
     log.debug(event_rec_li_result)
 
     return event_rec_li
@@ -461,6 +464,7 @@ def get_event_rec_list(
 
 # ### BEGIN ### API Event Methods ### get_event_meeting_rec_list() ###
 # Updated 2021-12-13
+@logger_reset
 def get_event_meeting_rec_list(
         account_id: str = None,
         organization_id: str = None,
@@ -589,13 +593,14 @@ def get_event_meeting_rec_list(
             """
     log.debug(sql)
 
-    if event_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
-        log.info('Got a list of events')
+    if event_rec_li_result := sql_select(data=data, sql=sql):
+        log.info('Got a list result')
         log.debug(event_rec_li_result)
         event_rec_li = event_rec_li_result
-    else:
-        log.info('No events were found')
-        event_rec_li = []
+    else: # None or False
+        log.info('No results or something went wrong')
+        event_rec_li = event_rec_li_result # []
+
     log.debug(event_rec_li_result)
 
     return event_rec_li