Code clean up. More changes to membership tables, views, routes, methods, and models renamed.
This commit is contained in:
Scott Idem
@@ -18,27 +18,6 @@ from app.models.response_models import Resp_Body_Base, mk_resp
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# @router.post('/membership/person', response_model=Resp_Body_Base)
|
||||
# async def post_membership_person_obj(
|
||||
# obj: Membership_Person_Base,
|
||||
# return_obj: Optional[bool] = True,
|
||||
# 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'
|
||||
# obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
|
||||
# result = post_obj_template(
|
||||
# obj_type=obj_type,
|
||||
# data=obj_data_dict,
|
||||
# return_obj=True,
|
||||
# by_alias=True,
|
||||
# exclude_unset=True,
|
||||
# )
|
||||
# return result
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person ### post_membership_person_obj() ###
|
||||
# Using create_membership_person_obj()
|
||||
# Updated 2022-01-11
|
||||
@@ -97,59 +76,11 @@ async def post_membership_person_obj(
|
||||
# ### END ### API Membership Person ### post_membership_person_obj() ###
|
||||
|
||||
|
||||
# if isinstance(create_membership_person_obj_result, int):
|
||||
# membership_person_id = create_membership_person_obj_result
|
||||
# if return_obj:
|
||||
# if load_membership_person_obj_result := load_membership_person_obj(
|
||||
# membership_person_id = membership_person_id,
|
||||
# enabled = commons.enabled,
|
||||
# ):
|
||||
# data = load_membership_person_obj_result
|
||||
# else:
|
||||
# data = False
|
||||
# return mk_resp(data=data, response=commons.response, status_message='The membership person was probably created, but there was a problem returning the data.')
|
||||
# else:
|
||||
# membership_person_id = create_membership_person_obj_result
|
||||
# membership_person_id_random = get_id_random(record_id=membership_person_id, table_name='membership_person')
|
||||
# data = {}
|
||||
# data['membership_person_id'] = membership_person_id
|
||||
# data['membership_person_id_random'] = membership_person_id_random
|
||||
# return mk_resp(data=data, response=commons.response, status_message='The membership person was created.')
|
||||
# else:
|
||||
# return mk_resp(data=False, status_code=400, response=commons.response, status_message='The result from trying to create a membership person was unexpected.')
|
||||
# ### BEGIN ### API Membership Person ### post_membership_person_obj() ###
|
||||
|
||||
|
||||
# @router.patch('/membership/person/{obj_id}', response_model=Resp_Body_Base)
|
||||
# async def patch_membership_person_obj(
|
||||
# obj_id: str = Query(..., min_length=11, max_length=22),
|
||||
# obj: Membership_Person_Base = None,
|
||||
# return_obj: Optional[bool] = True,
|
||||
# commons: Common_Route_Params = Depends(common_route_params),
|
||||
# ):
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(locals())
|
||||
|
||||
# obj_type = 'membership_person'
|
||||
# obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
|
||||
# obj_data_dict['id'] = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_type)
|
||||
# obj_data_dict['id_random'] = obj_id
|
||||
# result = patch_obj_template(
|
||||
# obj_type=obj_type,
|
||||
# data=obj_data_dict,
|
||||
# obj_id=obj_id,
|
||||
# return_obj=True,
|
||||
# by_alias=True,
|
||||
# exclude_unset=True,
|
||||
# )
|
||||
# return result
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person ### patch_membership_person_obj_update() ###
|
||||
# ### BEGIN ### API Membership Person ### patch_membership_person_obj() ###
|
||||
# Using update_membership_person_obj()
|
||||
# Updated 2022-01-11
|
||||
@router.patch('/membership/person/{membership_person_id}', response_model=Resp_Body_Base)
|
||||
async def patch_membership_person_obj_update(
|
||||
async def patch_membership_person_obj(
|
||||
membership_person_obj: Membership_Person_Base,
|
||||
membership_person_id: Optional[str] = Query(..., min_length=11, max_length=22),
|
||||
|
||||
@@ -197,30 +128,133 @@ async def patch_membership_person_obj_update(
|
||||
data['membership_person_id'] = membership_person_id
|
||||
data['membership_person_id_random'] = membership_person_id_random
|
||||
return mk_resp(data=data, response=commons.response, status_message='The membership person was updated.')
|
||||
# ### END ### API Membership Person ### patch_membership_person_obj_update() ###
|
||||
# ### END ### API Membership Person ### patch_membership_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person ### patch_membership_person_obj_update() ###
|
||||
# ### BEGIN ### API Membership Person ### get_membership_person_obj() ###
|
||||
# Updated 2022-01-11
|
||||
@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_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_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_person_type: 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_user: bool = False, # Per member
|
||||
commons: Common_Route_Params = Depends(common_route_params),
|
||||
):
|
||||
log.setLevel(logging.INFO) # 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())
|
||||
if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass
|
||||
else: return mk_resp(data=None, status_code=404, response=commons.response)
|
||||
|
||||
# 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
|
||||
if membership_person_rec_result := load_membership_person_obj(
|
||||
membership_person_id = membership_person_id,
|
||||
limit = commons.limit,
|
||||
by_alias = commons.by_alias,
|
||||
exclude_unset = commons.exclude_unset,
|
||||
# model_as_dict = commons.model_as_dict,
|
||||
enabled = commons.enabled,
|
||||
# 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_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_order = inc_order,
|
||||
# inc_organization = inc_organization,
|
||||
# inc_person = inc_person,
|
||||
# inc_product = inc_product,
|
||||
# inc_product_list = inc_product_list,
|
||||
# inc_user = inc_user,
|
||||
):
|
||||
response_data = membership_person_rec_result
|
||||
elif membership_person_rec_result is None: # Empty dict or None
|
||||
log.info('No results')
|
||||
return mk_resp(data=False, status_code=404, response=commons.response) # Not Found
|
||||
else:
|
||||
log.warning('Likely bad request')
|
||||
return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data, response=commons.response)
|
||||
# ### END ### API Membership Person ### get_membership_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person ### get_person_obj_membership_person() ###
|
||||
# Updated 2022-01-11
|
||||
@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, # 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, # 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_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,
|
||||
# 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_user: bool = False,
|
||||
commons: Common_Route_Params = Depends(common_route_params),
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
|
||||
else: return mk_resp(data=None, status_code=404, response=commons.response)
|
||||
|
||||
if membership_person_rec := sql_select(table_name='membership_person', field_name='person_id', field_value=person_id): pass
|
||||
else: return mk_resp(data=None, status_code=404, response=commons.response)
|
||||
|
||||
log.debug(membership_person_rec)
|
||||
|
||||
membership_person_id = membership_person_rec.get('id') # 'membership_person_id' is using the view
|
||||
log.debug(membership_person_id)
|
||||
if membership_person_rec_result := load_membership_person_obj(
|
||||
membership_person_id = membership_person_id,
|
||||
limit = commons.limit,
|
||||
by_alias = commons.by_alias,
|
||||
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
|
||||
):
|
||||
response_data = membership_person_rec_result
|
||||
elif membership_person_rec_result is None: # Empty dict or None
|
||||
log.info('No results')
|
||||
return mk_resp(data=False, status_code=404, response=commons.response) # Not Found
|
||||
else:
|
||||
log.warning('Likely bad request')
|
||||
return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data, response=commons.response)
|
||||
# ### END ### API Membership Person ### get_person_obj_membership_person() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person ### get_account_obj_membership_person_list() ###
|
||||
@@ -301,65 +335,6 @@ async def get_account_obj_membership_person_list(
|
||||
# ### END ### API Membership Person ### get_account_obj_membership_person_list() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person ### get_person_obj_membership_person() ###
|
||||
# Updated 2022-01-11
|
||||
@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, # 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, # 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_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,
|
||||
# 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_user: bool = False,
|
||||
commons: Common_Route_Params = Depends(common_route_params),
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
|
||||
else: return mk_resp(data=None, status_code=404, response=commons.response)
|
||||
|
||||
if membership_person_rec := sql_select(table_name='membership_person', field_name='person_id', field_value=person_id): pass
|
||||
else: return mk_resp(data=None, status_code=404, response=commons.response)
|
||||
|
||||
log.debug(membership_person_rec)
|
||||
|
||||
membership_person_id = membership_person_rec.get('id') # 'membership_person_id' is using the view
|
||||
log.debug(membership_person_id)
|
||||
if membership_person_rec_result := load_membership_person_obj(
|
||||
membership_person_id = membership_person_id,
|
||||
limit = commons.limit,
|
||||
by_alias = commons.by_alias,
|
||||
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
|
||||
):
|
||||
response_data = membership_person_rec_result
|
||||
elif membership_person_rec_result is None: # Empty dict or None
|
||||
log.info('No results')
|
||||
return mk_resp(data=False, status_code=404, response=commons.response) # Not Found
|
||||
else:
|
||||
log.warning('Likely bad request')
|
||||
return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data, response=commons.response)
|
||||
# ### END ### API Membership Person ### get_person_obj_membership_person() ###
|
||||
|
||||
|
||||
# Look up is only for account, person, or user records
|
||||
# Deprecated 2022-01-11
|
||||
@router.get('/membership/person/lookup', response_model=Resp_Body_Base)
|
||||
@@ -444,73 +419,6 @@ async def lookup_membership_person_obj(
|
||||
return mk_resp(data=data, response=commons.response)
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person ### get_membership_person_obj() ###
|
||||
# Updated 2022-01-11
|
||||
@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_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_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_person_type: 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_user: bool = False, # Per member
|
||||
commons: Common_Route_Params = Depends(common_route_params),
|
||||
):
|
||||
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass
|
||||
else: return mk_resp(data=None, status_code=404, response=commons.response)
|
||||
|
||||
if membership_person_rec_result := load_membership_person_obj(
|
||||
membership_person_id = membership_person_id,
|
||||
limit = commons.limit,
|
||||
by_alias = commons.by_alias,
|
||||
exclude_unset = commons.exclude_unset,
|
||||
# model_as_dict = commons.model_as_dict,
|
||||
enabled = commons.enabled,
|
||||
# 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_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_order = inc_order,
|
||||
# inc_organization = inc_organization,
|
||||
# inc_person = inc_person,
|
||||
# inc_product = inc_product,
|
||||
# inc_product_list = inc_product_list,
|
||||
# inc_user = inc_user,
|
||||
):
|
||||
response_data = membership_person_rec_result
|
||||
elif membership_person_rec_result is None: # Empty dict or None
|
||||
log.info('No results')
|
||||
return mk_resp(data=False, status_code=404, response=commons.response) # Not Found
|
||||
else:
|
||||
log.warning('Likely bad request')
|
||||
return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data, response=commons.response)
|
||||
# ### END ### API Membership Person ### get_membership_person_obj() ###
|
||||
|
||||
|
||||
@router.delete('/membership/person/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def delete_membership_person_obj(
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
|
||||
Reference in New Issue
Block a user