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

Work on event patch and list, account list, and minor changes

Browse Source
This commit is contained in:
Scott Idem
2021-09-28 13:22:27 -04:00
parent 831ff8d4a0
commit 35e9178472
7 changed files with 436 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/methods/account_methods.py
View File

@@ -571,6 +571,55 @@ def load_account_obj(
# ### END ### API Account Methods ### load_account_obj() ###
# ### BEGIN ### API Account Methods ### get_account_rec_list() ###
# Updated 2021-09-28
def get_account_rec_list(
limit: int = 25,
enabled: str = 'enabled', # enabled, disabled, all
) -> list|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
data = {}
if limit:
data['limit'] = limit
sql_limit = f'LIMIT :limit'
else:
sql_limit = ''
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'`account`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'`account`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
else:
log.warning(f'Unexpected value for enabled: {enabled}')
return False
sql = f"""
SELECT `account`.id AS 'account_id', `account`.id_random AS 'account_id_random'
FROM `account` AS `account`
WHERE
{sql_enabled}
ORDER BY `account`.created_on DESC, `account`.updated_on DESC
{sql_limit};
"""
if account_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
account_rec_li = account_rec_li_result
else:
account_rec_li = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(account_rec_li_result)
return account_rec_li
# ### END ### API Account Methods ### get_account_rec_list() ###
# ### BEGIN ### API Account Methods ### load_account_obj_membership_type() ###
# Working well as of 2021-06-11. Using as a template for other load objects.

68
app/methods/event_cfg_methods.py
View File

@@ -56,3 +56,71 @@ def load_event_cfg_obj(
else:
return event_cfg_obj
# ### END ### API Event Cfg Methods ### load_event_cfg_obj() ###
# ### BEGIN ### API Event Cfg Methods ### create_update_event_cfg_obj_v4() ###
# Updated 2021-09-28
def create_update_event_cfg_obj_v4(
event_cfg_dict_obj: Event_Base|dict,
event_cfg_id: int|str|None = None,
event_id: int|str|None = None,
create_sub_obj: bool = False, # Is this needed for a config?
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
return_outline: bool = False,
) -> int|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
log.info('Checking requirements...')
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else: return False
log.debug(type(event_cfg_dict_obj))
if isinstance(event_cfg_dict_obj, dict):
event_cfg_dict = event_cfg_dict_obj
if event_id:
event_cfg_dict['event_id'] = event_id
# if event_cfg_id:
# event_cfg_dict['event_cfg_id'] = event_cfg_id
try:
event_cfg_obj = Event_Cfg_Base(**event_cfg_dict)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_cfg_obj)
except ValidationError as e:
log.error(e.json())
return False
else:
event_cfg_obj = event_cfg_dict_obj
if event_id:
# NOTE: Can't update the ID alias if it was never set.
event_cfg_obj.id = event_id
event_cfg_dict = event_cfg_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'registration_cfg', 'created_on', 'updated_on'}) # NOTE this exclude list should be reviewed again
if event_id:
if event_cfg_dict_up_result := sql_update(data=event_cfg_dict, table_name='event', rm_id_random=True): pass # NOTE: This is not using the event_cfg table at this time. -STI 2021-09-28
else:
log.warning(f'Event (Cfg) not updated. Event ID: {event_id}')
log.debug(event_cfg_dict_up_result)
return False
log.debug(event_cfg_dict_up_result)
else: # NOTE NOTE NOTE NOTE: This section is for future use NOTE NOTE NOTE NOTE
if event_cfg_dict_in_result := sql_insert(data=event_cfg_dict, table_name='event', rm_id_random=True, id_random_length=default_num_bytes): pass # NOTE: This is not using the event_cfg table at this time. -STI 2021-09-28
else:
log.warning(f'Event (Cfg) not created.')
log.debug(event_cfg_dict_in_result)
return False
log.debug(event_cfg_dict_in_result)
event_id = event_cfg_dict_in_result
event_outline = {}
event_outline['event_id'] = event_id
if return_outline:
log.debug(f'Returning the Event Cfg Outline: {event_cfg_outline}')
return event_cfg_outline
else:
log.debug(f'Returning the Event (Cfg) ID: {event_id}')
return event_id
# ### END ### API Event Cfg Methods ### create_update_event_cfg_obj_v4() ###

