A lot of code clean up

This commit is contained in:
Scott Idem
2022-01-18 20:03:46 -05:00
parent d6caa819b0
commit 3d2c7282dd
10 changed files with 722 additions and 440 deletions

View File

@@ -456,8 +456,8 @@ def create_membership_person_obj(
if membership_person_obj.membership_person_group_list:
log.info('Looping through Membership Person Group object list')
for membership_person_group_obj in membership_person_group_obj_list_result:
if membership_person_group_obj.id:
for membership_person_group_obj in membership_person_obj.membership_person_group_list:
if membership_person_group_id := membership_person_group_obj.id:
log.info('Updating Membership Person Group object')
if membership_person_group_update_result := update_membership_person_group_obj(
membership_person_group_id = membership_person_group_id,
@@ -474,6 +474,7 @@ def create_membership_person_obj(
if membership_person_obj.membership_person_type and membership_person_obj.membership_person_type.id:
log.info('Updating Membership Person Type object')
membership_person_type_id = membership_person_obj.membership_person_type.id
if membership_person_type_update_result := update_membership_person_type_obj(
membership_person_type_id = membership_person_type_id,
membership_person_type_dict_obj = membership_person_obj.membership_person_type,
@@ -555,26 +556,27 @@ def update_membership_person_obj(
membership_person_outline['membership_person_type'] = {}
membership_person_outline['membership_person_type_id'] = None
if membership_person_obj.membership_person_type_list:
if membership_person_obj.membership_person_group_list:
log.info('Looping through Membership Person Group object list')
for membership_person_type_obj in membership_person_type_obj_list_result:
if membership_person_type_obj.id:
for membership_person_group_obj in membership_person_obj.membership_person_group_list:
if membership_person_group_id := membership_person_group_obj.id:
log.info('Updating Membership Person Group object')
if membership_person_type_update_result := update_membership_person_type_obj(
membership_person_type_id = membership_person_type_id,
membership_person_type_dict_obj = membership_person_type_obj,
if membership_person_group_update_result := update_membership_person_group_obj(
membership_person_group_id = membership_person_group_id,
membership_person_group_dict_obj = membership_person_group_obj,
): pass
else: return False
else:
log.info('Creating Membership Person Group object')
if membership_person_type_create_result := create_membership_person_type_obj(
if membership_person_group_create_result := create_membership_person_group_obj(
membership_person_id = membership_person_id,
membership_person_type_dict_obj = membership_person_type_obj,
membership_person_group_dict_obj = membership_person_group_obj,
): pass
else: pass
if membership_person_obj.membership_person_type and membership_person_obj.membership_person_type.id:
log.info('Updating Membership Person Type object')
membership_person_type_id = membership_person_obj.membership_person_type.id
if membership_person_type_update_result := update_membership_person_type_obj(
membership_person_type_id = membership_person_type_id,
membership_person_type_dict_obj = membership_person_obj.membership_person_type,