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

Code clean up. Membership

Browse Source
This commit is contained in:
Scott Idem
2022-01-10 18:46:01 -05:00
parent e6e6f19418
commit 0112c9d015
2 changed files with 145 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

256
app/routers/membership_person.py
View File

@@ -18,33 +18,35 @@ from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter() router = APIRouter()
@router.post('/membership/person', response_model=Resp_Body_Base) # @router.post('/membership/person', response_model=Resp_Body_Base)
async def post_membership_person_obj( # async def post_membership_person_obj(
obj: Membership_Person_Base, # obj: Membership_Person_Base,
return_obj: Optional[bool] = True, # return_obj: Optional[bool] = True,
commons: Common_Route_Params = Depends(common_route_params), # commons: Common_Route_Params = Depends(common_route_params),
): # ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) # log.debug(locals())
obj_type = 'membership_person' # obj_type = 'membership_person'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True) # obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
result = post_obj_template( # result = post_obj_template(
obj_type=obj_type, # obj_type=obj_type,
data=obj_data_dict, # data=obj_data_dict,
return_obj=True, # return_obj=True,
by_alias=True, # by_alias=True,
exclude_unset=True, # exclude_unset=True,
) # )
return result # return result
# ### BEGIN ### API Membership Person ### post_membership_person_obj_create() ### # ### BEGIN ### API Membership Person ### post_membership_person_obj() ###
# Using create_membership_person_obj() # Using create_membership_person_obj()
# Updated 2022-01-04 # Updated 2022-01-04
@router.post('/membership/person/create', response_model=Resp_Body_Base) @router.post('/membership/person', response_model=Resp_Body_Base)
async def post_membership_person_obj_create( async def post_membership_person_obj(
membership_person_obj: Membership_Person_Base, membership_person_obj: Membership_Person_Base,
person_id: str = Query(None, min_length=11, max_length=22),
create_sub_obj: bool = False, create_sub_obj: bool = False,
fail_any: bool = True, # Fail if any thing goes wrong for sub objects fail_any: bool = True, # Fail if any thing goes wrong for sub objects
@@ -62,75 +64,93 @@ async def post_membership_person_obj_create(
person_id_random = membership_person_obj.person_id_random person_id_random = membership_person_obj.person_id_random
log.debug(f'Person ID: {person_id}, Person ID Random: {person_id_random}') log.debug(f'Person ID: {person_id}, Person ID Random: {person_id_random}')
# ### SECTION ### Secondary data validation
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
elif person_id is None: pass
else: return mk_resp(data=None, status_code=404, response=commons.response, status_message='The person ID was invalid or not found.')
# ### SECTION ### Process data
if create_membership_person_obj_result := create_membership_person_obj( if create_membership_person_obj_result := create_membership_person_obj(
account_id = commons.x_account_id, account_id = commons.x_account_id,
person_id = person_id, person_id = person_id,
membership_person_dict_obj = membership_person_obj, membership_person_dict_obj = membership_person_obj,
# process_contact = process_contact,
# process_organization = process_organization,
# process_user = process_user,
): pass ): pass
else: return mk_resp(data=False, status_code=400, response=commons.response, status_message='The membership person was not created. Check the field names and data types.') else: return mk_resp(data=False, status_code=400, response=commons.response, status_message='The membership person was not created. Check the field names and data types.') # Bad Request
if isinstance(create_membership_person_obj_result, int): # ### SECTION ### Return successful results
membership_person_id = create_membership_person_obj_result if return_obj:
if return_obj: if load_membership_person_obj_result := load_membership_person_obj(
if load_membership_person_obj_result := load_membership_person_obj( membership_person_id = membership_person_id,
membership_person_id = membership_person_id, enabled = commons.enabled,
enabled = commons.enabled, ):
# inc_address = inc_address, data = load_membership_person_obj_result
# inc_contact = inc_contact,
# inc_organization = inc_organization,
# inc_user = inc_user,
):
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: else:
membership_person_id = create_membership_person_obj_result data = False
membership_person_id_random = get_id_random(record_id=membership_person_id, table_name='membership_person') return mk_resp(data=data, response=commons.response, status_message='The membership person was probably created, but there was a problem returning the data.')
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: 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.') membership_person_id_random = get_id_random(record_id=membership_person_id, table_name='membership_person')
# ### BEGIN ### API Membership Person ### post_membership_person_obj_create() ### 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)
@router.patch('/membership/person/{obj_id}', response_model=Resp_Body_Base) # if isinstance(create_membership_person_obj_result, int):
async def patch_membership_person_obj( # membership_person_id = create_membership_person_obj_result
obj_id: str = Query(..., min_length=1, max_length=22), # if return_obj:
obj: Membership_Person_Base = None, # if load_membership_person_obj_result := load_membership_person_obj(
return_obj: Optional[bool] = True, # membership_person_id = membership_person_id,
commons: Common_Route_Params = Depends(common_route_params), # enabled = commons.enabled,
): # ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # data = load_membership_person_obj_result
log.debug(locals()) # 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() ###
obj_type = 'membership_person'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True) # @router.patch('/membership/person/{obj_id}', response_model=Resp_Body_Base)
obj_data_dict['id'] = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_type) # async def patch_membership_person_obj(
obj_data_dict['id_random'] = obj_id # obj_id: str = Query(..., min_length=11, max_length=22),
result = patch_obj_template( # obj: Membership_Person_Base = None,
obj_type=obj_type, # return_obj: Optional[bool] = True,
data=obj_data_dict, # commons: Common_Route_Params = Depends(common_route_params),
obj_id=obj_id, # ):
return_obj=True, # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
by_alias=True, # log.debug(locals())
exclude_unset=True,
) # obj_type = 'membership_person'
return result # 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_update() ###
# Using update_membership_person_obj() # Using update_membership_person_obj()
# Updated 2022-01-04 # Updated 2022-01-04
@router.patch('/membership/person/{membership_person_id}/update', response_model=Resp_Body_Base) @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_update(
membership_person_obj: Membership_Person_Base, membership_person_obj: Membership_Person_Base,
membership_person_id: Optional[str] = Query(None, min_length=11, max_length=22), membership_person_id: Optional[str] = Query(..., min_length=11, max_length=22),
create_sub_obj: bool = False, create_sub_obj: bool = False,
fail_any: bool = True, # Fail if any thing goes wrong for sub objects fail_any: bool = True, # Fail if any thing goes wrong for sub objects
@@ -144,45 +164,37 @@ async def patch_membership_person_obj_update(
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
account_id = commons.x_account_id log.debug(f'Membership Person ID: {membership_person_id}')
membership_person_id_random = membership_person_id # This is used later for the response data membership_person_id_random = membership_person_id # This is used later for the response data
if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass
else: return mk_resp(data=False, status_code=404, response=commons.response) # Not Found else: return mk_resp(data=False, status_code=404, response=commons.response, status_message='The membership person ID was invalid or not found.') # Not Found
log.debug(f'Membership Person ID: {membership_person_id}')
# ### SECTION ### Process data
if update_membership_person_obj_result := update_membership_person_obj( if update_membership_person_obj_result := update_membership_person_obj(
membership_person_id = membership_person_id, membership_person_id = membership_person_id,
membership_person_dict_obj = membership_person_obj, membership_person_dict_obj = membership_person_obj,
# process_contact = process_contact,
# process_organization = process_organization,
# process_user = process_user,
): pass ): pass
else: return mk_resp(data=False, status_code=400, response=commons.response, status_message='The membership person was not updated. Check the field names and data types.')
if update_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,
# inc_address = inc_address,
# inc_contact = inc_contact,
# inc_organization = inc_organization,
# inc_user = inc_user,
):
data = load_membership_person_obj_result
else:
data = False
return mk_resp(data=data, response=commons.response, status_message='The membership person was probably updated, but there was a problem returning the data.')
else:
# 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 updated.')
else: else:
return mk_resp(data=False, status_code=400, response=commons.response, status_message='The result from trying to update a membership person was unexpected.') log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=commons.response, status_message='The membership person was not updated. Check the field names and data types.') # Bad Request
# ### SECTION ### Return successful results
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 updated, but there was a problem returning the data.')
else:
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 updated.')
# ### BEGIN ### API Membership Person ### patch_membership_person_obj_update() ### # ### BEGIN ### API Membership Person ### patch_membership_person_obj_update() ###
@@ -285,7 +297,7 @@ async def get_account_obj_membership_person_list(
# ### BEGIN ### API Membership Person ### get_person_obj_membership_person() ### # ### BEGIN ### API Membership Person ### get_person_obj_membership_person() ###
# Working well as of 2021-07-09. Using as a template for other routes. # Updated 2022-01-10
@router.get('/person/{person_id}/membership/person', response_model=Resp_Body_Base) @router.get('/person/{person_id}/membership/person', response_model=Resp_Body_Base)
async def get_person_obj_membership_person( async def get_person_obj_membership_person(
person_id: str = Query(..., min_length=11, max_length=22), person_id: str = Query(..., min_length=11, max_length=22),
@@ -298,10 +310,10 @@ async def get_person_obj_membership_person(
inc_membership_person_profile: bool = False, # Profile? inc_membership_person_profile: bool = False, # Profile?
inc_membership_person_profile_cust: bool = False, # Extended profile? inc_membership_person_profile_cust: bool = False, # Extended profile?
inc_membership_type: bool = False, # The primary membership type for a person inc_membership_type: bool = False, # The primary membership type for a person
inc_membership_type_list: bool = False, # The list of all membership types a person is a part of # 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_order: bool = False,
inc_organization: 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: 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_list: bool = False, # The list of products that give access to a member_type or member_group
# inc_user: bool = False, # inc_user: bool = False,
@@ -313,10 +325,12 @@ async def get_person_obj_membership_person(
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass 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) else: return mk_resp(data=None, status_code=404, response=commons.response)
if membership_person_rec := sql_select(table_name='v_membership_person', field_name='person_id', field_value=person_id): pass 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) else: return mk_resp(data=None, status_code=404, response=commons.response)
membership_person_id = membership_person_rec.get('membership_person_id', None) 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) log.debug(membership_person_id)
if membership_person_rec_result := load_membership_person_obj( if membership_person_rec_result := load_membership_person_obj(
membership_person_id = membership_person_id, membership_person_id = membership_person_id,
@@ -343,7 +357,7 @@ async def get_person_obj_membership_person(
# inc_user = inc_user, # inc_user = inc_user,
): ):
response_data = membership_person_rec_result response_data = membership_person_rec_result
elif person_rec_result is None: # Empty dict or None elif membership_person_rec_result is None: # Empty dict or None
log.info('No results') log.info('No results')
return mk_resp(data=False, status_code=404, response=commons.response) # Not Found return mk_resp(data=False, status_code=404, response=commons.response) # Not Found
else: else:
@@ -441,10 +455,10 @@ async def lookup_membership_person_obj(
# ### BEGIN ### API Membership Person ### get_membership_person_obj() ### # ### BEGIN ### API Membership Person ### get_membership_person_obj() ###
# Working well as of 2021-06-24. Using as a template for other routes. # Updated 2022-01-10
@router.get('/membership/person/{membership_person_id}', response_model=Resp_Body_Base) @router.get('/membership/person/{membership_person_id}', response_model=Resp_Body_Base)
async def get_membership_person_obj( async def get_membership_person_obj(
membership_person_id: str = Query(..., min_length=1, max_length=22), membership_person_id: str = Query(..., min_length=11, max_length=22),
inc_address: bool = False, # Per member inc_address: bool = False, # Per member
inc_contact: bool = False, # Per member inc_contact: bool = False, # Per member
inc_membership_cfg: bool = False, inc_membership_cfg: bool = False,
@@ -454,20 +468,20 @@ async def get_membership_person_obj(
inc_membership_type: bool = False, inc_membership_type: bool = False,
inc_membership_type_person: bool = False, inc_membership_type_person: bool = False,
# inc_order: bool = False, # inc_order: bool = False,
inc_organization: bool = False, # inc_organization: bool = False,
inc_person: bool = False, inc_person: bool = False,
inc_product: bool = False, # Per member or group member belongs to inc_product: bool = False, # Per member or group member belongs to
inc_product_list: bool = False, inc_product_list: bool = False,
inc_user: bool = False, # Per member # inc_user: bool = False, # Per member
commons: Common_Route_Params = Depends(common_route_params), commons: Common_Route_Params = Depends(common_route_params),
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass 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) else: return mk_resp(data=None, status_code=404, response=commons.response)
if membership_person_result := load_membership_person_obj( if membership_person_rec_result := load_membership_person_obj(
membership_person_id = membership_person_id, membership_person_id = membership_person_id,
limit = commons.limit, limit = commons.limit,
by_alias = commons.by_alias, by_alias = commons.by_alias,
@@ -485,17 +499,21 @@ async def get_membership_person_obj(
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_membership_type_person_list = inc_membership_type_list,
# inc_order = inc_order, # inc_order = inc_order,
inc_organization = inc_organization, # inc_organization = inc_organization,
inc_person = inc_person, inc_person = inc_person,
inc_product = inc_product, inc_product = inc_product,
inc_product_list = inc_product_list, inc_product_list = inc_product_list,
inc_user = inc_user, # inc_user = inc_user,
): ):
response_data = membership_person_result 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: else:
log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request 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_membership_person_obj() ### # ### END ### API Membership Person ### get_membership_person_obj() ###

10
app/routers/person.py
View File

@@ -75,7 +75,10 @@ async def post_person_obj(
).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) ).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset)
data = person_obj data = person_obj
else: else:
data = person_id person_id_random = get_id_random(record_id=person_id, table_name='person')
data = {}
data['person_id'] = person_id
data['person_id_random'] = person_id_random
return mk_resp(data=data, response=commons.response) return mk_resp(data=data, response=commons.response)
# ### END ### API Person Routers ### post_person_obj() ### # ### END ### API Person Routers ### post_person_obj() ###
@@ -102,6 +105,7 @@ async def patch_person_obj(
log.debug(locals()) log.debug(locals())
# ### SECTION ### Secondary data validation # ### SECTION ### Secondary data validation
person_id_random = person_id # This is used later for the response data
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass 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, status_message='The person ID was invalid or not found.') else: return mk_resp(data=None, status_code=404, response=commons.response, status_message='The person ID was invalid or not found.')
@@ -140,7 +144,9 @@ async def patch_person_obj(
).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) ).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset)
data = person_obj data = person_obj
else: else:
data = person_id data = {}
data['person_id'] = person_id
data['person_id_random'] = person_id_random
return mk_resp(data=data, response=commons.response) return mk_resp(data=data, response=commons.response)
# ### END ### API Person Routers ### patch_person_obj() ### # ### END ### API Person Routers ### patch_person_obj() ###