A LOT of code clean up. More changes to membership tables, views, routes, methods, and models renamed.
This commit is contained in:
Scott Idem
@@ -101,6 +101,8 @@ async def patch_membership_person_obj(
|
||||
log.debug(f'Membership Person ID: {membership_person_id}')
|
||||
|
||||
membership_person_id_random = membership_person_id # This is used later for the response data
|
||||
|
||||
# ### SECTION ### Secondary data validation
|
||||
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, status_message='The membership person ID was invalid or not found.') # Not Found
|
||||
|
||||
|
||||
@@ -353,99 +353,6 @@ async def patch_person_obj(
|
||||
# # ### END ### API Person ### patch_person_json() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person ### get_person_obj() ###
|
||||
# Updated 2021-12-15
|
||||
@router.get('/person/{person_id}', response_model=Resp_Body_Base)
|
||||
async def get_person_obj(
|
||||
person_id: str = Query(..., min_length=11, max_length=22),
|
||||
auth_key: str = Query(None, min_length=11, max_length=22), # If passed, it must match in the person record. New 2021-12-15
|
||||
inc_address: bool = False, # Priority l1
|
||||
# inc_archive_list: bool = False, # Priority l3
|
||||
inc_contact: bool = False, # Priority l1
|
||||
inc_event_list: bool = False, # Priority l1
|
||||
# inc_hosted_file_list: bool = False, # Priority l3
|
||||
inc_journal_list: bool = False, # Priority l2
|
||||
# inc_journal_entry_list: bool = False, # Priority l3
|
||||
inc_membership_cfg: bool = False, # The list of all
|
||||
# inc_membership_group: bool = False, # The primary membership group
|
||||
# inc_membership_person_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,
|
||||
inc_membership_person: bool = False,
|
||||
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_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,
|
||||
inc_order_closed_count: bool = False, # NEW Priority l1
|
||||
inc_order_line_list: bool = False, # Priority l1
|
||||
inc_order_list: bool = False, # Priority l1
|
||||
inc_order_cart: bool = False, # NEW Priority l1
|
||||
# inc_order_cart_list: bool = False, # Priority l1
|
||||
inc_organization: bool = False, # Priority l1
|
||||
# inc_organization_list: bool = False,
|
||||
inc_post_list: bool = False, # Priority l2
|
||||
inc_post_comment_list: bool = False, # Priority l3
|
||||
inc_user: bool = False, # Priority l1
|
||||
commons: Common_Route_Params = Depends(common_route_params),
|
||||
):
|
||||
log.setLevel(logging.INFO) # 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 person_rec_result := load_person_obj(
|
||||
person_id = person_id,
|
||||
auth_key = auth_key,
|
||||
limit = commons.limit,
|
||||
exclude_unset = False,
|
||||
model_as_dict = False, # NOTE: returning model as a dict
|
||||
enabled = commons.enabled,
|
||||
inc_address = inc_address,
|
||||
# inc_archive_list = inc_archive_list,
|
||||
inc_contact = inc_contact,
|
||||
inc_event_list = inc_event_list,
|
||||
# inc_hosted_file_list = inc_hosted_file_list,
|
||||
inc_journal_list = inc_journal_list,
|
||||
# inc_journal_entry_list = inc_journal_entry_list,
|
||||
inc_membership_cfg = inc_membership_cfg,
|
||||
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_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,
|
||||
inc_order_list = inc_order_list,
|
||||
inc_order_cart = inc_order_cart,
|
||||
# inc_order_cart_list = inc_order_cart_list,
|
||||
inc_organization = inc_organization,
|
||||
# inc_organization_list = inc_organization_list,
|
||||
inc_post_list = inc_post_list,
|
||||
inc_post_comment_list = inc_post_comment_list,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
response_data = person_rec_result
|
||||
# if isinstance(person_rec_result, dict):
|
||||
# response_data = person_rec_result
|
||||
# else:
|
||||
# response_data = person_rec_result
|
||||
# else:
|
||||
# return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
|
||||
|
||||
elif isinstance(person_rec_result, list) or person_rec_result is None: # Empty list or None
|
||||
log.info('No results')
|
||||
if auth_key: log.info('It is likely the auth_key did not match.')
|
||||
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 Person ### get_person_obj() ###
|
||||
|
||||
|
||||
@router.get('/person/list', response_model=Resp_Body_Base)
|
||||
async def get_person_obj_li(
|
||||
for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50),
|
||||
@@ -598,6 +505,99 @@ async def email_auth_key_url(
|
||||
# ### END ### API Person ### email_create_url() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person ### get_person_obj() ###
|
||||
# Updated 2021-12-15
|
||||
@router.get('/person/{person_id}', response_model=Resp_Body_Base)
|
||||
async def get_person_obj(
|
||||
person_id: str = Query(..., min_length=11, max_length=22),
|
||||
auth_key: str = Query(None, min_length=11, max_length=22), # If passed, it must match in the person record. New 2021-12-15
|
||||
inc_address: bool = False, # Priority l1
|
||||
# inc_archive_list: bool = False, # Priority l3
|
||||
inc_contact: bool = False, # Priority l1
|
||||
inc_event_list: bool = False, # Priority l1
|
||||
# inc_hosted_file_list: bool = False, # Priority l3
|
||||
inc_journal_list: bool = False, # Priority l2
|
||||
# inc_journal_entry_list: bool = False, # Priority l3
|
||||
inc_membership_cfg: bool = False, # The list of all
|
||||
# inc_membership_group: bool = False, # The primary membership group
|
||||
# inc_membership_group_list: bool = False,
|
||||
# inc_membership_person_group: bool = False,
|
||||
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_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_person_type_list: bool = False, # The list of all membership types a person is a part of
|
||||
# inc_membership_person_type_list: bool = False,
|
||||
# inc_membership_type_list: bool = False,
|
||||
inc_order_closed_count: bool = False, # NEW Priority l1
|
||||
inc_order_line_list: bool = False, # Priority l1
|
||||
inc_order_list: bool = False, # Priority l1
|
||||
inc_order_cart: bool = False, # NEW Priority l1
|
||||
# inc_order_cart_list: bool = False, # Priority l1
|
||||
inc_organization: bool = False, # Priority l1
|
||||
# inc_organization_list: bool = False,
|
||||
inc_post_list: bool = False, # Priority l2
|
||||
inc_post_comment_list: bool = False, # Priority l3
|
||||
inc_user: bool = False, # Priority l1
|
||||
commons: Common_Route_Params = Depends(common_route_params),
|
||||
):
|
||||
log.setLevel(logging.INFO) # 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 person_rec_result := load_person_obj(
|
||||
person_id = person_id,
|
||||
auth_key = auth_key,
|
||||
limit = commons.limit,
|
||||
exclude_unset = False,
|
||||
model_as_dict = False, # NOTE: returning model as a dict
|
||||
enabled = commons.enabled,
|
||||
inc_address = inc_address,
|
||||
# inc_archive_list = inc_archive_list,
|
||||
inc_contact = inc_contact,
|
||||
inc_event_list = inc_event_list,
|
||||
# inc_hosted_file_list = inc_hosted_file_list,
|
||||
inc_journal_list = inc_journal_list,
|
||||
# inc_journal_entry_list = inc_journal_entry_list,
|
||||
inc_membership_cfg = inc_membership_cfg,
|
||||
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_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,
|
||||
inc_order_list = inc_order_list,
|
||||
inc_order_cart = inc_order_cart,
|
||||
# inc_order_cart_list = inc_order_cart_list,
|
||||
inc_organization = inc_organization,
|
||||
# inc_organization_list = inc_organization_list,
|
||||
inc_post_list = inc_post_list,
|
||||
inc_post_comment_list = inc_post_comment_list,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
response_data = person_rec_result
|
||||
# if isinstance(person_rec_result, dict):
|
||||
# response_data = person_rec_result
|
||||
# else:
|
||||
# response_data = person_rec_result
|
||||
# else:
|
||||
# return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
|
||||
|
||||
elif isinstance(person_rec_result, list) or person_rec_result is None: # Empty list or None
|
||||
log.info('No results')
|
||||
if auth_key: log.info('It is likely the auth_key did not match.')
|
||||
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 Person ### get_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Person ### get_account_obj_person_list() ###
|
||||
# Updated 2022-01-05
|
||||
@router.get('/account/{account_id}/person/list', response_model=Resp_Body_Base)
|
||||
|
||||
Reference in New Issue
Block a user