Mostly adding event device model, methods, and routes. Also general clean up of code.

app/methods/event_device_methods.py

@@ -0,0 +1,126 @@
+import datetime
+
+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_enable_part, sql_insert, sql_limit_offset_part, sql_select, sql_update
+from app.lib_general import log, logging, logger_reset
+
+from app.methods.event_cfg_methods import load_event_cfg_obj
+from app.methods.event_location_methods import load_event_location_obj
+
+from app.models.common_field_schema import default_num_bytes
+from app.models.event_cfg_models import Event_Cfg_Base
+from app.models.event_device_models import Event_Device_Base
+from app.models.event_location_models import Event_Location_Base
+
+
+# ### BEGIN ### API Event Device Methods ### load_event_device_obj() ###
+# Updated 2022-03-09
+@logger_reset
+def load_event_device_obj(
+        event_device_id: int,
+        enabled: str = 'enabled', # enabled, disabled, all
+        limit: int = 100,
+        offset: int = 0,
+        by_alias: bool = True,
+        exclude_unset: bool = True,
+        model_as_dict: bool = False,
+        inc_event_cfg: bool = False,
+        inc_event_location: bool = False,
+        ) -> Event_Device_Base|dict|bool:
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    if event_device_rec := sql_select(table_name='v_event_device', record_id=event_device_id): pass
+    else: return False
+
+    log.debug(event_device_rec)
+
+    try:
+        event_device_obj = Event_Device_Base(**event_device_rec)
+    except ValidationError as e:
+        log.error(e.json())
+        return False
+    log.debug(event_device_obj)
+
+    # Updated 2022-03-09
+    if inc_event_cfg:
+        log.info('Need to include event configuration...')
+        event_id = event_device_rec.get('event_id', None)
+        log.debug(event_id)
+        if event_cfg_result := load_event_cfg_obj(
+            event_id = event_id,
+            ):
+            event_device_obj.event_cfg = event_cfg_result
+        else: event_device_obj.event_cfg = {} # None
+
+    # Updated 2022-03-09
+    if inc_event_location:
+        log.info('Need to include event location...')
+        event_location_id = event_device_rec.get('event_location_id', None)
+        log.debug(event_location_id)
+        if event_location_result := load_event_location_obj(
+            event_location_id = event_location_id,
+            ):
+            event_device_obj.event_location = event_location_result
+        else: event_device_obj.event_location = {} # None
+
+    if model_as_dict:
+        return event_device_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
+    else:
+        return event_device_obj
+# ### END ### API Event Device Methods ### load_event_device_obj() ###
+
+
+# ### BEGIN ### API Event Device Methods ### get_event_device_rec_list() ###
+# Updated 2022-03-09
+@logger_reset
+def get_event_device_rec_list(
+        for_type: str, # 'account' is a special case
+        for_id: str,
+        enabled: str = 'enabled', # enabled, disabled, all
+        limit: int = 100,
+        offset: int = 0,
+        ) -> list|bool:
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    if for_id := redis_lookup_id_random(record_id_random=for_id, table_name=for_type): pass
+    else: return False
+
+    if for_type == 'account':
+        sql_for_type_id = f'`event_device`.account_id = :for_id'
+    elif for_type == 'event':
+        sql_for_type_id = f'`event_device`.event_id = :for_id'
+    elif for_type == 'event_location':
+        sql_for_type_id = f'`event_device`.event_location_id = :for_id'
+    else: return False
+
+    data = {}
+    data['for_type'] = for_type
+    data['for_id'] = for_id
+
+    sql_enabled, data['enable'] = sql_enable_part(table_name='event_device', enabled=enabled) # Reasonably safe return str and bool
+    sql_limit = sql_limit_offset_part(limit=limit, offset=offset) # Reasonably safe return str
+
+    sql = f"""
+        SELECT `event_device`.id AS 'event_device_id', `event_device`.id_random AS 'event_device_id_random'
+        FROM `v_event_device` AS `event_device`
+        WHERE
+            {sql_for_type_id}
+            {sql_enabled}
+        ORDER BY `event_device`.created_on DESC, `event_device`.updated_on DESC
+        {sql_limit};
+        """
+    log.debug(sql)
+
+    if event_device_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
+        event_device_rec_li = event_device_rec_li_result
+    else: # [] or False
+        event_device_rec_li = event_device_rec_li_result
+
+    log.debug(event_device_rec_li_result)
+
+    return event_device_rec_li
+# ### END ### API Event Device Methods ### get_event_device_rec_list() ###

app/methods/event_file_methods.py

@@ -5,7 +5,7 @@ from fastapi import File, UploadFile
 from typing import Dict, List, Optional, Set, Union
 from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
 
-from app.db_sql import get_id_random, redis_lookup_id_random, sql_insert, sql_select, sql_update
+from app.db_sql import get_id_random, redis_lookup_id_random, sql_enable_part, sql_insert, sql_limit_offset_part, sql_select, sql_update
 from app.lib_general import log, logging
 
 from app.methods.hosted_file_methods import load_hosted_file_obj

app/methods/event_location_methods.py

@@ -4,7 +4,7 @@ import datetime
 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.db_sql import redis_lookup_id_random, sql_enable_part, sql_insert, sql_limit_offset_part, sql_select, sql_update
 from app.lib_general import log, logging, logger_reset
 
 # from app.methods.event_methods import load_event_obj

app/methods/event_methods.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 import datetime
 
 from typing import Dict, List, Optional, Set, Union
@@ -164,11 +163,9 @@ def load_event_obj(
     if inc_event_abstract_list: pass
     if inc_event_badge_list: pass
 
-    # Updated 2021-06-30
+    # Updated 2022-03-09
     if inc_event_cfg:
         log.info('Need to include event configuration...')
-        # event_id = event_rec.get('event_id', None)
-        # log.debug(event_id)
         if event_cfg_result := load_event_cfg_obj(
             event_id = event_id,
             inc_event_registration_cfg = inc_event_registration_cfg,
@@ -177,7 +174,7 @@ def load_event_obj(
             model_as_dict = model_as_dict,
             ):
             event_obj.event_cfg = event_cfg_result
-        else: event_obj.event_cfg = None
+        else: event_obj.event_cfg = {} # None
 
     if inc_event_device_list: pass
     if inc_event_exhibit_list: pass