A lot of work on event related modules

2021-06-04 16:01:23 -04:00
parent 735e50dc0f
commit 627bc8c4df
10 changed files with 554 additions and 200 deletions
--- a/app/methods/event_methods.py
+++ b/app/methods/event_methods.py
@@ -11,143 +11,185 @@ from app.methods.event_session_methods import load_event_session_obj
 from app.methods.person_methods import load_person_obj
 from app.methods.user_methods import load_user_obj

-from app.models.event_models import Event_Base
+from app.models.event_models import Event_Base, Event_Cfg_Base


 # ### BEGIN ### API Event Methods ### load_event_obj() ###
 def load_event_obj(
    event_id: int|str,
    enabled: str = 'enabled', # enabled, disabled, all
+    limit: int = 1000,
+    inc_contact_1: bool = False,
+    inc_contact_2: bool = False,
+    inc_contact_3: bool = False,
    inc_event_abstract_list: bool = False,
    inc_event_badge_list: bool = False,
+    inc_event_cfg: bool = False,
    inc_event_device_list: bool = False,
    inc_event_exhibit_list: bool = False,
    inc_event_file_list: bool = False,
+    inc_event_location: bool = False, # For event_session child object
    inc_event_location_list: bool = False,
    inc_event_person_list: bool = False,
    inc_event_presentation_list: bool = False,
+    inc_event_presenter_cat: bool = False, # For event_session child object
    inc_event_presenter_list: bool = False,
+    inc_event_registration_cfg: bool = False,
    inc_event_registration_list: bool = False,
    inc_event_session_list: bool = False,
+    inc_event_track: bool = False, # For event_session child object
    inc_event_track_list: bool = False,
-    inc_event_cfg: bool = False,
-    inc_event_registration_cfg: bool = False,
+    inc_location_address: bool = False,
    inc_poc_event_person: bool = False,
-    inc_poc_person: bool = False,
-    inc_user: bool = False,
    ) -> Event_Base|bool:
-    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_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
    else: return False

-    if event_rec := sql_select(table_name='v_event', record_id=event_id):
-        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-        log.debug(event_rec)
-
-        try:
-            event_obj = Event_Base(**event_rec)
-            log.debug(event_obj)
-        except ValidationError as e:
-            log.error(e.json())
-            return False
-
-        account_id = event_rec.get('account_id', None)
-        event_id = event_rec.get('event_id', None)
-        poc_event_person_id = event_rec.get('poc_event_person_id', None)
-        poc_person_id = event_rec.get('poc_person_id', None)
-        user_id = event_rec.get('user_id', None)
-
-        #if inc_event: pass
-        if inc_event_abstract_list: pass
-        if inc_event_badge_list: pass
-        if inc_event_device_list: pass
-        if inc_event_exhibit_list: pass
-        if inc_event_file_list: pass
-        if inc_event_location_list: pass
-        if inc_event_person_list: pass
-        if inc_event_presentation_list: pass
-        if inc_event_presenter_list: pass
-        if inc_event_registration_list: pass
-        if inc_event_session_list:
-            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-
-            data = {}
-            data['event_id'] = event_id
-
-            if enabled in ['enabled', 'disabled', 'all']:
-                if enabled == 'enabled':
-                    data['enable'] = True
-                    sql_enabled = f'AND `event_session`.enable = :enable'
-                elif enabled == 'disabled':
-                    data['enable'] = False
-                    sql_enabled = f'AND `event_session`.enable = :enable'
-                elif enabled == 'all':
-                    sql_enabled = ''
-            # else: event_obj['event_session'] = None
-
-            # if limit:
-            #     data['limit'] = limit
-            #     sql_limit = f'LIMIT :limit'
-            # else:
-            #     sql_limit = ''
-
-            sql = f"""
-                SELECT `event_session`.id AS 'event_session_id', `event_session`.id_random AS 'event_session_id_random'
-                FROM `event_session` AS `event_session`
-                WHERE `event_session`.event_id = :event_id
-                {sql_enabled}
-                ORDER BY `event_session`.created_on DESC, `event_session`.updated_on DESC;
-                """
-
-            #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-            if event_session_obj_li_result := sql_select(data=data, sql=sql, as_list=True):
-                #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-                log.debug(event_session_obj_li_result)
-                event_session_obj_li = []
-                for event_session_obj in event_session_obj_li_result:
-                    event_session_id = event_session_obj.get('event_session_id', None)
-                    if event_session_obj := load_event_session_obj(
-                        event_session_id=event_session_id,
-                        enabled=enabled,
-                        inc_event_abstract_list=inc_event_abstract_list,
-                        inc_event_device_list=inc_event_device_list,
-                        inc_event_file_list=inc_event_file_list,
-                        inc_event_person_list=inc_event_person_list,
-                        inc_event_presentation_list=inc_event_presentation_list,
-                        inc_event_presenter_list=inc_event_presenter_list,
-                        #inc_event_track=inc_event_track,
-                        ):
-                        data = event_session_obj.dict(by_alias=True, exclude_unset=True)
-                        event_session_obj_li.append(data)
-                log.debug(event_session_obj_li)
-                #event_rec['event_session_list'] = event_session_obj_li
-                event_obj.event_session_list = event_session_obj_li
-            else:
-                #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-                log.debug(event_session_obj_li_result)
-            #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-
-        if inc_event_track_list: pass
-        if inc_event_cfg: pass
-        if inc_event_registration_cfg: pass
-        if inc_poc_event_person: pass
-        if inc_poc_person:
-            person_obj = load_person_obj(person_id=poc_person_id)
-            log.debug(person_obj)
-            #event_rec['poc_person'] = person_obj
-            #log.debug(event_rec)
-            event_obj.poc_person = person_obj
-            log.debug(event_obj)
-        if inc_user:
-            user_obj = load_user_obj(user_id=user_id)
-            log.debug(user_obj)
-            #event_rec['user'] = user_obj
-            #log.debug(event_rec)
-            event_obj.user = user_obj
-            log.debug(event_obj)
+    if event_rec := sql_select(table_name='v_event', record_id=event_id): pass
    else:
        return False

