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

Code clean up. More changes to membership tables, views, routes, methods, and models renamed.

Browse Source
This commit is contained in:
Scott Idem
2022-01-11 16:56:26 -05:00
parent 163e57ef76
commit 6e764b21e1
7 changed files with 79 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/methods/membership_group_methods.py
View File

@@ -67,7 +67,7 @@ def load_membership_group_obj(
else: membership_group_obj.cfg = None
# Updated 2021-06-23
if inc_membership_person_group_list:
if inc_membership_person_list:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if membership_person_group_rec_list_result := get_membership_person_group_rec_list(
for_obj_type = 'membership_group',
@@ -84,13 +84,11 @@ def load_membership_group_obj(
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
enabled = enabled,
inc_membership_person = inc_membership_person,
# inc_membership_group_list = inc_membership_group_list,
# inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
# inc_organization = inc_organization,
inc_person = inc_person,
# inc_product = inc_product,
inc_user = inc_user,
):
membership_person_group_result_list.append(load_membership_person_group_result)
else: membership_person_group_result_list.append(None)
@@ -236,11 +234,13 @@ def get_membership_group_rec_list(
# ### BEGIN ### API Membership Group Methods ### create_membership_group_obj() ###
def create_membership_group_obj(membership_group_obj_new:Membership_Group_Base) -> bool|int:
def create_membership_group_obj(
membership_group_dict_obj: Membership_Group_Base
) -> bool|dict|int:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
membership_group_obj_data = membership_group_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
membership_group_obj_data = membership_group_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
if membership_group_obj_in_result := sql_insert(
data=membership_group_obj_data,
@@ -262,7 +262,7 @@ def create_membership_group_obj(membership_group_obj_new:Membership_Group_Base)
# ### BEGIN ### API Membership Group Methods ### update_membership_group_obj() ###
def update_membership_group_obj(
membership_group_id: int|str, # This allows for updating of the id_random value.
membership_group_obj_up: Membership_Group_Base,
membership_group_dict_obj: Membership_Group_Base,
create_sub_obj: bool = False,
) -> bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -271,19 +271,19 @@ def update_membership_group_obj(
if membership_group_id := redis_lookup_id_random(record_id_random=membership_group_id, table_name='membership_group'): pass
else: return False
membership_group_obj_up.id = membership_group_id
membership_group_dict_obj.id = membership_group_id
log.debug(membership_group_obj_up)
log.debug(membership_group_obj_up.dict(by_alias=False, exclude_unset=True))
# log.debug(membership_group_obj_up.dict(by_alias=False, exclude_unset=False))
log.debug(membership_group_dict_obj)
log.debug(membership_group_dict_obj.dict(by_alias=False, exclude_unset=True))
# log.debug(membership_group_dict_obj.dict(by_alias=False, exclude_unset=False))
membership_group_dict_up = membership_group_obj_up.dict(by_alias=False, exclude_unset=True)
membership_group_dict_up = membership_group_dict_obj.dict(by_alias=False, exclude_unset=True)
log.debug(membership_group_dict_up)
if membership_group_obj_up_result := sql_update(data=membership_group_dict_up, table_name='membership_group', rm_id_random=True):
log.debug(membership_group_obj_up_result)
if membership_group_dict_obj_result := sql_update(data=membership_group_dict_up, table_name='membership_group', rm_id_random=True):
log.debug(membership_group_dict_obj_result)
return True
else:
log.debug(membership_group_obj_up_result)
log.debug(membership_group_dict_obj_result)
return False
# ### END ### API Membership Group Methods ### update_membership_group_obj() ###