123
app/methods/event_methods.py
View File

@@ -9,11 +9,12 @@ 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 load_event_cfg_obj
from app.methods.event_cfg_methods import create_update_event_cfg_obj_v4, load_event_cfg_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
from app.models.common_field_schema import default_num_bytes
from app.models.event_models import Event_Base
from app.models.event_cfg_models import Event_Cfg_Base
@@ -598,29 +599,91 @@ def get_account_id_w_event_id(
# ### BEGIN ### API Event Methods ### update_event_obj() ###
# Updated 2021-09-28
# NOTE: This has been partially moved to v4 to allowe for create_update conversion.
def update_event_obj(
event_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
event_obj_up: Event_Base,
event_obj_up: Event_Base, # NOTE: rename from event_obj_up to event_dict_obj
account_id: int|str|None = None,
create_sub_obj: bool = False,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
return_outline: bool = False,
) -> bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
log.info('Checking requirements...')
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else: return False
account_id = get_account_id_w_event_id(event_id=event_id)
event_obj_up.id = event_id
log.debug(type(event_obj_up)) # NOTE: rename from event_obj_up to event_dict_obj
if isinstance(event_obj_up, dict):
event_dict = event_obj_up
if event_id:
event_dict['event_id'] = event_id
if account_id:
event_dict['account_id'] = account_id
try:
event_obj = Event_Base(**event_dict)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_obj)
except ValidationError as e:
log.error(e.json())
return False
else:
event_obj = event_obj_up
if event_id:
# NOTE: Can't update the ID alias if it was never set.
event_obj.id = event_id
if account_id:
event_obj.account_id = account_id
log.debug(event_obj_up)
# log.debug(event_obj_up.dict(by_alias=True, exclude_unset=True))
log.debug(event_obj_up.dict(by_alias=False, exclude_unset=True))
# log.debug(event_obj_up.dict(by_alias=False, exclude_unset=False))
event_dict = event_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'address_location', 'contact_1', 'contact_2', 'contact_3', 'event_cfg', 'event_abstract_list', 'event_badge_list', 'event_exhibit_list', 'event_file_list', 'event_location_list', 'event_person_list', 'event_presentation_list', 'event_presenter_list', 'event_session_list', 'event_track_list', 'poc_person', 'created_on', 'updated_on'}) # NOTE this exclude list should be reviewed again
if event_obj_up.poc_person_id and event_obj_up.poc_person:
poc_person_id = event_obj_up.poc_person_id
poc_person_obj_up = event_obj_up.poc_person
if event_id:
if event_dict_up_result := sql_update(data=event_dict, table_name='event', rm_id_random=True): pass
else:
log.warning(f'Event not updated. Event ID: {event_id}')
log.debug(event_dict_up_result)
return False
log.debug(event_dict_up_result)
else: # NOTE NOTE NOTE NOTE: This section is for future use when creating create_update_event_obj_vX NOTE NOTE NOTE NOTE
if event_dict_in_result := sql_insert(data=event_dict, table_name='event', rm_id_random=True, id_random_length=default_num_bytes): pass
else:
log.warning(f'Event not created.')
log.debug(event_dict_in_result)
return False
log.debug(event_dict_in_result)
event_id = event_dict_in_result
event_outline = {}
event_outline['event_id'] = event_id
log.debug(event_obj)
# log.debug(event_obj.dict(by_alias=True, exclude_unset=True))
log.debug(event_obj.dict(by_alias=False, exclude_unset=True))
# log.debug(event_obj.dict(by_alias=False, exclude_unset=False))
if event_obj.event_cfg:
event_cfg_obj = event_obj.event_cfg
if create_update_event_cfg_obj_up_result := create_update_event_cfg_obj_v4(
event_cfg_dict_obj = event_cfg_obj,
event_id = event_id,
fail_any = fail_any,
return_outline = return_outline,
):
log.debug(create_update_event_cfg_obj_up_result)
else:
log.debug(create_update_event_cfg_obj_up_result)
return False
if event_obj.poc_person_id and event_obj.poc_person:
event_outline['poc_person_id'] = None
poc_person_id = event_obj.poc_person_id
poc_person_obj_up = event_obj.poc_person
log.debug(poc_person_id)
log.debug(poc_person_obj_up)
if poc_person_obj_up_result := create_update_person_obj_v4b(
@@ -632,23 +695,24 @@ def update_event_obj(
else:
log.debug(poc_person_obj_up_result)
return False
elif event_obj_up.poc_person and not event_obj_up.poc_person.id:
elif event_obj.poc_person and not event_obj.poc_person.id:
# NOTE: This will blindly create a new person even if there was one associated but the event.poc_person_id was not found.
poc_person_obj_in = event_obj_up.poc_person
poc_person_obj_in = event_obj.poc_person
log.debug(poc_person_obj_in)
if poc_person_obj_in_result := create_update_person_obj_v4b(account_id=account_id, person_dict_obj=poc_person_obj_in):
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(poc_person_obj_in_result)
event_obj_up.poc_person_id = poc_person_obj_in_result
event_obj.poc_person_id = poc_person_obj_in_result
else:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(poc_person_obj_in_result)
return False
if event_obj_up.user_id and event_obj_up.user:
if event_obj.user_id and event_obj.user:
event_outline['user_id'] = None
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
user_id = event_obj_up.user_id
user_obj_up = event_obj_up.user
user_id = event_obj.user_id
user_obj_up = event_obj.user
log.debug(user_id)
log.debug(user_obj_up)
if user_obj_up_result := update_user_obj(
@@ -660,26 +724,33 @@ def update_event_obj(
else:
log.debug(user_obj_up_result)
return False
elif event_obj_up.user and not event_obj_up.user.id:
elif event_obj.user and not event_obj.user.id:
# NOTE: This will blindly create a new user even if there was one associated but the event.user_id was not found.
user_obj_in = event_obj_up.user
user_obj_in = event_obj.user
log.debug(user_obj_in)
if user_obj_in_result := create_user_obj(account_id=account_id, user_obj_new=user_obj_in):
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(user_obj_in_result)
event_obj_up.user_id = user_obj_in_result
event_obj.user_id = user_obj_in_result
else:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(user_obj_in_result)
return False
event_dict_up = event_obj_up.dict(by_alias=False, exclude_unset=True, exclude={'event_abstract_list', 'event_badge', 'event_exhibit_list', 'event_file_list', 'event_location_list', 'event_presentation_list', 'event_presenter_list', 'event_registration', 'event_session', 'event_track', 'person', 'user'})
log.debug(event_dict_up)
# event_dict_up = event_obj.dict(by_alias=False, exclude_unset=True, exclude={'event_abstract_list', 'event_badge', 'event_exhibit_list', 'event_file_list', 'event_location_list', 'event_presentation_list', 'event_presenter_list', 'event_registration', 'event_session', 'event_track', 'person', 'user'})
# log.debug(event_dict_up)
if event_obj_up_result := sql_update(data=event_dict_up, table_name='event', rm_id_random=True):
log.debug(event_obj_up_result)
return True
# if event_obj_result := sql_update(data=event_dict_up, table_name='event', rm_id_random=True):
# log.debug(event_obj_result)
# return True
# else:
# log.debug(event_obj_result)
# return False
if return_outline:
log.debug(f'Returning the Event Outline: {event_outline}')
return event_outline
else:
log.debug(event_obj_up_result)
return False
log.debug(f'Returning the Event ID: {event_id}')
return event_id
# ### END ### API Event Methods ### update_event_obj() ###