Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix and minor clean up

Browse Source
This commit is contained in:
Scott Idem
2022-08-15 15:54:26 -04:00
parent 42a9bd9f32
commit c8c2c7af95
2 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
app/methods/event_methods.py
View File

@@ -867,8 +867,9 @@ def get_account_id_w_event_id(
# ### BEGIN ### API Event Methods ### update_event_obj() ### # ### BEGIN ### API Event Methods ### update_event_obj() ###
# Updated 2021-09-28 # Updated 2022-08-15
# NOTE: This has been partially moved to v4 to allowe for create_update conversion. # 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( 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_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 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 fail_any: bool = False, # Fail if any thing goes wrong for sub objects
return_outline: bool = False, return_outline: bool = False,
) -> bool: ) -> 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.debug(locals())
log.info('Checking requirements...') log.info('Checking requirements...')
@@ -948,64 +949,64 @@ def update_event_obj(
log.debug(create_update_event_cfg_obj_up_result) log.debug(create_update_event_cfg_obj_up_result)
return False return False
if event_obj.poc_person_id and event_obj.poc_person: # if event_obj.poc_person_id and event_obj.poc_person:
event_outline['poc_person_id'] = None # event_outline['poc_person_id'] = None
poc_person_id = event_obj.poc_person_id # poc_person_id = event_obj.poc_person_id
poc_person_obj_up = event_obj.poc_person # poc_person_obj_up = event_obj.poc_person
log.debug(poc_person_id) # log.debug(poc_person_id)
log.debug(poc_person_obj_up) # log.debug(poc_person_obj_up)
if poc_person_obj_up_result := create_update_person_obj_v4b( # if poc_person_obj_up_result := create_update_person_obj_v4b(
account_id = account_id, # account_id = account_id,
person_dict_obj = poc_person_obj_up, # person_dict_obj = poc_person_obj_up,
person_id = poc_person_id, # person_id = poc_person_id,
): # ):
log.debug(poc_person_obj_up_result) # log.debug(poc_person_obj_up_result)
else: # else:
log.debug(poc_person_obj_up_result) # log.debug(poc_person_obj_up_result)
return False # return False
elif event_obj.poc_person and not event_obj.poc_person.id: # 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. # # 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 # poc_person_obj_in = event_obj.poc_person
log.debug(poc_person_obj_in) # 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): # 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.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(poc_person_obj_in_result) # log.debug(poc_person_obj_in_result)
event_obj.poc_person_id = poc_person_obj_in_result # event_obj.poc_person_id = poc_person_obj_in_result
else: # else:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(poc_person_obj_in_result) # log.debug(poc_person_obj_in_result)
return False # return False
if event_obj.user_id and event_obj.user: # if event_obj.user_id and event_obj.user:
event_outline['user_id'] = None # event_outline['user_id'] = None
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
from app.methods.user_methods import update_user_obj # from app.methods.user_methods import update_user_obj
user_id = event_obj.user_id # user_id = event_obj.user_id
user_obj_up = event_obj.user # user_obj_up = event_obj.user
log.debug(user_id) # log.debug(user_id)
log.debug(user_obj_up) # log.debug(user_obj_up)
if user_obj_up_result := update_user_obj( # if user_obj_up_result := update_user_obj(
user_id = user_id, # user_id = user_id,
user_dict_obj = user_obj_up, # user_dict_obj = user_obj_up,
create_sub_obj = create_sub_obj, # create_sub_obj = create_sub_obj,
): # ):
log.debug(user_obj_up_result) # log.debug(user_obj_up_result)
else: # else:
log.debug(user_obj_up_result) # log.debug(user_obj_up_result)
return False # return False
elif event_obj.user and not event_obj.user.id: # 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. # # 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 # from app.methods.user_methods import create_user_obj
user_obj_in = event_obj.user # user_obj_in = event_obj.user
log.debug(user_obj_in) # log.debug(user_obj_in)
if user_obj_in_result := create_user_obj(account_id=account_id, user_dict_obj=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.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(user_obj_in_result) # log.debug(user_obj_in_result)
event_obj.user_id = user_obj_in_result # event_obj.user_id = user_obj_in_result
else: # else:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(user_obj_in_result) # log.debug(user_obj_in_result)
return False # 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'}) # 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) # log.debug(event_dict_up)

4
app/routers/event.py
View File

@@ -27,7 +27,7 @@ async def post_event_obj(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, 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()) log.debug(locals())
obj_type = 'event' obj_type = 'event'
@@ -57,7 +57,7 @@ async def patch_event(
exclude_none: Optional[bool] = True, exclude_none: Optional[bool] = True,
response: Response = Response, 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()) log.debug(locals())
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass