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

74
app/routers/membership_person.py
View File

@@ -30,9 +30,9 @@ async def post_membership_person_obj(
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
return_obj: bool = True,
commons: Common_Route_Params = Depends(common_route_params),
@@ -88,9 +88,9 @@ async def patch_membership_person_obj(
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
return_obj: bool = True,
commons: Common_Route_Params = Depends(common_route_params),
@@ -140,11 +140,11 @@ async def get_membership_person_obj(
# inc_contact: bool = False, # Per member
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False, # The primary membership group for a person
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
# inc_membership_person_profile: bool = False,
# inc_membership_person_profile_cust: bool = False, # Extended profile?
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
# inc_membership_person_type: bool = False,
# inc_order: bool = False,
@@ -171,14 +171,14 @@ async def get_membership_person_obj(
# inc_address = inc_address,
# inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_person_group_list = inc_membership_person_group_list,
# inc_membership_person_profile = inc_membership_person_profile,
# inc_membership_person_profile_cust = inc_membership_person_profile_cust,
inc_membership_profile = inc_membership_profile,
inc_membership_type = inc_membership_type,
# inc_membership_type_list = inc_membership_type_list, # All the membership types they are a part of.
# inc_membership_person_type = inc_membership_person_type,
# inc_membership_person_type_list = inc_membership_type_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
# inc_membership_person_type_list = inc_membership_person_type_list, # All the membership types they are a part of.
# inc_membership_type = inc_membership_type,
# inc_membership_type_list = inc_membership_type_list,
# inc_order = inc_order,
# inc_organization = inc_organization,
# inc_person = inc_person,
@@ -207,13 +207,13 @@ async def get_person_obj_membership_person(
# inc_contact: bool = False, # Per member
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False, # The primary membership group for a person
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
# inc_membership_person_group_list: bool = False,
# inc_membership_person_profile_cust: bool = False, # Extended profile?
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
# inc_membership_person_type: bool = False,
# inc_membership_type: bool = False,
# inc_order: bool = False,
# inc_organization: bool = False,
# inc_product: bool = False, # The product the person actually purchased for a member_type or member_group
@@ -241,9 +241,9 @@ async def get_person_obj_membership_person(
exclude_unset = commons.exclude_unset,
enabled = commons.enabled,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list, # List of membership group for a person - 2022-01-11
inc_membership_profile = inc_membership_profile, # Membership profile for a person - 2022-01-11
inc_membership_type = Fainc_membership_typelse, # Primary membership type for a person - 2022-01-11
inc_membership_person_group_list = inc_membership_person_group_list, # List of membership group for a person - 2022-01-11
inc_membership_person_profile = inc_membership_person_profile, # Membership profile for a person - 2022-01-11
inc_membership_person_type = inc_membership_person_type, # Primary membership type for a person - 2022-01-11
):
response_data = membership_person_rec_result
elif membership_person_rec_result is None: # Empty dict or None
@@ -267,13 +267,13 @@ async def get_account_obj_membership_person_list(
# inc_contact: bool = False,
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False,
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
# inc_membership_person: bool = False,
# inc_membership_person_list: bool = False,
# inc_membership_person_profile: bool = False,
# inc_membership_person_profile_cust: bool = False,
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
# inc_membership_type_list: bool = False,
# inc_order: bool = False,
# inc_organization: bool = False,
@@ -311,12 +311,12 @@ async def get_account_obj_membership_person_list(
# inc_address = inc_address,
# inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_person_group_list = inc_membership_person_group_list,
# inc_membership_person_group_list = inc_membership_person_group_list,
# inc_membership_person = inc_membership_person,
# inc_membership_person_list = inc_membership_person_list,
inc_membership_profile = inc_membership_profile,
inc_membership_type = inc_membership_type,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
# inc_order = inc_order,
# inc_organization = inc_organization,
# inc_person = inc_person,
@@ -342,9 +342,9 @@ async def lookup_membership_person_obj(
for_obj_id: Union[int,str],
for_obj_type: str = Query(..., min_length=2, max_length=50),
inc_membership_cfg: bool = True,
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
commons: Common_Route_Params = Depends(common_route_params),
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -394,9 +394,9 @@ async def lookup_membership_person_obj(
membership_person_obj = load_membership_person_obj(
membership_person_id = membership_person_id,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_profile = inc_membership_profile,
inc_membership_type = inc_membership_type,
inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
data = membership_person_obj
elif isinstance(membership_person_obj_result, list):
@@ -407,9 +407,9 @@ async def lookup_membership_person_obj(
load_membership_person_obj(
membership_person_id = membership_person_id,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_profile = inc_membership_profile,
inc_membership_type = inc_membership_type,
inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
)
data = membership_person_obj_li

7
app/routers/person.py
View File

@@ -373,7 +373,7 @@ async def get_person_obj(
# inc_membership_person_group_list: bool = False,
inc_membership_person: bool = False,
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
# inc_membership_person_type: bool = False,
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
# inc_membership_person_type_list: bool = False,
@@ -410,11 +410,10 @@ async def get_person_obj(
inc_journal_list = inc_journal_list,
# inc_journal_entry_list = inc_journal_entry_list,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
# inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person = inc_membership_person,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_type = inc_membership_type,
inc_membership_person_type = inc_membership_person_type,
# inc_membership_person_type = inc_membership_person_type,
inc_order_closed_count = inc_order_closed_count,
inc_order_line_list = inc_order_line_list,