From 253ed6c19b95517603527107fcd0802993e4208c Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 11 Jan 2022 12:00:33 -0500 Subject: [PATCH] Code clean up. Membership Person --- app/routers/membership_person.py | 195 +++++++++++++++---------------- 1 file changed, 93 insertions(+), 102 deletions(-) diff --git a/app/routers/membership_person.py b/app/routers/membership_person.py index 644067f..16f67a1 100644 --- a/app/routers/membership_person.py +++ b/app/routers/membership_person.py @@ -50,9 +50,10 @@ async def post_membership_person_obj( create_sub_obj: bool = False, fail_any: bool = True, # Fail if any thing goes wrong for sub objects - inc_membership_group_person_list: bool = False, - inc_membership_type_person: bool = False, - inc_contact: bool = False, + 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 return_obj: bool = True, commons: Common_Route_Params = Depends(common_route_params), @@ -154,9 +155,10 @@ async def patch_membership_person_obj_update( create_sub_obj: bool = False, fail_any: bool = True, # Fail if any thing goes wrong for sub objects - inc_membership_group_person_list: bool = False, - inc_membership_type_person: bool = False, - inc_contact: bool = False, + 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 return_obj: bool = True, commons: Common_Route_Params = Depends(common_route_params), @@ -198,24 +200,24 @@ async def patch_membership_person_obj_update( # ### BEGIN ### API Membership Person ### patch_membership_person_obj_update() ### -@router.get('/membership/person/list', response_model=Resp_Body_Base) -async def get_membership_person_obj_li( - for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), - for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22), - commons: Common_Route_Params = Depends(common_route_params), - ): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(locals()) +# @router.get('/membership/person/list', response_model=Resp_Body_Base) +# async def get_membership_person_obj_li( +# for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), +# for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22), +# commons: Common_Route_Params = Depends(common_route_params), +# ): +# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL +# log.debug(locals()) - obj_type = 'membership_person' - result = get_obj_li_template( - obj_type=obj_type, - for_obj_type=for_obj_type, - for_obj_id=for_obj_id, - by_alias=True, - exclude_unset=True, - ) - return result +# obj_type = 'membership_person' +# result = get_obj_li_template( +# obj_type=obj_type, +# for_obj_type=for_obj_type, +# for_obj_id=for_obj_id, +# by_alias=True, +# exclude_unset=True, +# ) +# return result @@ -225,30 +227,31 @@ async def get_membership_person_obj_li( async def get_account_obj_membership_person_list( account_id: str = Query(..., min_length=1, max_length=22), # inc_account_cfg: bool = False, - inc_address: bool = False, # Under contact - inc_contact: bool = False, + # inc_address: bool = False, # Under contact + # inc_contact: bool = False, inc_membership_cfg: bool = False, # inc_membership_group: bool = False, - inc_membership_group_list: bool = False, + inc_membership_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_type: 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_type_list: bool = False, # inc_order: bool = False, - inc_organization: bool = False, - inc_person: bool = False, - inc_product: bool = False, - inc_product_list: bool = False, - inc_user: bool = False, + # inc_organization: bool = False, + # inc_person: bool = False, + # inc_product: bool = False, + # inc_product_list: bool = False, + # inc_user: bool = False, commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass - else: return mk_resp(data=None, status_code=404) + else: return mk_resp(data=None, status_code=404, response=commons.response) response_data = None # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL @@ -269,21 +272,21 @@ async def get_account_obj_membership_person_list( exclude_unset = commons.exclude_unset, # model_as_dict = commons.model_as_dict, enabled = commons.enabled, - inc_address = inc_address, - inc_contact = inc_contact, + # inc_address = inc_address, + # inc_contact = inc_contact, inc_membership_cfg = inc_membership_cfg, inc_membership_group_list = inc_membership_group_list, # inc_membership_group_person_list = inc_membership_group_person_list, # inc_membership_person = inc_membership_person, # inc_membership_person_list = inc_membership_person_list, - inc_membership_person_profile = inc_membership_person_profile, + inc_membership_profile = inc_membership_profile, inc_membership_type = inc_membership_type, # inc_order = inc_order, - inc_organization = inc_organization, - inc_person = inc_person, - inc_product = inc_product, + # inc_organization = inc_organization, + # inc_person = inc_person, + # inc_product = inc_product, # inc_product_list = inc_product_list, - inc_user = inc_user, + # inc_user = inc_user, ): membership_person_result_list.append(load_membership_person_result) else: @@ -292,7 +295,7 @@ async def get_account_obj_membership_person_list( else: return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request - return mk_resp(data=response_data) + return mk_resp(data=response_data, response=commons.response) # ### END ### API Membership Person ### get_account_obj_membership_person_list() ### @@ -301,21 +304,21 @@ async def get_account_obj_membership_person_list( @router.get('/person/{person_id}/membership/person', response_model=Resp_Body_Base) async def get_person_obj_membership_person( person_id: str = Query(..., min_length=11, max_length=22), - inc_address: bool = False, - inc_contact: bool = False, + # inc_address: bool = False, # Per member + # 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, # The list of all membership group options a person can select - inc_membership_group_person_list: bool = False, - inc_membership_person_profile: bool = False, # Profile? - inc_membership_person_profile_cust: bool = False, # Extended profile? - inc_membership_type: bool = False, # The primary membership type for a person + inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11 + # inc_membership_group_person_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_type_list: bool = False, # The list of all membership types a person is a part of - inc_membership_type_person: bool = False, + # inc_membership_type_person: 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 - inc_product_list: bool = False, # The list of products that give access to a member_type or member_group + # inc_product: bool = False, # The product the person actually purchased for a member_type or member_group + # inc_product_list: bool = False, # The list of products that give access to a member_type or member_group # inc_user: bool = False, commons: Common_Route_Params = Depends(common_route_params), ): @@ -337,24 +340,11 @@ async def get_person_obj_membership_person( limit = commons.limit, by_alias = commons.by_alias, exclude_unset = commons.exclude_unset, - # model_as_dict = True, enabled = commons.enabled, - inc_address = inc_address, - inc_contact = inc_contact, inc_membership_cfg = inc_membership_cfg, - # inc_membership_group = inc_membership_group, # The primary membership group, if there is one. - inc_membership_group_list = inc_membership_group_list, # All membership groups they are a part of. - inc_membership_group_person_list = inc_membership_group_person_list, - inc_membership_person_profile = inc_membership_person_profile, - inc_membership_person_profile_cust = inc_membership_person_profile_cust, - inc_membership_type = inc_membership_type, # The primary membership type, if there is one. - # inc_membership_type_list = inc_membership_type_list, # All the membership types they are a part of. - inc_membership_type_person = inc_membership_type_person, - # inc_membership_type_person_list = inc_membership_type_list, - # inc_person = inc_person, - inc_product = inc_product, - # inc_product_list = inc_product_list, - # inc_user = inc_user, + 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 ): response_data = membership_person_rec_result elif membership_person_rec_result is None: # Empty dict or None @@ -374,10 +364,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_person_profile: bool = True, - inc_membership_person_profile_cust: bool = True, - inc_person: bool = True, - inc_user: 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 commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL @@ -427,10 +416,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_person_profile = inc_membership_person_profile, - inc_membership_person_profile_cust = inc_membership_person_profile_cust, - inc_person = inc_person, - inc_user = inc_user, + inc_membership_group_list = inc_membership_group_list, + inc_membership_profile = inc_membership_profile, + inc_membership_type = inc_membership_type, ).dict(by_alias=by_alias, exclude_unset=exclude_unset) data = membership_person_obj elif isinstance(membership_person_obj_result, list): @@ -441,17 +429,16 @@ async def lookup_membership_person_obj( load_membership_person_obj( membership_person_id = membership_person_id, inc_membership_cfg = inc_membership_cfg, - inc_membership_person_profile = inc_membership_person_profile, - inc_membership_person_profile_cust = inc_membership_person_profile_cust, - inc_person = inc_person, - inc_user = inc_user, + inc_membership_group_list = inc_membership_group_list, + inc_membership_profile = inc_membership_profile, + inc_membership_type = inc_membership_type, ).dict(by_alias=by_alias, exclude_unset=exclude_unset) ) data = membership_person_obj_li else: log.debug(membership_person_obj_result) - return mk_resp(data=None, status_code=404) # Not Found - return mk_resp(data=data) + return mk_resp(data=None, status_code=404, response=commons.response) # Not Found + return mk_resp(data=data, response=commons.response) # ### BEGIN ### API Membership Person ### get_membership_person_obj() ### @@ -459,19 +446,22 @@ async def lookup_membership_person_obj( @router.get('/membership/person/{membership_person_id}', response_model=Resp_Body_Base) async def get_membership_person_obj( membership_person_id: str = Query(..., min_length=11, max_length=22), - inc_address: bool = False, # Per member - inc_contact: bool = False, # Per member + # inc_address: bool = False, # Per member + # inc_contact: bool = False, # Per member inc_membership_cfg: bool = False, - inc_membership_group_list: bool = False, # List of groups per member - inc_membership_person_profile: bool = False, - inc_membership_person_profile_cust: bool = False, # Extended profile? - inc_membership_type: bool = False, - inc_membership_type_person: 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_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_type_list: bool = False, # The list of all membership types a person is a part of + # inc_membership_type_person: bool = False, # inc_order: bool = False, # inc_organization: bool = False, - inc_person: bool = False, - inc_product: bool = False, # Per member or group member belongs to - inc_product_list: bool = False, + # inc_person: bool = False, + # inc_product: bool = False, # Per member or group member belongs to + # inc_product_list: bool = False, # inc_user: bool = False, # Per member commons: Common_Route_Params = Depends(common_route_params), ): @@ -488,21 +478,22 @@ async def get_membership_person_obj( exclude_unset = commons.exclude_unset, # model_as_dict = commons.model_as_dict, enabled = commons.enabled, - inc_address = inc_address, - inc_contact = inc_contact, + # 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_profile = inc_membership_person_profile, - inc_membership_person_profile_cust = inc_membership_person_profile_cust, - inc_membership_type = inc_membership_type, # The primary membership type, if there is one. + # 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_type_person = inc_membership_type_person, + # inc_membership_type_person = inc_membership_type_person, # inc_membership_type_person_list = inc_membership_type_list, # inc_order = inc_order, # inc_organization = inc_organization, - inc_person = inc_person, - inc_product = inc_product, - inc_product_list = inc_product_list, + # inc_person = inc_person, + # inc_product = inc_product, + # inc_product_list = inc_product_list, # inc_user = inc_user, ): response_data = membership_person_rec_result