-    return event_obj
+    #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(event_rec)
+
+    try:
+        event_obj = Event_Base(**event_rec)
+        log.debug(event_obj)
+    except ValidationError as e:
+        log.error(e.json())
+        return False
+
+    account_id = event_rec.get('account_id', None)
+    poc_event_person_id = event_rec.get('poc_event_person_id', None)
+    poc_person_id = event_rec.get('poc_person_id', None)
+    user_id = event_rec.get('user_id', None)
+
+    #if inc_event: pass
+    if inc_event_abstract_list: pass
+    if inc_event_badge_list: pass
+
+    if inc_event_cfg: # and event_cfg_id ???
+        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        log.debug(event_id)
+        if event_cfg_obj := load_event_cfg_obj(
+            event_id=event_id, # event_cfg_id ???
+            ):
+            event_obj.event_cfg = event_cfg_obj.dict(by_alias=True, exclude_unset=True)
+        else:
+            event_obj.event_cfg = None
+
+    if inc_event_device_list: pass
+    if inc_event_exhibit_list: pass
+    if inc_event_file_list: pass
+    if inc_event_location_list: pass
+    if inc_event_person_list: pass
+    if inc_event_presentation_list: pass
+    if inc_event_presenter_list: pass
+    if inc_event_registration_cfg: pass
+    if inc_event_registration_list: pass
+
+    if inc_event_session_list:
+        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+
+        data = {}
+        data['event_id'] = event_id
+
+        if enabled in ['enabled', 'disabled', 'all']:
+            if enabled == 'enabled':
+                data['enable'] = True
+                sql_enabled = f'AND `event_session`.enable = :enable'
+            elif enabled == 'disabled':
+                data['enable'] = False
+                sql_enabled = f'AND `event_session`.enable = :enable'
+            elif enabled == 'all':
+                sql_enabled = ''
+        else:
+            sql_enabled = f'AND `event_session`.enable = :enable'
+        # else: event_obj['event_session'] = None
+
+        if limit:
+            data['limit'] = limit
+            sql_limit = f'LIMIT :limit'
+        else:
+            sql_limit = ''
+
+        sql = f"""
+            SELECT `event_session`.id AS 'event_session_id', `event_session`.id_random AS 'event_session_id_random'
+            FROM `event_session` AS `event_session`
+            WHERE `event_session`.event_id = :event_id
+            {sql_enabled}
+            ORDER BY `event_session`.created_on DESC, `event_session`.updated_on DESC
+            {sql_limit};
+            """
+
+        #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        if event_session_obj_li_result := sql_select(data=data, sql=sql, as_list=True):
+            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+            log.debug(event_session_obj_li_result)
+            event_session_obj_li = []
+            for event_session_obj in event_session_obj_li_result:
+                event_session_id = event_session_obj.get('event_session_id', None)
+                if event_session_obj := load_event_session_obj(
+                    event_session_id=event_session_id,
+                    enabled=enabled,
+                    inc_event_abstract_list=inc_event_abstract_list,
+                    inc_event_device_list=inc_event_device_list,
+                    inc_event_file_list=inc_event_file_list,
+                    inc_event_location=inc_event_location,
+                    inc_event_person_list=inc_event_person_list,
+                    inc_event_presentation_list=inc_event_presentation_list,
+                    inc_event_presenter_cat=inc_event_presenter_cat,
+                    inc_event_presenter_list=inc_event_presenter_list,
+                    #inc_event_track=inc_event_track,
+                    ):
+                    data = event_session_obj.dict(by_alias=True, exclude_unset=True)
+                    event_session_obj_li.append(data)
+            log.debug(event_session_obj_li)
+            #event_rec['event_session_list'] = event_session_obj_li
+            event_obj.event_session_list = event_session_obj_li
+        else:
+            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+            log.debug(event_session_obj_li_result)
+        #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+
+    if inc_event_track_list: pass
+
+    if inc_poc_event_person:
+        poc_event_person_obj = load_person_obj(person_id=poc_event_person_id)
+        log.debug(poc_event_person_obj)
+        #event_rec['poc_event_person'] = poc_event_person_obj
+        #log.debug(event_rec)
+        event_obj.poc_event_person = poc_event_person_obj
+        log.debug(event_obj)
+
+    return event_obj
+# ### END ### API Event Methods ### load_event_obj() ###
+
+
+# ### BEGIN ### API Event Methods ### load_event_cfg_obj() ###
+def load_event_cfg_obj(
+    event_id: int|str,
+    ) -> Event_Cfg_Base|bool:
+    #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
+    else: return False
+
+    if event_cfg_rec := sql_select(table_name='v_event_cfg', record_id=event_id):
+        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        log.debug(event_cfg_rec)
+
+        try:
+            event_cfg_obj = Event_Cfg_Base(**event_cfg_rec)
+            log.debug(event_cfg_obj)
+        except ValidationError as e:
+            log.error(e.json())
+            return False
+    else: return False
+
+    return event_cfg_obj
+# ### END ### API Event Methods ### load_event_cfg_obj() ###
--- a/app/methods/event_person_methods.py
+++ b/app/methods/event_person_methods.py
@@ -7,6 +7,15 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
 from app.lib_general import log, logging

