General clean up. Work on importing AAPOR. Work on sessions, presentations, and presenters.
This commit is contained in:
@@ -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_cfg_methods import load_event_cfg_obj
|
||||
from app.methods.event_person_methods import create_event_person_obj, load_event_person_obj, update_event_person_obj
|
||||
@@ -16,6 +15,7 @@ from app.models.event_presenter_models import Event_Presenter_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Presenter Methods ### load_event_presenter_obj() ###
|
||||
@logger_reset
|
||||
def load_event_presenter_obj(
|
||||
event_presenter_id: int|str,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
@@ -201,6 +201,7 @@ def load_event_presenter_obj(
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Presenter Methods ### get_event_presenter_rec_list() ###
|
||||
@logger_reset
|
||||
def get_event_presenter_rec_list(
|
||||
event_person_id: str = None,
|
||||
event_presentation_id: str = None,
|
||||
@@ -281,6 +282,7 @@ def get_event_presenter_rec_list(
|
||||
|
||||
# ### BEGIN ### API Event Presenter Methods ### get_event_session_id_w_event_presentation_id() ###
|
||||
# Updated 2021-08-23
|
||||
@logger_reset
|
||||
def get_event_session_id_w_event_presentation_id(
|
||||
event_presentation_id: int|str,
|
||||
) -> bool|int|None:
|
||||
@@ -315,6 +317,7 @@ def get_event_session_id_w_event_presentation_id(
|
||||
# ### BEGIN ### API Event Presenter Methods ### create_update_event_presenter_obj_v4() ###
|
||||
# NOTE: This will create or update a event_presenter.
|
||||
# Rewrite and updated 2021-08-25
|
||||
@logger_reset
|
||||
def create_update_event_presenter_obj_v4(
|
||||
event_presenter_dict_obj: Event_Presenter_Base|dict,
|
||||
event_presenter_id: int|str = None,
|
||||
@@ -433,7 +436,8 @@ def create_update_event_presenter_obj_v4(
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Presenter Methods ### create_event_presenter_obj() ###
|
||||
# Updated 2021-08-25
|
||||
# Updated 2022-04-12
|
||||
@logger_reset
|
||||
def create_event_presenter_obj(
|
||||
event_presentation_id: int|str,
|
||||
event_presenter_obj_new: Event_Presenter_Base,
|
||||
@@ -442,7 +446,7 @@ def create_event_presenter_obj(
|
||||
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_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
|
||||
@@ -466,22 +470,26 @@ def create_event_presenter_obj(
|
||||
|
||||
log.debug(type(event_presenter_obj_new))
|
||||
if isinstance(event_presenter_obj_new, dict):
|
||||
event_presenter_dict = event_presenter_obj_new
|
||||
try:
|
||||
event_presenter_obj_new = Event_Presenter_Base(**event_presenter_obj_new)
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(event_presenter_obj_new)
|
||||
event_presenter_obj = Event_Presenter_Base(**event_presenter_obj_new)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
log.debug(event_presenter_obj)
|
||||
else:
|
||||
event_presenter_dict = event_presenter_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
|
||||
|
||||
event_presenter_obj_new.event_id = event_id
|
||||
event_presenter_obj_new.event_session_id = event_session_id
|
||||
event_presenter_obj_new.event_presentation_id = event_presentation_id
|
||||
event_presenter_dict['for_type'] = 'event_presentation'
|
||||
event_presenter_dict['for_id'] = event_presentation_id
|
||||
|
||||
event_presenter_obj_data = event_presenter_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
|
||||
log.debug(event_presenter_obj_data)
|
||||
event_presenter_dict['event_id'] = event_id
|
||||
event_presenter_dict['event_session_id'] = event_session_id
|
||||
event_presenter_dict['event_presentation_id'] = event_presentation_id
|
||||
|
||||
if event_presenter_obj_in_result := sql_insert(data=event_presenter_obj_data, table_name='event_presenter', rm_id_random=True, id_random_length=8): pass
|
||||
log.debug(event_presenter_dict)
|
||||
|
||||
if event_presenter_obj_in_result := sql_insert(data=event_presenter_dict, table_name='event_presenter', rm_id_random=True, id_random_length=8): pass
|
||||
else:
|
||||
log.warning(f'Event Presenter not created.')
|
||||
log.debug(event_presenter_obj_in_result)
|
||||
@@ -498,14 +506,16 @@ def create_event_presenter_obj(
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Presenter Methods ### update_event_presenter_obj_v3() ###
|
||||
# Updated 2021-08-21
|
||||
# Updated 2022-04-12
|
||||
@logger_reset
|
||||
def update_event_presenter_obj_v3(
|
||||
event_presenter_id: int|str,
|
||||
event_presenter_obj_exist: Event_Presenter_Base,
|
||||
event_presentation_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.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.setLevel(logging.INFO) # 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
|
||||
@@ -513,23 +523,31 @@ def update_event_presenter_obj_v3(
|
||||
|
||||
log.debug(type(event_presenter_obj_exist))
|
||||
if isinstance(event_presenter_obj_exist, dict):
|
||||
event_presenter_dict = event_presenter_obj_exist
|
||||
try:
|
||||
event_presenter_obj_exist = Event_Presenter_Base(**event_presenter_obj_exist)
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(event_presenter_obj_exist)
|
||||
event_presenter_obj = Event_Presenter_Base(**event_presenter_obj_exist)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
log.debug(event_presenter_obj)
|
||||
else:
|
||||
event_presenter_dict = event_presenter_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_presenter_id alias if the .id was never set.
|
||||
# event_presenter_obj_exist.event_presenter_id = event_presenter_id
|
||||
if not event_presenter_obj_exist.id:
|
||||
event_presenter_obj_exist.id = event_presenter_id
|
||||
# event_presenter_obj.event_presenter_id = event_presenter_id
|
||||
if not event_presenter_obj.id:
|
||||
event_presenter_obj.id = event_presenter_id
|
||||
|
||||
event_presenter_obj_data = event_presenter_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_presenter_obj_data)
|
||||
# event_presenter_dict['event_id'] = event_id
|
||||
# event_presenter_dict['event_session_id'] = event_session_id
|
||||
if event_presentation_id:
|
||||
event_presenter_dict['for_type'] = 'event_presentation'
|
||||
event_presenter_dict['for_id'] = event_presentation_id
|
||||
event_presenter_dict['event_presentation_id'] = event_presentation_id
|
||||
|
||||
if event_presenter_obj_up_result := sql_update(data=event_presenter_obj_data, table_name='event_presenter', rm_id_random=True): pass
|
||||
log.debug(event_presenter_dict)
|
||||
|
||||
if event_presenter_obj_up_result := sql_update(data=event_presenter_dict, table_name='event_presenter', record_id=event_presenter_id, rm_id_random=True): pass
|
||||
else:
|
||||
log.warning(f'Event Presenter not updated.')
|
||||
log.debug(event_presenter_obj_up_result)
|
||||
@@ -547,6 +565,7 @@ def update_event_presenter_obj_v3(
|
||||
|
||||
# ### BEGIN ### API Event Presenter Methods ### update_event_presenter_obj() ###
|
||||
# This will be taken over by _exist version
|
||||
@logger_reset
|
||||
def update_event_presenter_obj(
|
||||
event_presenter_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
|
||||
event_presenter_obj_up: Event_Presenter_Base,
|
||||
|
||||
Reference in New Issue
Block a user