From 9840a3e4b751ddac189c73cce327134d153b6bc2 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Fri, 9 Apr 2021 22:22:52 -0400 Subject: [PATCH] Working on new user account and person profile creation and updating --- app/models/person_methods.py | 8 +++++++- app/routers/person.py | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/person_methods.py b/app/models/person_methods.py index fd7196c..8b4ea7b 100644 --- a/app/models/person_methods.py +++ b/app/models/person_methods.py @@ -11,7 +11,7 @@ from .person_model import Person_Base # ### BEGIN ### API Person Methods ### load_person_obj() ### -def load_person_obj(person_id:int|str, inc_contact:bool=False, inc_organization:bool=False) -> Person_Base: +def load_person_obj(person_id:int|str, inc_contact:bool=False, inc_address:bool=False, inc_organization:bool=False) -> Person_Base: log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -28,6 +28,12 @@ def load_person_obj(person_id:int|str, inc_contact:bool=False, inc_organization: #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(contact_rec) + if inc_address: + if address_rec := sql_select(table_name='v_address', field_name='address_id', field_value=contact_rec.get('address_id', None)): + person_rec['contact']['address'] = address_rec + #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.debug(address_rec) + if inc_organization: if organization_rec := sql_select(table_name='v_organization', field_name='organization_id', field_value=person_rec.get('organization_id', None)): person_rec['organization'] = organization_rec diff --git a/app/routers/person.py b/app/routers/person.py index 95a72bb..5388aab 100644 --- a/app/routers/person.py +++ b/app/routers/person.py @@ -96,6 +96,7 @@ async def get_person_obj( obj_id: str = Query(..., min_length=1, max_length=22), x_account_id: str = Header(...), inc_contact: bool = False, + inc_address: bool = False, inc_organization: bool = False, by_alias: Optional[bool] = True, exclude_unset: Optional[bool] = True, @@ -106,6 +107,7 @@ async def get_person_obj( user_obj = load_person_obj( person_id=obj_id, inc_contact=inc_contact, + inc_address=inc_address, inc_organization=inc_organization, ).dict(by_alias=by_alias, exclude_unset=exclude_unset) data = user_obj