Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on event sessions and related files. Internal use is a new thing.

Browse Source
This commit is contained in:
Scott Idem
2022-09-15 17:47:07 -04:00
parent ee297d9ea7
commit 84b33bb21f
8 changed files with 83 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/methods/event_file_methods.py
View File

@@ -106,6 +106,7 @@ def get_event_file_rec_list(
for_id: int|str, # NOTE: This is not for_obj_id because the field name is actually for_id
file_purpose_id: int = None, # NOTE: Not prefixed with lu_
file_purpose: str = None,
internal_use: bool = None, # Default to False instead of None
priority: bool = None,
group: str = None,
# event_id: str = None,
@@ -128,6 +129,7 @@ def get_event_file_rec_list(
data['for_id'] = for_id
data['file_purpose_id'] = file_purpose_id
data['file_purpose'] = file_purpose
data['internal_use'] = internal_use
data['priority'] = priority
# data['sort'] = sort
data['group'] = group # Same or similar as file purpose?
@@ -144,6 +146,13 @@ def get_event_file_rec_list(
else:
sql_file_purpose = ''
if internal_use:
sql_internal_use = f'AND `event_file`.internal_use = 1'
elif internal_use is False:
sql_internal_use = f'AND (`event_file`.internal_use IS NULL OR `event_file`.internal_use = 0)'
else:
sql_internal_use = ''
if priority:
sql_priority = f'AND `event_file`.priority = :priority'
else:
@@ -164,6 +173,7 @@ def get_event_file_rec_list(
{sql_for_type_id}
{sql_file_purpose_id}
{sql_file_purpose}
{sql_internal_use}
{sql_priority}
{sql_group}
{sql_enabled}

59
app/methods/event_session_methods.py
View File

@@ -35,6 +35,7 @@ def load_event_session_obj(
inc_event_badge_list: bool = False,
inc_event_device_list: bool = False,
inc_event_file_list: bool = False,
inc_event_file_internal_use_list: bool = False,
inc_event_location: bool = False,
inc_event_person: bool = False,
inc_event_person_profile: bool = False,
@@ -98,6 +99,7 @@ def load_event_session_obj(
for_id = event_session_id,
file_purpose_id = event_file_file_purpose_id,
file_purpose = event_file_file_purpose,
internal_use = False,
priority = event_file_priority,
group = event_file_group,
enabled = enabled,
@@ -123,14 +125,41 @@ def load_event_session_obj(
else:
event_session_obj.event_file_list = None
# if event_file_dict_list := load_event_file_obj_list(
# event_session_id = event_session_id,
# limit = limit,
# model_as_dict = model_as_dict,
# enabled = enabled,
# ):
# event_session_obj.event_file_list = event_file_dict_list
# else: event_session_obj.event_file_list = []
if inc_event_file_internal_use_list:
log.info('Need to include event file internal use list...')
from app.methods.event_file_methods import get_event_file_rec_list, load_event_file_obj
if event_file_rec_list_result := get_event_file_rec_list(
for_type = 'event_session',
for_id = event_session_id,
file_purpose_id = event_file_file_purpose_id,
file_purpose = event_file_file_purpose,
internal_use = True,
priority = event_file_priority,
group = event_file_group,
enabled = enabled,
limit = limit,
):
event_file_result_list = []
for event_file_rec in event_file_rec_list_result:
if load_event_file_result := load_event_file_obj(
event_file_id = event_file_rec.get('event_file_id', None),
enabled = enabled,
inc_hosted_file = inc_hosted_file,
# model_as_dict = True,
# by_alias = by_alias,
# exclude_unset = False,
):
event_file_result_list.append(load_event_file_result)
else:
event_file_result_list.append(None)
log.debug(event_file_result_list)
event_session_obj.event_file_internal_use_list = event_file_result_list
elif isinstance(event_file_rec_list_result, list):
event_session_obj.event_file_internal_use_list = []
else:
event_session_obj.event_file_internal_use_list = None
log.debug(f'Get event location? Include Event Location: {inc_event_location} Event Location ID: {event_location_id}')
if inc_event_location and event_location_id:
@@ -400,14 +429,14 @@ def create_update_event_session_obj_v4(
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else:
log.error('Missing or invalid Event ID passed. Not required. Ignoring.')
log.info(f'Event ID: {event_id}')
# log.info(f'Event ID: {event_id}')
log.info('Attempting to get Event ID from related object.')
from app.methods.event_methods import get_event_id_w_for_type_id
if event_id := get_event_id_w_for_type_id(for_type='event_session', for_id=event_session_id): pass
else:
log.error('Unable to get Event ID from related object.')
False
# log.info('Attempting to get Event ID from related object.')
# from app.methods.event_methods import get_event_id_w_for_type_id
# if event_id := get_event_id_w_for_type_id(for_type='event_session', for_id=event_session_id): pass
# else:
# log.error('Unable to get Event ID from related object.')
# False
else:
log.info('No Event Session ID passed. Create new Event Session. Required: Account ID, Event ID')