diff --git a/app/main.py b/app/main.py index 5c6ec7f..e5f34f8 100644 --- a/app/main.py +++ b/app/main.py @@ -149,7 +149,7 @@ app.include_router( ) app.include_router( event_session.router, - prefix='/event/session', + # prefix='/event/session', tags=['Event Session'], ) app.include_router( diff --git a/app/methods/event_person_methods.py b/app/methods/event_person_methods.py index a9daf7a..ddf158a 100644 --- a/app/methods/event_person_methods.py +++ b/app/methods/event_person_methods.py @@ -372,7 +372,7 @@ def create_update_event_person_obj_v4( # if event_badge_id := event_person_obj.event_badge_id: pass # elif event_badge_id := event_badge_obj.id: pass # else: event_badge_id = None - # event_badge_obj.id + # # event_badge_obj.id # event_badge_obj.event_person_id = event_person_id # create_update_event_badge_obj_result = create_update_event_badge_obj_v4( # event_badge_dict_obj = event_badge_obj, diff --git a/app/methods/event_presentation_methods.py b/app/methods/event_presentation_methods.py index 95ed6c7..6b7f25f 100644 --- a/app/methods/event_presentation_methods.py +++ b/app/methods/event_presentation_methods.py @@ -11,7 +11,7 @@ from app.lib_general import log, logging # from app.methods.event_file_methods import load_event_file_obj # from app.methods.event_location_methods import load_event_location_obj # from app.methods.event_presentation_methods import load_event_presentation_obj -from app.methods.event_presenter_methods import create_event_presenter_obj, load_event_presenter_obj, update_event_presenter_obj_v3 +from app.methods.event_presenter_methods import create_event_presenter_obj, create_update_event_presenter_obj_v4, load_event_presenter_obj, update_event_presenter_obj_v3 # from app.methods.event_session_methods import create_event_session_obj, load_event_session_obj, update_event_session_obj # from app.methods.person_methods import load_person_obj # from app.methods.user_methods import load_user_obj @@ -173,6 +173,148 @@ def get_event_id_w_event_session_id( # ### END ### API Event Presentation Methods ### 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 +def create_update_event_presentation_obj_v4( + event_presentation_dict_obj: Event_Presentation_Base|dict, + event_presentation_id: int|str = None, + event_id: int|str = None, + event_session_id: int|str = None, + create_sub_obj: bool = False, + 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_presentation_id: + log.info(f'Event Presentation ID passed. Update existing Event Presentation. Event Presentation ID: {event_presentation_id}') + + if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass + else: + log.error('Event Presentation ID passed but is invalid. Failed requirement.') + return False + + 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('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 + elif event_id := get_event_id_w_for_type_id(for_type='event_presentation', for_id=event_presentation_id): pass + else: + log.error('Unable to get Event ID from related object.') + False + else: + log.info('No Event Presentation ID passed. Create new Event Presentation. Required: Account ID, Event ID') + + 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. Failed requirement.') + 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.debug(type(event_presentation_dict_obj)) + if isinstance(event_presentation_dict_obj, dict): + event_presentation_dict = event_presentation_dict_obj + if event_presentation_id: + event_presentation_dict['event_presentation_id'] = event_presentation_id + if event_session_id: + event_presentation_dict['event_session_id'] = event_session_id + if event_id: + event_presentation_dict['event_id'] = event_id + try: + event_presentation_obj = Event_Presentation_Base(**event_presentation_dict) + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(event_presentation_obj) + except ValidationError as e: + log.error(e.json()) + return False + else: + event_presentation_obj = event_presentation_dict_obj + if event_presentation_id: + # NOTE: Can't update the ID alias if it was never set. + event_presentation_obj.id = event_presentation_id + if event_session_id: + event_presentation_obj.event_session_id = event_session_id + if event_id: + event_presentation_obj.event_id = event_id + + event_presentation_dict = event_presentation_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presenter', 'event_presenter_list', 'created_on', 'updated_on'}) + + if event_presentation_id: + if event_presentation_dict_up_result := sql_update(data=event_presentation_dict, table_name='event_presentation', rm_id_random=True): pass + else: + log.warning(f'Event Presentation not updated. Event Presentation ID: {event_presentation_id}') + log.debug(event_presentation_dict_up_result) + return False + log.debug(event_presentation_dict_up_result) + else: + if event_presentation_dict_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_dict_in_result) + return False + log.debug(event_presentation_dict_in_result) + + event_presentation_id = event_presentation_dict_in_result + + event_presentation_outline = {} + event_presentation_outline['event_id'] = event_id + event_presentation_outline['event_session_id'] = event_session_id + event_presentation_outline['event_presentation_id'] = event_presentation_id + event_presentation_outline['event_presenter_list'] = [] + + if event_presentation_obj.event_presenter_list and isinstance(event_presentation_obj.event_presenter_list, list): + log.info(f'Event Presenter List was found. Loop through and create a new Event Presenter for each and link them to the new Event Presentation. Event Presentation ID: {event_presentation_id}') + for event_presenter_obj in event_presentation_obj.event_presenter_list: + # NOTE: Use object model version because of better type checking and validations + log.debug(event_presenter_obj) + if event_presenter_id := event_presenter_obj.id: pass + else: event_presenter_id = None + # event_presenter_obj.event_id = event_id + # event_presenter_obj.event_session_id = event_session_id + create_update_event_presenter_obj_result = create_update_event_presenter_obj_v4( + event_presenter_dict_obj = event_presenter_obj, + event_presenter_id = event_presenter_id, + event_id = event_id, + event_session_id = event_session_id, + event_presentation_id = event_presentation_id, + fail_any = fail_any, + return_outline = return_outline, + ) + if isinstance(create_update_event_presenter_obj_result, int): + event_presenter_id = create_update_event_presenter_obj_result + elif create_update_event_presenter_obj_result == True: pass + else: + log.warning(f'Create or Update failed while trying create_update_event_presenter_obj_v4(): {create_update_event_presenter_obj_result}') + event_presenter_id = None + + event_presentation_outline['event_presenter_id'] = event_presenter_id + + if return_outline: + log.debug(f'Returning the Event Presentation Outline: {event_presentation_outline}') + return event_presentation_outline + else: + log.debug(f'Returning the Event Presentation ID: {event_presentation_id}') + return event_presentation_id +# ### END ### API Event Presentation Methods ### create_update_event_presentation_obj_v4() ### + + + + # ### BEGIN ### API Event Presentation Methods ### create_event_presentation_obj() ### # Updated 2021-08-25 def create_event_presentation_obj( diff --git a/app/methods/event_presenter_methods.py b/app/methods/event_presenter_methods.py index dd6c681..1ae135e 100644 --- a/app/methods/event_presenter_methods.py +++ b/app/methods/event_presenter_methods.py @@ -140,6 +140,128 @@ def get_event_session_id_w_event_presentation_id( # ### END ### API Event Presenter Methods ### 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 +def create_update_event_presenter_obj_v4( + event_presenter_dict_obj: Event_Presenter_Base|dict, + event_presenter_id: int|str = None, + event_id: int|str = None, + event_session_id: int|str = None, + event_presentation_id: int|str = None, + create_sub_obj: bool = False, + 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_presenter_id: + log.info(f'Event Presenter ID passed. Update existing Event Presenter. Event Presenter ID: {event_presenter_id}') + + if event_presenter_id := redis_lookup_id_random(record_id_random=event_presenter_id, table_name='event_presenter'): pass + else: + log.error('Event Presenter ID passed but is invalid. Failed requirement.') + return False + + 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('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 + elif event_id := get_event_id_w_for_type_id(for_type='event_presentation', for_id=event_presentation_id): pass + elif event_id := get_event_id_w_for_type_id(for_type='event_presenter', for_id=event_presenter_id): pass + else: + log.error('Unable to get Event ID from related object.') + False + else: + log.info('No Event Presenter ID passed. Create new Event Presenter. Required: Account ID, Event ID') + + 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. Failed requirement.') + 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 + elif event_id := get_event_id_w_for_type_id(for_type='event_presentation', for_id=event_presentation_id): pass + else: + log.error('Unable to get Event ID from related object.') + False + + log.debug(type(event_presenter_dict_obj)) + if isinstance(event_presenter_dict_obj, dict): + event_presenter_dict = event_presenter_dict_obj + if event_presenter_id: + event_presenter_dict['event_presenter_id'] = event_presenter_id + if event_presentation_id: + event_presenter_dict['event_presentation_id'] = event_presentation_id + if event_session_id: + event_presenter_dict['event_session_id'] = event_session_id + if event_id: + event_presenter_dict['event_id'] = event_id + try: + event_presenter_obj = Event_Presenter_Base(**event_presenter_dict) + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(event_presenter_obj) + except ValidationError as e: + log.error(e.json()) + return False + else: + event_presenter_obj = event_presenter_dict_obj + if event_presenter_id: + # NOTE: Can't update the ID alias if it was never set. + event_presenter_obj.id = event_presenter_id + if event_presentation_id: + event_presenter_obj.event_presentation_id = event_presentation_id + if event_session_id: + event_presenter_obj.event_session_id = event_session_id + if event_id: + event_presenter_obj.event_id = event_id + + event_presenter_dict = event_presenter_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'}) + + if event_presenter_id: + if event_presenter_dict_up_result := sql_update(data=event_presenter_dict, table_name='event_presenter', rm_id_random=True): pass + else: + log.warning(f'Event Presenter not updated. Event Presenter ID: {event_presenter_id}') + log.debug(event_presenter_dict_up_result) + return False + log.debug(event_presenter_dict_up_result) + else: + if event_presenter_dict_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_dict_in_result) + return False + log.debug(event_presenter_dict_in_result) + + event_presenter_id = event_presenter_dict_in_result + + event_presenter_outline = {} + event_presenter_outline['event_id'] = event_id + event_presenter_outline['event_session_id'] = event_session_id + event_presenter_outline['event_presentation_id'] = event_presentation_id + event_presenter_outline['event_presenter_id'] = event_presenter_id + + if return_outline: + log.debug(f'Returning the Event Presenter Outline: {event_presenter_outline}') + return event_presenter_outline + else: + log.debug(f'Returning the Event Presenter ID: {event_presenter_id}') + return event_presenter_id +# ### END ### API Event Presenter Methods ### create_update_event_presenter_obj_v4() ### + + + + # ### BEGIN ### API Event Presenter Methods ### create_event_presenter_obj() ### # Updated 2021-08-25 def create_event_presenter_obj( diff --git a/app/methods/event_session_methods.py b/app/methods/event_session_methods.py index 4cb6950..eefe8cb 100644 --- a/app/methods/event_session_methods.py +++ b/app/methods/event_session_methods.py @@ -11,7 +11,7 @@ from app.lib_general import log, logging from app.methods.event_file_methods import load_event_file_obj_list from app.methods.event_location_methods import load_event_location_obj from app.methods.event_person_methods import load_event_person_obj, update_event_person_obj -from app.methods.event_presentation_methods import create_event_presentation_obj, load_event_presentation_obj, update_event_presentation_obj_v3 +from app.methods.event_presentation_methods import create_event_presentation_obj, create_update_event_presentation_obj_v4, load_event_presentation_obj, update_event_presentation_obj_v3 # from app.methods.event_presenter_methods import load_event_presenter_obj from app.methods.person_methods import load_person_obj # from app.methods.user_methods import load_user_obj @@ -201,6 +201,139 @@ def load_event_session_obj( # ### END ### API Event Session Methods ### load_event_session_obj() ### + + +# ### BEGIN ### API Event Session Methods ### create_update_event_session_obj_v4() ### +# NOTE: This will create or update a event_session. +# Rewrite and updated 2021-08-25 +def create_update_event_session_obj_v4( + event_session_dict_obj: Event_Session_Base|dict, + event_session_id: int|str = None, + event_id: int|str = None, + # event_location_id: int|str = None, # For future? + # event_track_id: int|str = None, # For future? + create_sub_obj: bool = False, + 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_session_id: + log.info(f'Event Session ID passed. Update existing Event Session. Event Session ID: {event_session_id}') + + if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass + else: + log.error('Event Session ID passed but is invalid. Failed requirement.') + return False + + 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('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') + + 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. Failed requirement.') + log.info(f'Event ID: {event_id}') + return False + + log.debug(type(event_session_dict_obj)) + if isinstance(event_session_dict_obj, dict): + event_session_dict = event_session_dict_obj + if event_session_id: + event_session_dict['event_session_id'] = event_session_id + if event_id: + event_session_dict['event_id'] = event_id + try: + event_session_obj = Event_Session_Base(**event_session_dict) + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(event_session_obj) + except ValidationError as e: + log.error(e.json()) + return False + else: + event_session_obj = event_session_dict_obj + if event_session_id: + # NOTE: Can't update the ID alias if it was never set. + event_session_obj.id = event_session_id + if event_id: + event_session_obj.event_id = event_id + + event_session_dict = event_session_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presentation', 'event_presentation_list', 'created_on', 'updated_on'}) + + if event_session_id: + if event_session_dict_up_result := sql_update(data=event_session_dict, table_name='event_session', rm_id_random=True): pass + else: + log.warning(f'Event Session not updated. Event Session ID: {event_session_id}') + log.debug(event_session_dict_up_result) + return False + log.debug(event_session_dict_up_result) + else: + if event_session_dict_in_result := sql_insert(data=event_session_dict, table_name='event_session', rm_id_random=True, id_random_length=8): pass + else: + log.warning(f'Event Session not created.') + log.debug(event_session_dict_in_result) + return False + log.debug(event_session_dict_in_result) + + event_session_id = event_session_dict_in_result + + log.debug(event_session_id) + + event_session_outline = {} + event_session_outline['event_session_id'] = event_session_id + event_session_outline['event_presentation_list'] = [] + + if event_session_obj.event_presentation_list and isinstance(event_session_obj.event_presentation_list, list): + log.info(f'Event Presentation List was found. Loop through and create a new Event Presentation for each and link them to the new Event Session. Event Session ID: {event_session_id}') + for event_presentation_obj in event_session_obj.event_presentation_list: + # NOTE: Use object model version because of better type checking and validations + log.debug(event_presentation_obj) + if event_presentation_id := event_presentation_obj.id: pass + else: event_presentation_id = None + # event_presentation_obj.event_id = event_id + # event_presentation_obj.event_session_id = event_session_id + create_update_event_presentation_obj_result = create_update_event_presentation_obj_v4( + event_presentation_dict_obj = event_presentation_obj, + event_presentation_id = event_presentation_id, + event_id = event_id, + # event_location_id = event_location_id, + event_session_id = event_session_id, + # event_track_id = event_track_id, + fail_any = fail_any, + return_outline = return_outline, + ) + if isinstance(create_update_event_presentation_obj_result, int): + event_presentation_id = create_update_event_presentation_obj_result + elif create_update_event_presentation_obj_result == True: pass + else: + log.warning(f'Create or Update failed while trying create_update_event_presentation_obj_v4(): {create_update_event_presentation_obj_result}') + event_presentation_id = None + + event_session_outline['event_presentation_id'] = event_presentation_id + + if return_outline: + log.debug(f'Returning the Event Session Outline: {event_session_outline}') + return event_session_outline + else: + log.debug(f'Returning the Event Session ID: {event_session_id}') + return event_session_id +# ### END ### API Event Session Methods ### create_update_event_session_obj_v4() ### + + + + # ### BEGIN ### API Event Session Methods ### create_event_session_obj() ### # Updated 2021-08-25 def create_event_session_obj( diff --git a/app/models/event_presentation_models.py b/app/models/event_presentation_models.py index 20c8bbe..d7e4836 100644 --- a/app/models/event_presentation_models.py +++ b/app/models/event_presentation_models.py @@ -11,7 +11,8 @@ from app.models.common_field_schema import base_fields, default_num_bytes # from app.models.event_models import Event_Base # from app.models.event_abstract_models import Event_Abstract_Base # This creates an import loop from app.models.event_person_models import Event_Person_Base -from app.models.event_session_models import Event_Session_Base +from app.models.event_presenter_models import Event_Presenter_Base +# from app.models.event_session_models import Event_Session_Base from app.models.person_models import Person_Base @@ -81,8 +82,9 @@ class Event_Presentation_Base(BaseModel): #event_device_list: Optional[list] # Optional[Event_Device_Base] event_file_list: Optional[list] # Optional[Event_File_Base] #event_location: Optional[Event_Location_Base] - event_presenter_list: Optional[list] # Optional[Event_Presenter_Base] - event_session: Optional[Event_Session_Base] + event_presenter_list: Optional[list[Event_Presenter_Base]] # Optional[Event_Presenter_Base] + # event_session: Optional[Event_Session_Base] + event_session: Optional[dict] #event_track: Optional[Event_Track_Base] _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) diff --git a/app/models/event_presenter_models.py b/app/models/event_presenter_models.py index e70aabf..9d04e37 100644 --- a/app/models/event_presenter_models.py +++ b/app/models/event_presenter_models.py @@ -9,10 +9,10 @@ from app.lib_general import log, logging from app.models.common_field_schema import base_fields, default_num_bytes # from app.models.event_models import Event_Base -from app.models.event_abstract_models import Event_Abstract_Base +# from app.models.event_abstract_models import Event_Abstract_Base from app.models.event_person_models import Event_Person_Base -from app.models.event_presentation_models import Event_Presentation_Base -from app.models.event_session_models import Event_Session_Base +# from app.models.event_presentation_models import Event_Presentation_Base +# from app.models.event_session_models import Event_Session_Base # from app.models.person_models import Person_Base # from app.models.user_models import User_Base @@ -31,18 +31,25 @@ class Event_Presenter_Base(BaseModel): ) event_id_random: Optional[str] event_id: Optional[int] + event_abstract_id_random: Optional[str] event_abstract_id: Optional[int] + #event_location_id_random: Optional[str] #event_location_id: Optional[int] + event_person_id_random: Optional[str] event_person_id: Optional[int] + event_presentation_id_random: Optional[str] event_presentation_id: Optional[int] + event_session_id_random: Optional[str] event_session_id: Optional[int] + #event_track_id_random: Optional[str] #event_track_id: Optional[int] + person_id_random: Optional[str] person_id: Optional[int] @@ -95,14 +102,17 @@ class Event_Presenter_Base(BaseModel): # Including other related objects # event: Optional[Event_Base] - event_abstract: Optional[Event_Abstract_Base] + # event_abstract: Optional[Event_Abstract_Base] + event_abstract: Optional[dict] event_abstract_list: Optional[list] # Optional[Event_Abstract_Base] Is more than one abstract allowed per presenter? # event_device_list: Optional[list] # Optional[Event_Device_Base] event_file_list: Optional[list] # Optional[Event_File_Base] # event_location: Optional[Event_Location_Base] event_person: Optional[Event_Person_Base] - event_presentation: Optional[Event_Presentation_Base] - event_session: Optional[Event_Session_Base] + # event_presentation: Optional[Event_Presentation_Base] + event_presentation: Optional[dict] + # event_session: Optional[Event_Session_Base] + event_session: Optional[dict] # event_track: Optional[Event_Track_Base] # person: Optional[Person_Base] # This is under event_person # user: Optional[User_Base] # This is under event_person @@ -155,6 +165,15 @@ class Event_Presenter_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['event_session_id_random'], table_name='event_session') return None + @validator('event_presentation_id', always=True) + def event_presentation_id_lookup(cls, v, values, **kwargs): + log.setLevel(logging.WARNING) + log.debug(locals()) + + if values['event_presentation_id_random']: + return redis_lookup_id_random(record_id_random=values['event_presentation_id_random'], table_name='event_presentation') + return None + class Config: underscore_attrs_are_private = True allow_population_by_field_name = True diff --git a/app/models/event_session_models.py b/app/models/event_session_models.py index 07e5940..74cc5e0 100644 --- a/app/models/event_session_models.py +++ b/app/models/event_session_models.py @@ -11,6 +11,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes # from app.models.event_models import Event_Base from app.models.event_location_models import Event_Location_Base from app.models.event_person_models import Event_Person_Base # NOTE: Using this will probably create an import loop +from app.models.event_presentation_models import Event_Presentation_Base from app.models.event_track_models import Event_Track_Base from app.models.person_models import Person_Base @@ -98,7 +99,7 @@ class Event_Session_Base(BaseModel): event_location: Optional[Union[Event_Location_Base, None]] event_person_list: Optional[list] event_presenter_cat: Optional[Union[str, None]] - event_presentation_list: Optional[list] # Optional[Event_Presentation_Base] + event_presentation_list: Optional[list[Event_Presentation_Base]] # Optional[Event_Presentation_Base] event_presenter_list: Optional[list] # Optional[Event_Presenter_Base] event_track: Optional[Event_Track_Base] poc_event_person: Optional[Event_Person_Base] # NOTE: Using thi will probably create an import loop diff --git a/app/routers/event_person.py b/app/routers/event_person.py index aa36ae6..67d342b 100644 --- a/app/routers/event_person.py +++ b/app/routers/event_person.py @@ -38,6 +38,8 @@ async def post_event_person_obj_new_v4( x_account_id: str = Header(...), return_obj: bool = True, + limit: int = 500, + enabled: str = 'enabled', by_alias: bool = True, exclude_unset: bool = True, response: Response = Response, diff --git a/app/routers/event_session.py b/app/routers/event_session.py index 6f5a0fe..94b0bed 100644 --- a/app/routers/event_session.py +++ b/app/routers/event_session.py @@ -9,7 +9,7 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template -from app.methods.event_session_methods import create_event_session_obj, load_event_session_obj, update_event_session_obj_v3 +from app.methods.event_session_methods import create_event_session_obj, create_update_event_session_obj_v4, load_event_session_obj, update_event_session_obj_v3 from app.models.event_session_models import Event_Session_Base from app.models.response_models import * @@ -18,7 +18,121 @@ from app.models.response_models import * router = APIRouter() -@router.post('', response_model=Resp_Body_Base) + +# ### BEGIN ### API Event Session ### post_event_session_obj_new_v4() ### +# Updated 2021-08-25 +@router.post('/event/session/new_v4', response_model=Resp_Body_Base) +async def post_event_session_obj_new_v4( + event_session_obj: Event_Session_Base, + create_sub_obj: bool = False, + fail_any: bool = True, # Fail if any thing goes wrong for sub objects + + inc_event_presentation_list: bool = False, + inc_event_presenter_list: bool = False, + + x_account_id: str = Header(...), + return_obj: bool = True, + limit: int = 500, + enabled: str = 'enabled', + by_alias: bool = True, + exclude_unset: bool = True, + response: Response = Response, + ): + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(locals()) + + # There should probably be a check for the event ID before calling the create function? + if create_event_session_obj_result := create_update_event_session_obj_v4( + event_session_dict_obj = event_session_obj, + event_id = event_session_obj.event_id, + create_sub_obj = create_sub_obj, + fail_any = fail_any, + return_outline = False, + ): pass + else: return mk_resp(data=False, status_code=400, response=response, status_message='The event session was not created. Check the field names and data types.') + + if isinstance(create_event_session_obj_result, int): + event_session_id = create_event_session_obj_result + if return_obj: + if load_event_session_obj_result := load_event_session_obj( + event_session_id = event_session_id, + inc_event_presentation_list = inc_event_presentation_list, + inc_event_presenter_list = inc_event_presenter_list, + ): + data = load_event_session_obj_result + else: + data = False + else: + event_session_id = event_session_id + event_session_id_random = get_id_random(record_id=event_session_id, table_name='event_session') + data = {} + data['event_session_id'] = event_session_id + data['event_session_id_random'] = event_session_id_random + return mk_resp(data=data, response=response, status_message='The event session was created.') + else: + return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create an event session was unexpected.') +# ### BEGIN ### API Event Session ### post_event_session_obj_new_v4() ### + + +# ### BEGIN ### API Event Session ### patch_event_session_obj_exist_v4() ### +# Updated 2021-08-25 +@router.patch('/event/session/{event_session_id}/exist_v4', response_model=Resp_Body_Base) +async def patch_event_session_obj_exist_v4( + event_session_obj: Event_Session_Base, + event_session_id: str = Query(..., min_length=11, max_length=22), + create_sub_obj: bool = False, + fail_any: bool = True, # Fail if any thing goes wrong for sub objects + + inc_event_presentation_list: bool = False, + inc_event_presenter_list: bool = False, + + x_account_id: Optional[str] = Header(..., ), + return_obj: Optional[bool] = True, + by_alias: Optional[bool] = True, + exclude_unset: Optional[bool] = True, + exclude_none: Optional[bool] = True, + response: Response = Response, + ): + log.setLevel(logging.WARNING) # 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 + else: return mk_resp(data=None, status_code=404) + + if update_event_session_obj_result := create_update_event_session_obj_v4( + event_session_dict_obj = event_session_obj, + event_session_id = event_session_id, + event_id = event_session_obj.event_id, + create_sub_obj = create_sub_obj, + fail_any = fail_any, + return_outline = False, + ): pass + else: return mk_resp(data=False, status_code=400, response=response, status_message='The event session was not created. Check the field names and data types.') + + if update_event_session_obj_result: + if return_obj: + if load_event_session_obj_result := load_event_session_obj( + event_session_id = event_session_id, + inc_event_presentation_list = inc_event_presentation_list, + inc_event_presenter_list = inc_event_presenter_list, + ): + data = load_event_session_obj_result + else: + data = False + else: + event_session_id_random = get_id_random(record_id=event_session_id, table_name='event_session') + data = {} + data['event_session_id'] = event_session_id + data['event_session_id_random'] = event_session_id_random + return mk_resp(data=data, response=response, status_message='The event session was created.') + else: + return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create an event session was unexpected.') +# ### END ### API Event Session ### patch_event_session_obj_exist_v4() ### + + + + +@router.post('/event/session', response_model=Resp_Body_Base) async def post_event_session_obj( obj: Event_Session_Base, x_account_id: str = Header(...), @@ -44,7 +158,7 @@ async def post_event_session_obj( # ### BEGIN ### API Event Session ### post_event_session_obj_new_v3() ### # Updated 2021-08-21 (all new) -@router.post('/new_v3', response_model=Resp_Body_Base) +@router.post('/event/session/new_v3', response_model=Resp_Body_Base) async def post_event_session_obj_new_v3( event_session_obj: Event_Session_Base, create_sub_obj: bool = False, @@ -88,7 +202,7 @@ async def post_event_session_obj_new_v3( # ### BEGIN ### API Event Session ### patch_event_session_obj_exist_v3() ### # Updated 2021-08-24 -@router.patch('/{event_session_id}/exist_v3', response_model=Resp_Body_Base) +@router.patch('/event/session/{event_session_id}/exist_v3', response_model=Resp_Body_Base) async def patch_event_session_obj_exist_v3( event_session_obj: Event_Session_Base, event_session_id: str = Query(..., min_length=11, max_length=22), @@ -132,7 +246,7 @@ async def patch_event_session_obj_exist_v3( # ### END ### API Event Session ### patch_event_session_obj_exist_v3() ### -@router.patch('/{obj_id}', response_model=Resp_Body_Base) +@router.patch('/event/session/{obj_id}', response_model=Resp_Body_Base) async def patch_event_session_obj( obj: Event_Session_Base, obj_id: str = Query(..., min_length=1, max_length=22), @@ -169,7 +283,7 @@ async def patch_event_session_obj( # ### BEGIN ### API Event Session ### patch_event_session_json() ### -@router.patch('/{event_session_id}/json', response_model=Resp_Body_Base) +@router.patch('/event/session/{event_session_id}/json', response_model=Resp_Body_Base) async def patch_event_session_json( event_session_obj: Event_Session_Base, event_session_id: str = Query(..., min_length=1, max_length=22), @@ -231,7 +345,7 @@ async def patch_event_session_json( # return result -@router.get('/list', response_model=Resp_Body_Base) +@router.get('/event/session/list', response_model=Resp_Body_Base) async def get_event_session_obj_li( for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), # account for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22), @@ -350,7 +464,7 @@ async def get_event_session_obj_li( # ### BEGIN ### API Event Session ### get_event_session_obj() ### # Working well as of 2021-06-04. Using as a template for other routes. -@router.get('/{event_session_id}', response_model=Resp_Body_Base) +@router.get('/event/session/{event_session_id}', response_model=Resp_Body_Base) async def get_event_session_obj( event_session_id: str = Query(..., min_length=1, max_length=22), enabled: str = 'enabled', # For now this covers any included objects or object lists @@ -416,7 +530,7 @@ async def get_event_session_obj( # ### END ### API Event ### get_event_session_obj() ### -@router.delete('/{obj_id}', response_model=Resp_Body_Base) +@router.delete('/event/session/{obj_id}', response_model=Resp_Body_Base) async def delete_event_session_obj( obj_id: str = Query(..., min_length=1, max_length=22), x_account_id: str = Header(...), @@ -430,4 +544,4 @@ async def delete_event_session_obj( obj_type=obj_type, obj_id=obj_id, ) - return result \ No newline at end of file + return result