diff --git a/app/routers/membership_person.py b/app/routers/membership_person.py index 9ec183f..24f2f4f 100644 --- a/app/routers/membership_person.py +++ b/app/routers/membership_person.py @@ -3,7 +3,7 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Resp from pydantic import BaseModel, EmailStr, Field from typing import Dict, List, Optional, Set, Union -from app.lib_general import log, logging +from app.lib_general import log, logging, common_route_params, Common_Route_Params from app.config import settings from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random @@ -21,11 +21,8 @@ router = APIRouter() @router.post('/membership/person', response_model=Resp_Body_Base) async def post_membership_person_obj( obj: Membership_Person_Base, - x_account_id: str = Header(...), return_obj: Optional[bool] = True, - by_alias: Optional[bool] = True, - exclude_unset: Optional[bool] = True, - response: Response = Response, + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -51,20 +48,12 @@ async def post_membership_person_obj_create( create_sub_obj: bool = False, fail_any: bool = True, # Fail if any thing goes wrong for sub objects - enabled: str = 'enabled', # For now this covers any included objects or object lists inc_membership_group_person_list: bool = False, inc_membership_type_person: bool = False, inc_contact: bool = False, return_obj: bool = True, - limit: int = 50, - by_alias: bool = True, - # include: Optional[list] = [], - # exclude: Optional[list] = [], - exclude_unset: Optional[bool] = True, - # exclude_none: Optional[bool] = True, - x_account_id: str = Header(...), - response: Response = Response, + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -74,21 +63,21 @@ async def post_membership_person_obj_create( log.debug(f'Person ID: {person_id}, Person ID Random: {person_id_random}') if create_membership_person_obj_result := create_membership_person_obj( - account_id = x_account_id, + account_id = commons.x_account_id, person_id = person_id, membership_person_dict_obj = membership_person_obj, # process_contact = process_contact, # process_organization = process_organization, # process_user = process_user, ): pass - else: return mk_resp(data=False, status_code=400, response=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.') 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 = enabled, + enabled = commons.enabled, # inc_address = inc_address, # inc_contact = inc_contact, # inc_organization = inc_organization, @@ -97,16 +86,16 @@ async def post_membership_person_obj_create( data = load_membership_person_obj_result else: data = False - return mk_resp(data=data, response=response, status_message='The membership person was probably created, but there was a problem returning the data.') + 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=response, status_message='The membership person was created.') + 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=response, status_message='The result from trying to create a membership person was unexpected.') + 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_create() ### @@ -114,11 +103,8 @@ async def post_membership_person_obj_create( async def patch_membership_person_obj( obj_id: str = Query(..., min_length=1, max_length=22), obj: Membership_Person_Base = None, - #x_account_id: Optional[str] = Header(..., ), return_obj: Optional[bool] = True, - by_alias: Optional[bool] = True, - exclude_unset: Optional[bool] = True, - response: Response = Response, + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -148,30 +134,21 @@ 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 - enabled: str = 'enabled', # For now this covers any included objects or object lists inc_membership_group_person_list: bool = False, inc_membership_type_person: bool = False, inc_contact: bool = False, return_obj: bool = True, - limit: int = 50, - by_alias: bool = True, - # include: Optional[list] = [], - # exclude: Optional[list] = [], - exclude_unset: Optional[bool] = True, - # exclude_none: Optional[bool] = True, - x_account_id: str = Header(...), - response: Response = Response, + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - if account_id := redis_lookup_id_random(record_id_random=x_account_id, table_name='account'): pass - else: return mk_resp(data=False, status_code=404, response=response) # Not Found + account_id = commons.x_account_id 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 - else: return mk_resp(data=False, status_code=404, response=response) # Not Found + else: return mk_resp(data=False, status_code=404, response=commons.response) # Not Found log.debug(f'Membership Person ID: {membership_person_id}') @@ -182,13 +159,13 @@ async def patch_membership_person_obj_update( # process_organization = process_organization, # process_user = process_user, ): pass - else: return mk_resp(data=False, status_code=400, response=response, status_message='The membership person was not updated. 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 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 = enabled, + enabled = commons.enabled, # inc_address = inc_address, # inc_contact = inc_contact, # inc_organization = inc_organization, @@ -197,15 +174,15 @@ async def patch_membership_person_obj_update( data = load_membership_person_obj_result else: data = False - return mk_resp(data=data, response=response, status_message='The membership person was probably updated, but there was a problem returning the data.') + 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=response, status_message='The membership person was updated.') + return mk_resp(data=data, response=commons.response, status_message='The membership person was updated.') else: - return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to update a membership person was unexpected.') + return mk_resp(data=False, status_code=400, response=commons.response, status_message='The result from trying to update a membership person was unexpected.') # ### BEGIN ### API Membership Person ### patch_membership_person_obj_update() ### @@ -213,10 +190,7 @@ async def patch_membership_person_obj_update( 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), - x_account_id: str = Header(...), - by_alias: Optional[bool] = True, - exclude_unset: Optional[bool] = True, - response: Response = Response, + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -238,8 +212,6 @@ async def get_membership_person_obj_li( @router.get('/account/{account_id}/membership/person/list', response_model=Resp_Body_Base) async def get_account_obj_membership_person_list( account_id: str = Query(..., min_length=1, max_length=22), - limit: int = 500, # For now this covers any included objects or object lists - enabled: str = 'enabled', # For now this covers any included objects or object lists # inc_account_cfg: bool = False, inc_address: bool = False, # Under contact inc_contact: bool = False, @@ -258,10 +230,7 @@ async def get_account_obj_membership_person_list( inc_product: bool = False, inc_product_list: bool = False, inc_user: bool = False, - x_account_id: str = Header(...), - by_alias: Optional[bool] = True, - exclude_unset: Optional[bool] = True, - response: Response = Response, + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -276,18 +245,18 @@ async def get_account_obj_membership_person_list( if membership_person_rec_list_result := get_membership_person_rec_list( for_obj_type = 'account', for_obj_id = account_id, - limit = limit, - enabled = enabled, + limit = commons.limit, + enabled = commons.enabled, ): membership_person_result_list = [] for membership_person_rec in membership_person_rec_list_result: if load_membership_person_result := load_membership_person_obj( membership_person_id = membership_person_rec.get('membership_person_id', None), - limit = limit, - by_alias = by_alias, - exclude_unset = exclude_unset, - # model_as_dict = model_as_dict, - enabled = enabled, + 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, @@ -309,7 +278,7 @@ async def get_account_obj_membership_person_list( membership_person_result_list.append(None) response_data = membership_person_result_list else: - return mk_resp(data=False, status_code=400, response=response) # Bad Request + return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request return mk_resp(data=response_data) # ### END ### API Membership Person ### get_account_obj_membership_person_list() ### @@ -320,8 +289,6 @@ 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), - enabled: str = 'enabled', # For now this covers any included objects or object lists - 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, @@ -338,29 +305,26 @@ async def get_person_obj_membership_person( 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, - x_account_id: str = Header(...), - by_alias: Optional[bool] = True, - exclude_unset: Optional[bool] = True, - response: Response = Response, + 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=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 - else: return mk_resp(data=None, status_code=404, response=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_id) 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, + limit = commons.limit, + by_alias = commons.by_alias, + exclude_unset = commons.exclude_unset, # model_as_dict = True, - enabled = enabled, + enabled = commons.enabled, inc_address = inc_address, inc_contact = inc_contact, inc_membership_cfg = inc_membership_cfg, @@ -381,12 +345,12 @@ async def get_person_obj_membership_person( 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 + 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=response) # Bad Request + return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request - return mk_resp(data=response_data, response=response) + return mk_resp(data=response_data, response=commons.response) # ### END ### API Membership Person ### get_person_obj_membership_person() ### @@ -395,15 +359,12 @@ async def get_person_obj_membership_person( async def lookup_membership_person_obj( for_obj_id: Union[int,str], for_obj_type: str = Query(..., min_length=2, max_length=50), - x_account_id: str = Header(...), 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, - by_alias: bool = True, - exclude_unset: bool = True, - response: Response = Response, + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -412,7 +373,7 @@ async def lookup_membership_person_obj( base_name = Membership_Person_Base if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass - else: return mk_resp(data=False, status_code=404, response=response) # Not Found + else: return mk_resp(data=False, status_code=404, response=commons.response) # Not Found log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL data = {} @@ -436,7 +397,7 @@ async def lookup_membership_person_obj( sql_limit = 'LIMIT 1' else: log.debug(f'Object type={for_obj_type}; Object ID={for_obj_id}') - return mk_resp(data=False, status_code=400, response=response) # Bad Request + return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request sql = f""" SELECT id AS 'membership_person_id', id_random AS 'membership_person_id_random' @@ -484,8 +445,6 @@ 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=1, max_length=22), - enabled: str = 'enabled', # For now this covers any included objects or object lists - limit: int = 500, # For now this covers any included objects or object lists inc_address: bool = False, # Per member inc_contact: bool = False, # Per member inc_membership_cfg: bool = False, @@ -500,10 +459,7 @@ async def get_membership_person_obj( inc_product: bool = False, # Per member or group member belongs to inc_product_list: bool = False, inc_user: bool = False, # Per member - x_account_id: str = Header(...), - by_alias: Optional[bool] = True, - exclude_unset: Optional[bool] = True, - response: Response = Response, + commons: Common_Route_Params = Depends(common_route_params), ): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -513,11 +469,11 @@ async def get_membership_person_obj( if membership_person_result := load_membership_person_obj( membership_person_id = membership_person_id, - limit = limit, - by_alias = by_alias, - exclude_unset = exclude_unset, - # model_as_dict = model_as_dict, - enabled = enabled, + 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, @@ -537,7 +493,7 @@ async def get_membership_person_obj( ): response_data = membership_person_result else: - return mk_resp(data=False, status_code=400, response=response) # Bad Request + return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request return mk_resp(data=response_data) # ### END ### API Membership Person ### get_membership_person_obj() ### @@ -546,7 +502,6 @@ async def 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), - x_account_id: str = Header(...), response: Response = Response, ): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL