Code clean up. Better debugging. Work on event session, presentation, and presenter.
This commit is contained in:
Scott Idem
@@ -10,6 +10,7 @@ from app.lib_general import log, logging
|
||||
from app.methods.address_methods import load_address_obj
|
||||
from app.methods.contact_methods import load_contact_obj
|
||||
from app.methods.event_cfg_methods import create_update_event_cfg_obj_v4, load_event_cfg_obj
|
||||
from app.methods.event_location_methods import get_event_location_rec_list, load_event_location_obj
|
||||
from app.methods.event_session_methods import get_event_session_rec_list, load_event_session_obj
|
||||
from app.methods.person_methods import create_update_person_obj_v4b, load_person_obj
|
||||
from app.methods.user_methods import create_user_obj, load_user_obj, update_user_obj
|
||||
@@ -22,11 +23,10 @@ from app.models.event_cfg_models import Event_Cfg_Base
|
||||
# ### BEGIN ### API Event Methods ### load_event_obj() ###
|
||||
def load_event_obj(
|
||||
event_id: int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
approved: str = 'all', # approved, not_approved, all
|
||||
hidden: str = 'not_hidden', # hidden, not_hidden, all
|
||||
review: str = 'all', # ready, not_ready, all
|
||||
inc_address: bool = False, # Loads address_location and under contact(s)
|
||||
# inc_address_location: bool = False,
|
||||
inc_contact: bool = False, # Loads all 3 contacts
|
||||
@@ -57,8 +57,12 @@ def load_event_obj(
|
||||
inc_product: bool = False,
|
||||
inc_product_list: bool = False,
|
||||
inc_user: bool = False,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
) -> Event_Base|bool:
|
||||
#log.setLevel(logging.DEBUG) # 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
|
||||
@@ -165,22 +169,59 @@ def load_event_obj(
|
||||
if inc_event_device_list: pass
|
||||
if inc_event_exhibit_list: pass
|
||||
if inc_event_file_list: pass
|
||||
if inc_event_location_list: pass
|
||||
|
||||
# Updated 2021-09-29
|
||||
if inc_event_location_list:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.info('Need to include event location list...')
|
||||
|
||||
if event_location_rec_list_result := get_event_location_rec_list(
|
||||
event_id = event_id,
|
||||
enabled = enabled, # enabled, disabled, all
|
||||
hidden = 'all', # hidden, not_hidden, all
|
||||
limit = limit,
|
||||
):
|
||||
event_location_result_list = []
|
||||
for event_location_rec in event_location_rec_list_result:
|
||||
if load_event_location_result := load_event_location_obj(
|
||||
event_location_id = event_location_rec.get('event_location_id', None),
|
||||
enabled = enabled,
|
||||
inc_event_file_list = inc_event_file_list,
|
||||
inc_event_presentation_list = inc_event_presentation_list,
|
||||
inc_event_presenter_list = inc_event_presenter_list,
|
||||
inc_event_session_list = inc_event_session_list,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
):
|
||||
event_location_result_list.append(load_event_location_result)
|
||||
else:
|
||||
event_location_result_list.append(None)
|
||||
log.debug(event_location_result_list)
|
||||
event_obj.event_location_list = event_location_result_list
|
||||
elif isinstance(event_location_rec_list_result, list):
|
||||
event_obj.event_location_list = []
|
||||
else:
|
||||
event_obj.event_location_list = None
|
||||
|
||||
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
|
||||
|
||||
# Updated 2021-09-28
|
||||
if inc_event_session_list:
|
||||
log.info('Need to include event session list...')
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
|
||||
if event_session_rec_list_result := get_event_session_rec_list(
|
||||
event_id = event_id,
|
||||
review = 'all', # ready, not_ready, all
|
||||
enabled = enabled, # enabled, disabled, all
|
||||
approved = 'all', # approve(d), not_approved, all
|
||||
enabled = enabled,
|
||||
hidden = 'not_hidden', # hidden, not_hidden, all
|
||||
review = 'all', # ready, not_ready, all
|
||||
limit = limit,
|
||||
):
|
||||
event_session_result_list = []
|
||||
@@ -209,70 +250,6 @@ def load_event_obj(
|
||||
else:
|
||||
event_obj.event_session_list = None
|
||||
|
||||
# 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,
|
||||
# limit = limit,
|
||||
# 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,
|
||||
# inc_person=inc_person,
|
||||
# inc_user=inc_user,
|
||||
# ):
|
||||
# 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:
|
||||
|
||||
Reference in New Issue
Block a user