diff --git a/app/methods/event_methods.py b/app/methods/event_methods.py index c2a862d..8c57be7 100644 --- a/app/methods/event_methods.py +++ b/app/methods/event_methods.py @@ -867,8 +867,9 @@ def get_account_id_w_event_id( # ### BEGIN ### API Event Methods ### update_event_obj() ### -# Updated 2021-09-28 -# NOTE: This has been partially moved to v4 to allowe for create_update conversion. +# Updated 2022-08-15 +# NOTE: This has been partially moved to v4 to allow for create_update conversion. 2021-09 +# NOTE: Commented out sections for create/update poc_person and user. 2022-08 def update_event_obj( event_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value. event_obj_up: Event_Base, # NOTE: rename from event_obj_up to event_dict_obj @@ -877,7 +878,7 @@ def update_event_obj( fail_any: bool = False, # Fail if any thing goes wrong for sub objects return_outline: bool = False, ) -> bool: - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) log.info('Checking requirements...') @@ -948,64 +949,64 @@ def update_event_obj( log.debug(create_update_event_cfg_obj_up_result) return False - if event_obj.poc_person_id and event_obj.poc_person: - event_outline['poc_person_id'] = None - poc_person_id = event_obj.poc_person_id - poc_person_obj_up = event_obj.poc_person - log.debug(poc_person_id) - log.debug(poc_person_obj_up) - if poc_person_obj_up_result := create_update_person_obj_v4b( - account_id = account_id, - person_dict_obj = poc_person_obj_up, - person_id = poc_person_id, - ): - log.debug(poc_person_obj_up_result) - else: - log.debug(poc_person_obj_up_result) - return False - elif event_obj.poc_person and not event_obj.poc_person.id: - # NOTE: This will blindly create a new person even if there was one associated but the event.poc_person_id was not found. - poc_person_obj_in = event_obj.poc_person - log.debug(poc_person_obj_in) - if poc_person_obj_in_result := create_update_person_obj_v4b(account_id=account_id, person_dict_obj=poc_person_obj_in): - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(poc_person_obj_in_result) - event_obj.poc_person_id = poc_person_obj_in_result - else: - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(poc_person_obj_in_result) - return False + # if event_obj.poc_person_id and event_obj.poc_person: + # event_outline['poc_person_id'] = None + # poc_person_id = event_obj.poc_person_id + # poc_person_obj_up = event_obj.poc_person + # log.debug(poc_person_id) + # log.debug(poc_person_obj_up) + # if poc_person_obj_up_result := create_update_person_obj_v4b( + # account_id = account_id, + # person_dict_obj = poc_person_obj_up, + # person_id = poc_person_id, + # ): + # log.debug(poc_person_obj_up_result) + # else: + # log.debug(poc_person_obj_up_result) + # return False + # elif event_obj.poc_person and not event_obj.poc_person.id: + # # NOTE: This will blindly create a new person even if there was one associated but the event.poc_person_id was not found. + # poc_person_obj_in = event_obj.poc_person + # log.debug(poc_person_obj_in) + # if poc_person_obj_in_result := create_update_person_obj_v4b(account_id=account_id, person_dict_obj=poc_person_obj_in): + # # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.debug(poc_person_obj_in_result) + # event_obj.poc_person_id = poc_person_obj_in_result + # else: + # # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.debug(poc_person_obj_in_result) + # return False - if event_obj.user_id and event_obj.user: - event_outline['user_id'] = None - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - from app.methods.user_methods import update_user_obj - user_id = event_obj.user_id - user_obj_up = event_obj.user - log.debug(user_id) - log.debug(user_obj_up) - if user_obj_up_result := update_user_obj( - user_id = user_id, - user_dict_obj = user_obj_up, - create_sub_obj = create_sub_obj, - ): - log.debug(user_obj_up_result) - else: - log.debug(user_obj_up_result) - return False - elif event_obj.user and not event_obj.user.id: - # NOTE: This will blindly create a new user even if there was one associated but the event.user_id was not found. - from app.methods.user_methods import create_user_obj - user_obj_in = event_obj.user - log.debug(user_obj_in) - if user_obj_in_result := create_user_obj(account_id=account_id, user_dict_obj=user_obj_in): - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(user_obj_in_result) - event_obj.user_id = user_obj_in_result - else: - # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(user_obj_in_result) - return False + # if event_obj.user_id and event_obj.user: + # event_outline['user_id'] = None + # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # from app.methods.user_methods import update_user_obj + # user_id = event_obj.user_id + # user_obj_up = event_obj.user + # log.debug(user_id) + # log.debug(user_obj_up) + # if user_obj_up_result := update_user_obj( + # user_id = user_id, + # user_dict_obj = user_obj_up, + # create_sub_obj = create_sub_obj, + # ): + # log.debug(user_obj_up_result) + # else: + # log.debug(user_obj_up_result) + # return False + # elif event_obj.user and not event_obj.user.id: + # # NOTE: This will blindly create a new user even if there was one associated but the event.user_id was not found. + # from app.methods.user_methods import create_user_obj + # user_obj_in = event_obj.user + # log.debug(user_obj_in) + # if user_obj_in_result := create_user_obj(account_id=account_id, user_dict_obj=user_obj_in): + # # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.debug(user_obj_in_result) + # event_obj.user_id = user_obj_in_result + # else: + # # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.debug(user_obj_in_result) + # return False # event_dict_up = event_obj.dict(by_alias=False, exclude_unset=True, exclude={'event_abstract_list', 'event_badge', 'event_exhibit_list', 'event_file_list', 'event_location_list', 'event_presentation_list', 'event_presenter_list', 'event_registration', 'event_session', 'event_track', 'person', 'user'}) # log.debug(event_dict_up) diff --git a/app/routers/event.py b/app/routers/event.py index 4b38bfd..2a3fdf1 100644 --- a/app/routers/event.py +++ b/app/routers/event.py @@ -27,7 +27,7 @@ async def post_event_obj( exclude_unset: Optional[bool] = True, response: Response = Response, ): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) obj_type = 'event' @@ -57,7 +57,7 @@ async def patch_event( exclude_none: Optional[bool] = True, response: Response = Response, ): - 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