A lot of work on event related modules. Also a lot of clean up

This commit is contained in:
Scott Idem
2021-06-07 16:48:55 -04:00
parent 979e0c2174
commit 33ec6a4acb
14 changed files with 423 additions and 66 deletions

View File

@@ -8,6 +8,7 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_updat
from app.lib_general import log, logging
# from app.methods.event_file_methods import load_event_file_obj
from app.methods.event_person_methods import load_event_person_obj
# from app.methods.event_presenter_methods import load_event_presenter_obj
# from app.methods.person_methods import load_person_obj
# from app.methods.user_methods import load_user_obj
@@ -20,15 +21,18 @@ def load_event_presenter_obj(
event_presenter_id: int|str,
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 1000,
inc_event_abstract_list: bool = False,
inc_event_badge: bool = False,
inc_event_device_list: bool = False,
inc_event_file_list: bool = False,
inc_event_person: bool = False,
inc_person: bool = False,
inc_user: bool = False,
inc_event_abstract_list: bool = False, # For event_presenter and using load_event_person_obj
inc_event_badge: bool = False, # Using load_event_person_obj
inc_event_device_list: bool = False, # For event_presenter and using load_event_person_obj
inc_event_file_list: bool = False, # For event_presenter and using load_event_person_obj
inc_event_person: bool = False, # Using load_event_person_obj
# inc_event_presentation: bool = False,
inc_event_registration: bool = False, # Using load_event_person_obj
# inc_event_session: bool = False,
inc_person: bool = False, # Using load_event_person_obj
inc_user: bool = False, # Using load_event_person_obj
) -> Event_Presenter_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_presenter_id := redis_lookup_id_random(record_id_random=event_presenter_id, table_name='event_presenter'): pass
@@ -48,10 +52,6 @@ def load_event_presenter_obj(
# event_presenter_obj = Event_Presenter_Base(**event_presenter_rec)
# log.debug(event_presenter_obj)
return False
# *** ** * Everything below needs to be reviewed * ** ***
#account_id = event_presenter_rec.get('account_id', None)
event_id = event_presenter_rec.get('event_id', None)
event_abstract_id = event_presenter_rec.get('event_abstract_id', None)
@@ -61,17 +61,21 @@ def load_event_presenter_obj(
person_id = event_presenter_rec.get('person_id', None)
user_id = event_presenter_rec.get('user_id', None)
#if inc_event: pass
# 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_file_list: pass
if inc_event_person:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if event_person_obj := load_event_person_obj(
event_person_id=event_person_id,
enabled=enabled
enabled=enabled,
inc_event_badge=inc_event_badge,
inc_event_registration=inc_event_registration,
inc_person=inc_person,
inc_user=inc_user,
):
log.debug(event_person_obj)
event_presenter_obj.event_person = event_person_obj
@@ -79,20 +83,21 @@ def load_event_presenter_obj(
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_person_obj)
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if inc_person:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if person_obj := load_person_obj(
person_id=person_id,
enabled=enabled
):
log.debug(person_obj)
presenter_obj.person = person_obj
else:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(person_obj)
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
#if inc_user: pass
# if inc_person:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# if person_obj := load_person_obj(
# person_id=person_id,
# enabled=enabled
# ):
# log.debug(person_obj)
# presenter_obj.person = person_obj
# else:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.debug(person_obj)
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# if inc_user: pass
else:
return False