+# from app.methods.event_abstract_methods import load_event_abstract_obj
+# from app.methods.event_badge_methods import load_event_badge_obj
+# from app.methods.event_exhibit_methods import load_event_exhibit_obj
+# from app.methods.event_file_methods import load_event_file_obj
+from app.methods.event_presentation_methods import load_event_presentation_obj
+from app.methods.event_presenter_methods import load_event_presenter_obj
+# from app.methods.event_registration_methods import load_event_registration_obj
+from app.methods.event_session_methods import load_event_session_obj
+# from app.methods.event_track_methods import load_event_track_obj
 from app.methods.person_methods import load_person_obj
 from app.methods.user_methods import load_user_obj

@@ -40,13 +49,19 @@ def create_event_person_obj(event_person_obj_new:Event_Person_Base) -> int|bool:

 # ### BEGIN ### API Event Person Methods ### load_event_person_obj() ###
 def load_event_person_obj(
-    event_person_id:int|str,
-    inc_event:bool=False,
-    inc_event_badge:bool=False,
-    inc_event_person_detail:bool=False,
-    inc_event_registration:bool=False,
-    inc_person:bool=False,
-    inc_user:bool=False
+    event_person_id: int|str,
+    inc_event_abstract_list: bool = False,
+    inc_event_badge: bool = False,
+    inc_event_exhibit_list: bool = False,
+    inc_event_file_list: bool = False,
+    #inc_event_person_detail: bool = False, # Should this be done differently?
+    inc_event_presentation_list: bool = False,
+    inc_event_presenter_list: bool = False,
+    inc_event_registration: bool = False,
+    inc_event_session_list: bool = False,
+    inc_event_track_list: bool = False,
+    inc_person: bool = False,
+    inc_user: bool = False,
    ) -> Event_Person_Base|bool:
    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
    log.debug(locals())
