From acf684201786ae73471b97a57b677e2e2c68aa08 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 26 Aug 2021 04:21:39 -0400 Subject: [PATCH] Working on stuff related to session proposals. Lots of bug fixes....... --- app/methods/event_session_methods.py | 10 ++-- app/models/event_file_models.py | 71 +++++++++++++++++++++++----- app/routers/contact.py | 2 +- app/routers/person.py | 6 +-- app/routers/user.py | 2 +- 5 files changed, 69 insertions(+), 22 deletions(-) diff --git a/app/methods/event_session_methods.py b/app/methods/event_session_methods.py index eefe8cb..2ff99f3 100644 --- a/app/methods/event_session_methods.py +++ b/app/methods/event_session_methods.py @@ -184,11 +184,11 @@ def load_event_session_obj( if inc_poc_event_person: poc_event_person_obj = load_event_person_obj( - event_person_id=poc_event_person_id, - inc_address=inc_address, - inc_contact=inc_contact, - inc_person=inc_person, - inc_user=inc_user + event_person_id = poc_event_person_id, + inc_address = inc_address, + inc_contact = inc_contact, + inc_person = inc_person, + inc_user = inc_user, ) log.debug(poc_event_person_obj) event_session_obj.poc_event_person = poc_event_person_obj diff --git a/app/models/event_file_models.py b/app/models/event_file_models.py index 242b72d..2b8c044 100644 --- a/app/models/event_file_models.py +++ b/app/models/event_file_models.py @@ -12,7 +12,7 @@ from app.models.hosted_file_models import Hosted_File_Base class Event_File_Base(BaseModel): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) id_random: Optional[str] = Field( @@ -28,8 +28,10 @@ class Event_File_Base(BaseModel): hosted_file_id: Optional[int] for_type: Optional[str] - for_id: Optional[int] # NOTE: This is reversed with for_id_random - for_id_random: Optional[str] # NOTE: This is reversed with for_id + # for_id: Optional[int] # NOTE: This is reversed with for_id_random I HAVE NO IDEA 2021-08-26 4:05 AM + # for_id_random: Optional[str] # NOTE: This is reversed with for_id I HAVE NO IDEA 2021-08-26 4:05 AM + for_id_random: Optional[str] + for_id: Optional[int] event_id_random: Optional[str] event_id: Optional[int] @@ -110,6 +112,15 @@ class Event_File_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['event_id_random'], table_name='event') return None + @validator('event_exhibit_id', always=True) + def event_exhibit_id_lookup(cls, v, values, **kwargs): + log.setLevel(logging.WARNING) + log.debug(locals()) + + if values['event_exhibit_id_random']: + return redis_lookup_id_random(record_id_random=values['event_exhibit_id_random'], table_name='event_exhibit') + return None + @validator('event_location_id', always=True) def event_location_id_lookup(cls, v, values, **kwargs): log.setLevel(logging.WARNING) @@ -119,6 +130,33 @@ class Event_File_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['event_location_id_random'], table_name='event_location') 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 + + @validator('event_presenter_id', always=True) + def event_presenter_id_lookup(cls, v, values, **kwargs): + log.setLevel(logging.WARNING) + log.debug(locals()) + + if values['event_presenter_id_random']: + return redis_lookup_id_random(record_id_random=values['event_presenter_id_random'], table_name='event_presenter') + 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 + @validator('event_track_id', always=True) def event_track_id_lookup(cls, v, values, **kwargs): log.setLevel(logging.WARNING) @@ -128,18 +166,27 @@ class Event_File_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['event_track_id_random'], table_name='event_track') return None + # @validator('for_id_random', always=True) + # def for_id_random_lookup(cls, v, values, **kwargs): + # log.setLevel(logging.DEBUG) + # log.debug(locals()) + + # if values['for_id'] and values['for_type']: + # return get_id_random(record_id=values['for_id'], table_name=values['for_type']) + # return None + + @validator('for_id', always=True) + def for_id_lookup(cls, v, values, **kwargs): + log.setLevel(logging.DEBUG) + log.debug(locals()) + + if values['for_id_random'] and values['for_type']: + return redis_lookup_id_random(record_id_random=values['for_id_random'], table_name=values['for_type']) + return None + class Config: underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields - @validator('for_id_random', always=True) - def for_id_random_lookup(cls, v, values, **kwargs): - log.setLevel(logging.DEBUG) - log.debug(locals()) - - if values['for_id'] and values['for_type']: - return get_id_random(record_id=values['for_id'], table_name=values['for_type']) - return None - #Event_File_Base.update_forward_refs() diff --git a/app/routers/contact.py b/app/routers/contact.py index 7cad739..deffffb 100644 --- a/app/routers/contact.py +++ b/app/routers/contact.py @@ -27,7 +27,7 @@ async def post_contact_obj( exclude_unset: Optional[bool] = True, response: Response = Response, ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) obj_type = 'contact' diff --git a/app/routers/person.py b/app/routers/person.py index 7efd92f..4a4dc7b 100644 --- a/app/routers/person.py +++ b/app/routers/person.py @@ -89,7 +89,7 @@ async def post_person_obj_new_v3( exclude_unset: bool = True, response: Response = Response, ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) log.debug(person_obj.account_id) @@ -114,7 +114,7 @@ async def post_person_obj_new_v3( person_id = create_person_obj_result if return_obj: if load_person_obj_result := load_person_obj( - person_id=person_id, + person_id = person_id, enabled = enabled, inc_address = inc_address, inc_contact = inc_contact, @@ -204,7 +204,7 @@ async def post_person_json( exclude_none: Optional[bool] = True, response: Response = Response, ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) # if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass diff --git a/app/routers/user.py b/app/routers/user.py index 1963a4b..88eae4f 100644 --- a/app/routers/user.py +++ b/app/routers/user.py @@ -608,7 +608,7 @@ async def get_user_obj( exclude_unset: Optional[bool] = True, response: Response = Response, ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass