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

General clean up. Work on importing AAPOR. Work on sessions, presentations, and presenters.

Browse Source
This commit is contained in:
Scott Idem
2022-04-12 04:08:52 -04:00
parent f15179fb02
commit 16fca4b2f0
8 changed files with 485 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/methods/event_presentation_methods.py
View File

@@ -1,11 +1,10 @@
from __future__ import annotations
import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from app.lib_general import log, logging
from app.lib_general import log, logging, logger_reset
# from app.methods.event_methods import load_event_obj
# from app.methods.event_file_methods import load_event_file_obj
@@ -20,6 +19,7 @@ from app.models.event_presentation_models import Event_Presentation_Base
# ### BEGIN ### API Event Presentation Methods ### load_event_presentation_obj() ###
@logger_reset
def load_event_presentation_obj(
event_presentation_id: int|str,
enabled: str = 'enabled', # enabled, disabled, all
@@ -229,6 +229,7 @@ def load_event_presentation_obj(
# ### BEGIN ### API Event Presenter Methods ### get_event_presentation_rec_list() ###
@logger_reset
def get_event_presentation_rec_list(
event_person_id: str = None,
event_session_id: str = None,
@@ -315,6 +316,7 @@ def get_event_presentation_rec_list(
# ### BEGIN ### API Event Presentation Methods ### get_event_id_w_event_session_id() ###
# Updated 2021-08-23
@logger_reset
def get_event_id_w_event_session_id(
event_session_id: int|str,
) -> bool|int|None:
@@ -347,6 +349,7 @@ def get_event_id_w_event_session_id(
# ### BEGIN ### API Event Presentation Methods ### create_update_event_presentation_obj_v4() ###
# NOTE: This will create or update a event_presentation.
# Rewrite and updated 2021-08-25
@logger_reset
def create_update_event_presentation_obj_v4(
event_presentation_dict_obj: Event_Presentation_Base|dict,
event_presentation_id: int|str = None,
@@ -485,7 +488,8 @@ def create_update_event_presentation_obj_v4(
# ### BEGIN ### API Event Presentation Methods ### create_event_presentation_obj() ###
# Updated 2021-08-25
# Updated 2022-04-12
@logger_reset
def create_event_presentation_obj(
event_session_id: int|str,
event_presentation_obj_new: Event_Presentation_Base,
@@ -493,7 +497,7 @@ def create_event_presentation_obj(
create_sub_obj: bool = False,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
) -> bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.INFO) # 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
@@ -517,21 +521,25 @@ def create_event_presentation_obj(
log.debug(type(event_presentation_obj_new))
if isinstance(event_presentation_obj_new, dict):
event_presentation_dict = event_presentation_obj_new
try:
event_presentation_obj_new = Event_Presentation_Base(**event_presentation_obj_new)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_obj_new)
event_presentation_obj = Event_Presentation_Base(**event_presentation_dict)
except ValidationError as e:
log.error(e.json())
return False
log.debug(event_presentation_obj)
else:
event_presentation_dict = event_presentation_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presenter', 'event_presenter_list', 'created_on', 'updated_on'})
event_presentation_obj_new.event_id = event_id
event_presentation_obj_new.event_session_id = event_session_id
event_presentation_dict['for_type'] = 'event_session'
event_presentation_dict['for_id'] = event_session_id
event_presentation_obj_data = event_presentation_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presenter', 'event_presenter_list', 'created_on', 'updated_on'})
log.debug(event_presentation_obj_data)
event_presentation_dict['event_id'] = event_id
event_presentation_dict['event_session_id'] = event_session_id
if event_presentation_obj_in_result := sql_insert(data=event_presentation_obj_data, table_name='event_presentation', rm_id_random=True, id_random_length=8): pass
log.debug(event_presentation_dict)
if event_presentation_obj_in_result := sql_insert(data=event_presentation_dict, table_name='event_presentation', rm_id_random=True, id_random_length=8): pass
else:
log.warning(f'Event Presentation not created.')
log.debug(event_presentation_obj_in_result)
@@ -543,12 +551,12 @@ def create_event_presentation_obj(
return_dict['event_presentation_id'] = None
return_dict['event_presenter_list'] = []
if event_presentation_obj_new.event_presenter_list and isinstance(event_presentation_obj_new.event_presenter_list, list):
for event_presenter_obj_new in event_presentation_obj_new.event_presenter_list:
if event_presentation_obj.event_presenter_list and isinstance(event_presentation_obj.event_presenter_list, list):
for event_presenter_obj in event_presentation_obj.event_presenter_list:
# NOTE: This does not account for an edge case where the presenter already exists. Possibly as part of another presentation.
if create_event_presenter_obj_result := create_event_presenter_obj(
event_presentation_id = event_presentation_id,
event_presenter_obj_new = event_presenter_obj_new,
event_presenter_obj_new = event_presenter_obj,
create_sub_obj = create_sub_obj,
fail_any = fail_any,
):
@@ -576,14 +584,16 @@ def create_event_presentation_obj(
# ### BEGIN ### API Event Presentation Methods ### update_event_presentation_obj_v3() ###
# Updated 2021-08-25
# Updated 2022-04-12
@logger_reset
def update_event_presentation_obj_v3(
event_presentation_id: int|str,
event_presentation_obj_exist: Event_Presentation_Base,
event_session_id: int = None,
create_sub_obj: bool = False,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
) -> bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass
@@ -591,23 +601,32 @@ def update_event_presentation_obj_v3(
log.debug(type(event_presentation_obj_exist))
if isinstance(event_presentation_obj_exist, dict):
event_presentation_dict = event_presentation_obj_exist
try:
event_presentation_obj_exist = Event_Presentation_Base(**event_presentation_obj_exist)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_obj_exist)
event_presentation_obj = Event_Presentation_Base(**event_presentation_obj_exist)
except ValidationError as e:
log.error(e.json())
return False
log.debug(event_presentation_obj)
else:
event_presentation_dict = event_presentation_obj_exist.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presenter', 'event_presenter_list', 'created_on', 'updated_on'})
# Can't update the event_presentation_id alias if the .id was never set.
# event_presentation_obj_exist.event_presentation_id = event_presentation_id
if not event_presentation_obj_exist.id:
event_presentation_obj_exist.id = event_presentation_id
# event_presentation_obj.event_presentation_id = event_presentation_id
if not event_presentation_obj.id:
event_presentation_obj.id = event_presentation_id
event_presentation_obj_data = event_presentation_obj_exist.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presenter', 'event_presenter_list', 'created_on', 'updated_on'})
log.debug(event_presentation_obj_data)
log.debug(event_presentation_dict)
if event_presentation_obj_up_result := sql_update(data=event_presentation_obj_data, table_name='event_presentation', rm_id_random=True): pass
# event_presentation_dict['event_id'] = event_id
if event_session_id:
event_presentation_dict['for_type'] = 'event_session'
event_presentation_dict['for_id'] = event_session_id
event_presentation_dict['event_session_id'] = event_session_id
log.debug(event_presentation_dict)
if event_presentation_obj_up_result := sql_update(data=event_presentation_dict, table_name='event_presentation', record_id=event_presentation_id, rm_id_random=True): pass
else:
log.warning(f'Event Presentation not updated.')
log.debug(event_presentation_obj_up_result)
@@ -617,8 +636,8 @@ def update_event_presentation_obj_v3(
return_dict['event_presentation_id'] = event_presentation_id
return_dict['event_presenter_list'] = []
if event_presentation_obj_exist.event_presenter_list and isinstance(event_presentation_obj_exist.event_presenter_list, list):
for event_presenter_obj_unknown in event_presentation_obj_exist.event_presenter_list:
if event_presentation_obj.event_presenter_list and isinstance(event_presentation_obj.event_presenter_list, list):
for event_presenter_obj_unknown in event_presentation_obj.event_presenter_list:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presenter_obj_unknown)
if event_presenter_id := event_presenter_obj_unknown.get('event_presenter_id_random', None):
@@ -679,6 +698,8 @@ def update_event_presentation_obj_v3(
# ### BEGIN ### API Event Presentation Methods ### update_event_presentation_obj() ###
# This will be taken over by _exist version
# Updated 2022-04-12
@logger_reset
def update_event_presentation_obj(
event_presentation_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
event_presentation_obj_up: Event_Presentation_Base,