@@ -54,35 +69,13 @@ def load_event_person_obj(
    if event_person_id := redis_lookup_id_random(record_id_random=event_person_id, table_name='event_person'): pass
    else: return False

-    if event_person_rec := sql_select(table_name='v_event_person', record_id=event_person_id):
-        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-        log.debug(event_person_rec)
-
-        person_id = event_person_rec.get('person_id', None)
-        user_id = event_person_rec.get('user_id', None)
-
-        # event_person_obj = Event_Person_Base(**event_person_rec)
-        # person_id = event_person_obj.person_id
-        # user_id = event_person_obj.user_id
-
-        if inc_event: pass
-        if inc_event_badge: pass
-        if inc_event_person_detail: pass
-        if inc_event_registration: pass
-
-        if inc_person:
-            person_obj = load_person_obj(person_id=person_id)
-            log.debug(person_obj)
-            event_person_rec['person'] = person_obj
-            log.debug(event_person_rec)
-        if inc_user:
-            user_obj = load_user_obj(user_id=user_id)
-            log.debug(user_obj)
-            event_person_rec['user'] = user_obj
-            log.debug(event_person_rec)
+    if event_person_rec := sql_select(table_name='v_event_person', record_id=event_person_id): pass
    else:
        return False

+    #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(event_person_rec)
+
    try:
        event_person_obj = Event_Person_Base(**event_person_rec)
        log.debug(event_person_obj)
@@ -90,4 +83,35 @@ def load_event_person_obj(
        log.error(e.json())
        return False

-    return event_person_obj
+    person_id = event_person_rec.get('person_id', None)
+    user_id = event_person_rec.get('user_id', None)
+
+    # event_person_obj = Event_Person_Base(**event_person_rec)
+    # person_id = event_person_obj.person_id
+    # user_id = event_person_obj.user_id
+
+    if inc_event_abstract_list: pass
+    if inc_event_badge: pass
+    if inc_event_exhibit_list: pass
+    if inc_event_file_list: pass
+    #if inc_event_person_detail: pass
+    if inc_event_presentation_list: pass
+    if inc_event_presenter_list: pass
+    if inc_event_registration: pass
+    if inc_event_session_list: pass
+    if inc_event_track_list: pass
+
+    if inc_person:
+        person_obj = load_person_obj(person_id=person_id)
+        log.debug(person_obj)
+        event_person_rec['person'] = person_obj
+        log.debug(event_person_rec)
+
+    if inc_user:
+        user_obj = load_user_obj(user_id=user_id)
+        log.debug(user_obj)
+        event_person_rec['user'] = user_obj
+        log.debug(event_person_rec)
+
+    return event_person_obj
+# ### END ### API Event Person Methods ### load_event_person_obj() ###
--- a/app/methods/event_session_methods.py
+++ b/app/methods/event_session_methods.py
@@ -29,12 +29,13 @@ def load_event_session_obj(
    inc_event_location: bool = False,
    inc_event_person_list: bool = False,
    inc_event_presentation_list: bool = False,
+    inc_event_presenter_cat: bool = False, # Concantinate presenter names
    inc_event_presenter_list: bool = False,
    inc_event_registration_list: bool = False,
    inc_event_track: bool = False,
    inc_poc_event_person: bool = False,
    inc_poc_person: bool = False,
-    inc_user: bool = False,
+    # inc_user: bool = False,
    ) -> Event_Session_Base|bool:
    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
    log.debug(locals())
@@ -46,7 +47,7 @@ def load_event_session_obj(
    else:
        return False

-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
    log.debug(event_session_rec)

    try:
@@ -56,9 +57,6 @@ def load_event_session_obj(
        log.error(e.json())
        return False

-    # event_session_obj = Event_Session_Base(**event_session_rec)
-    # log.debug(event_session_obj)
-
    account_id = event_session_rec.get('account_id', None)
    event_id = event_session_rec.get('event_id', None)
    event_location_id = event_session_rec.get('event_location_id', None)
@@ -80,10 +78,11 @@ def load_event_session_obj(
            event_session_obj.event_location = event_location_obj.dict(by_alias=True, exclude_unset=True)
        else:
            event_session_obj.event_location = None
-
-
+    else:
+        event_session_obj.event_location = None

    if inc_event_person_list: pass
+
    if inc_event_presentation_list:
        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL

@@ -115,9 +114,9 @@ def load_event_session_obj(
            ORDER BY `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC;
            """

-        log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
        if event_presentation_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
-            log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
            log.debug(event_presentation_rec_li_result)
            event_presentation_obj_li = []
            for event_presentation_rec in event_presentation_rec_li_result:
@@ -140,15 +139,32 @@ def load_event_session_obj(
            log.debug(event_presentation_rec_li_result)
        log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL

+    if inc_event_presenter_cat:
+        data = {}
+        data['event_session_id'] = event_session_id
+
+        sql = f"""
+            SELECT event_session_id, GROUP_CONCAT(given_name, ' ', family_name SEPARATOR '; ') AS 'event_presenter_names'
+            FROM event_presenter
+            WHERE event_session_id = :event_session_id
+            GROUP BY event_session_id
+            LIMIT 1
+            """
+        if event_presenter_cat_rec_result := sql_select(data=data, sql=sql):
+            event_session_obj.event_presenter_cat = event_presenter_cat_rec_result.get('event_presenter_names', None)
+        else:
+            log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+            log.debug(event_presenter_cat_rec_result)
+            event_session_obj.event_presenter_cat = None

    if inc_event_presenter_list: pass
-    if inc_poc_event_person: pass
-    if inc_poc_person:
-        person_obj = load_person_obj(person_id=poc_person_id)
-        log.debug(person_obj)
-        event_session_obj.poc_person = person_obj
+
+    if inc_poc_event_person:
+        poc_event_person_obj = load_person_obj(person_id=poc_person_id)
+        log.debug(poc_event_person_obj)
+        event_session_obj.poc_event_person = poc_event_person_obj
        log.debug(event_session_obj)
+
    #if inc_user: pass

-
    return event_session_obj