Clean up
This commit is contained in:
@@ -180,50 +180,47 @@ async def get_account_obj_membership_person_list(
|
||||
# Working well as of 2021-07-09. Using as a template for other routes.
|
||||
@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=1, max_length=22),
|
||||
limit: int = 500, # For now this covers any included objects or object lists
|
||||
person_id: str = Query(..., min_length=11, max_length=22),
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
from_datetime: datetime.datetime = None,
|
||||
to_datetime: datetime.datetime = None,
|
||||
limit: int = 500, # For now this covers any included objects or object lists
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
# inc_membership_group: bool = False, # The primary membership group
|
||||
inc_membership_group_list: bool = False, # The list of all membership groups a person is a part of
|
||||
# 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: bool = False, # Priority l2
|
||||
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
|
||||
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
|
||||
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_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_user: bool = False,
|
||||
# inc_user: bool = False,
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
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)
|
||||
else: return mk_resp(data=None, status_code=404, response=response)
|
||||
|
||||
if membership_person_rec := sql_select(table_name='v_membership_person', field_name='person_id', field_value=person_id): pass
|
||||
else: return mk_resp(data=None, status_code=404)
|
||||
else: return mk_resp(data=None, status_code=404, response=response)
|
||||
|
||||
membership_person_id = membership_person_rec.get('membership_person_id', None)
|
||||
log.debug(membership_person_id)
|
||||
if membership_person_result := load_membership_person_obj(
|
||||
if membership_person_rec_result := load_membership_person_obj(
|
||||
membership_person_id = membership_person_id,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = True,
|
||||
# model_as_dict = True,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
@@ -242,10 +239,15 @@ async def get_person_obj_membership_person(
|
||||
# inc_product_list = inc_product_list,
|
||||
# inc_user = inc_user,
|
||||
):
|
||||
response_data = membership_person_result
|
||||
else: return mk_resp(data=False, status_code=404, response=response) # Bad Request
|
||||
response_data = membership_person_rec_result
|
||||
elif person_rec_result is None: # Empty dict or None
|
||||
log.info('No results')
|
||||
return mk_resp(data=False, status_code=404, response=response) # Not Found
|
||||
else:
|
||||
log.warning('Likely bad request')
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data)
|
||||
return mk_resp(data=response_data, response=response)
|
||||
# ### END ### API Membership Person ### get_person_obj_membership_person() ###
|
||||
|
||||
|
||||
|
||||
@@ -18,6 +18,30 @@ from app.models.response_models import Resp_Body_Base, mk_resp
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post('/membership/person/profile', response_model=Resp_Body_Base)
|
||||
async def post_membership_person_profile_obj(
|
||||
obj: Membership_Person_Profile_Base,
|
||||
x_account_id: str = Header(...),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
obj_type = 'membership_person_profile'
|
||||
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
|
||||
|
||||
|
||||
@router.patch('/membership/person/profile/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def patch_membership_person_profile_obj(
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
|
||||
Reference in New Issue
Block a user