From b2129d6e05fd14b8c3efb9ab0c184a19ded5f6e7 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 9 Sep 2021 18:58:17 -0400 Subject: [PATCH] Work on event, session, presentatio, presenter, and person related --- app/methods/event_presenter_methods.py | 30 ++++++++--------- app/models/event_presenter_models.py | 46 ++++++++++++++++---------- app/routers/event_presenter.py | 6 ++-- 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/app/methods/event_presenter_methods.py b/app/methods/event_presenter_methods.py index f697018..247187b 100644 --- a/app/methods/event_presenter_methods.py +++ b/app/methods/event_presenter_methods.py @@ -31,7 +31,7 @@ def load_event_presenter_obj( inc_event_file_list: bool = False, # For event_presenter and using load_event_person_obj inc_event_person: bool = False, # Using load_event_person_obj inc_event_person_profile: bool = False, # Using load_event_person_obj - # inc_event_presentation: bool = False, + inc_event_presentation: bool = False, inc_event_registration: bool = False, # Using load_event_person_obj # inc_event_session: bool = False, inc_person: bool = False, # Using load_event_person_obj @@ -46,7 +46,7 @@ def load_event_presenter_obj( if event_presenter_rec := sql_select(table_name='v_event_presenter', record_id=event_presenter_id): pass else: return False - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(event_presenter_rec) try: @@ -96,20 +96,20 @@ def load_event_presenter_obj( event_presenter_obj.event_person = None log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - # if inc_person: - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + if inc_event_presentation: + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + from app.methods.event_presentation_methods import load_event_presentation_obj - # if person_obj := load_person_obj( - # person_id=person_id, - # enabled=enabled - # ): - # log.debug(person_obj) - # presenter_obj.person = person_obj - # else: - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - # log.debug(person_obj) - # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - # if inc_user: pass + if event_presentation_obj := load_event_presentation_obj( + event_presentation_id = event_presentation_id, + ): + log.debug(event_presentation_obj) + event_presenter_obj.event_presentation = event_presentation_obj + else: + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(event_presentation_obj) + event_presenter_obj.event_presentation = None + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL if model_as_dict: return event_presenter_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member diff --git a/app/models/event_presenter_models.py b/app/models/event_presenter_models.py index 9d04e37..1bc6ad0 100644 --- a/app/models/event_presenter_models.py +++ b/app/models/event_presenter_models.py @@ -29,11 +29,14 @@ class Event_Presenter_Base(BaseModel): id: Optional[int] = Field( alias = 'event_presenter_id' ) + account_id_random: Optional[str] + account_id: Optional[int] + event_id_random: Optional[str] event_id: Optional[int] - event_abstract_id_random: Optional[str] - event_abstract_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] @@ -50,8 +53,8 @@ class Event_Presenter_Base(BaseModel): #event_track_id_random: Optional[str] #event_track_id: Optional[int] - person_id_random: Optional[str] - person_id: Optional[int] + # person_id_random: Optional[str] + # person_id: Optional[int] for_type: Optional[str] for_id: Optional[int] @@ -138,6 +141,15 @@ class Event_Presenter_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['id_random'], table_name='event_presenter') return None + @validator('account_id', always=True) + def account_id_lookup(cls, v, values, **kwargs): + log.setLevel(logging.WARNING) + log.debug(locals()) + + if values['account_id_random']: + return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account') + return None + @validator('event_id', always=True) def event_id_lookup(cls, v, values, **kwargs): log.setLevel(logging.WARNING) @@ -147,22 +159,13 @@ class Event_Presenter_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['event_id_random'], table_name='event') return None - @validator('event_abstract_id', always=True) - def event_abstract_id_lookup(cls, v, values, **kwargs): + @validator('event_person_id', always=True) + def event_person_id_lookup(cls, v, values, **kwargs): log.setLevel(logging.WARNING) log.debug(locals()) - if values['event_abstract_id_random']: - return redis_lookup_id_random(record_id_random=values['event_abstract_id_random'], table_name='event_abstract') - return None - - @validator('event_session_id', always=True) - def event_session_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) - - if values['event_session_id_random']: - return redis_lookup_id_random(record_id_random=values['event_session_id_random'], table_name='event_session') + if values['event_person_id_random']: + return redis_lookup_id_random(record_id_random=values['event_person_id_random'], table_name='event_person') return None @validator('event_presentation_id', always=True) @@ -174,6 +177,15 @@ class Event_Presenter_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['event_presentation_id_random'], table_name='event_presentation') return None + @validator('event_session_id', always=True) + def event_session_id_lookup(cls, v, values, **kwargs): + log.setLevel(logging.WARNING) + log.debug(locals()) + + if values['event_session_id_random']: + return redis_lookup_id_random(record_id_random=values['event_session_id_random'], table_name='event_session') + return None + class Config: underscore_attrs_are_private = True allow_population_by_field_name = True diff --git a/app/routers/event_presenter.py b/app/routers/event_presenter.py index c21bdff..9128d8b 100644 --- a/app/routers/event_presenter.py +++ b/app/routers/event_presenter.py @@ -244,7 +244,8 @@ async def get_event_presenter_obj( inc_event_device_list: bool = False, # Part of event_presenter and under event_person obj inc_event_file_list: bool = False, # Part of event_presenter and under event_person obj inc_event_person: bool = False, - # inc_event_presentation: bool = False, # NOTE: Placehold for future? + inc_event_person_profile: bool = False, + inc_event_presentation: bool = False, # NOTE: Placehold for future? # inc_event_presentation_list: bool = False, # NOTE: Placehold for future? # inc_event_presenter_list: bool = False, # NOTE: Placehold for future? inc_event_registration: bool = False, # Under event_person obj @@ -275,7 +276,8 @@ async def get_event_presenter_obj( inc_event_device_list = inc_event_device_list, inc_event_file_list = inc_event_file_list, inc_event_person = inc_event_person, - # inc_event_presentation = inc_event_presentation, + inc_event_person_profile = inc_event_person_profile, + inc_event_presentation = inc_event_presentation, inc_event_registration = inc_event_registration, # inc_event_session = inc_event_session, inc_person = inc_person,