Clean up of code...

app/methods/event_methods.py

@@ -204,7 +204,8 @@ def load_event_cfg_obj(
 
 # ### BEGIN ### API Event Methods ### load_event_obj_list() ###
 def load_event_obj_list(
-        account_id: int|str,
+        account_id: int|str|None = None,
+        user_id: int|str|None = None,
         limit: int = 1000,
         model_as_dict: bool = False,
         enabled: str = 'enabled', # enabled, disabled, all
@@ -236,11 +237,17 @@ def load_event_obj_list(
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
-    else: return False
-
     data = {}
-    data['account_id'] = account_id
+    if account_id:
+        if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
+        else: return False
+        data['account_id'] = account_id
+        sql_obj_type_id = f'`tbl`.account_id = :account_id'
+    elif user_id:
+        if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
+        else: return False
+        data['user_id'] = user_id
+        sql_obj_type_id = f'`tbl`.user_id = :user_id'
 
     if enabled in ['enabled', 'disabled', 'all']:
         if enabled == 'enabled':
@@ -262,8 +269,9 @@ def load_event_obj_list(
     sql = f"""
         SELECT `tbl`.id AS 'event_id', `tbl`.id_random AS 'event_id_random'
         FROM `event` AS `tbl`
-        WHERE `tbl`.account_id = :account_id
-        {sql_enabled}
+        WHERE
+            {sql_obj_type_id}
+            {sql_enabled}
         ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
         {sql_limit};
         """
@@ -308,7 +316,6 @@ def load_event_obj_list(
         log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(event_rec_li_result)
         event_result_li = []
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
 
     return event_result_li
 # ### END ### API Event Methods ### load_event_obj_list() ###