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

Clean up of code...

Browse Source
This commit is contained in:
Scott Idem
2021-06-11 18:42:28 -04:00
parent 64d6e87ca2
commit fe232b8cba
11 changed files with 198 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/methods/person_methods.py
View File

@@ -62,10 +62,13 @@ def create_person_obj(person_obj_new:Person_Base):
# ### BEGIN ### API Person Methods ### load_person_obj() ###
def load_person_obj(
person_id: int|str,
limit: int = 1000,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
inc_address: bool = False, # Under contact
inc_contact: bool = False,
inc_organization: bool = False,
inc_user: bool = False
inc_user: bool = False,
) -> Person_Base|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -76,9 +79,6 @@ def load_person_obj(
if person_rec := sql_select(table_name='v_person', record_id=person_id): pass
else: return False
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(person_rec)
try:
person_obj = Person_Base(**person_rec)
log.debug(person_obj)
@@ -87,30 +87,29 @@ def load_person_obj(
if inc_contact:
contact_id = person_rec.get('contact_id', None)
if contact_obj_result := load_contact_obj(contact_id=contact_id):
contact_obj = contact_obj_result
#person_obj.contact = contact_obj.dict(by_alias=True, exclude_unset=True)
person_obj.contact = contact_obj
log.debug(contact_id)
if contact_dict := load_contact_obj(
contact_id = contact_id,
limit = limit,
model_as_dict = model_as_dict,
enabled = enabled,
inc_address = inc_address,
):
person_obj.contact = contact_dict
else: person_obj.contact = None
if inc_address:
address_id = contact_obj.address_id
if address_obj_result := load_address_obj(address_id=address_id):
address_obj = address_obj_result
# person_rec['contact'].address = address_obj
# log.debug(person_rec)
#person_obj.contact.address = address_obj.dict(by_alias=True, exclude_unset=True)
person_obj.contact.address = address_obj
else: person_obj.contact.address = None
if inc_organization:
organization_id = person_rec.get('organization_id', None)
if organization_obj_result := load_organization_obj(organization_id=organization_id):
organization_obj = organization_obj_result
# person_rec['organization'] = organization_obj
# log.debug(person_rec)
#person_obj.organization = organization_obj.dict(by_alias=True, exclude_unset=True)
person_obj.organization = organization_obj
log.debug(organization_id)
if organization_dict := load_organization_obj(
organization_id = organization_id,
limit = limit,
model_as_dict = model_as_dict,
enabled = enabled,
inc_address = inc_address,
inc_contact = inc_contact,
):
person_obj.organization = organization_dict
else: person_obj.organization = None
if inc_user:
@@ -123,7 +122,10 @@ def load_person_obj(
person_obj.user = user_obj
else: person_obj.user = None
return person_obj
if model_as_dict:
return person_obj.dict(by_alias=True, exclude_unset=True) # pylint: disable=no-member
else:
return person_obj
# ### END ### API Person Methods ### load_person_obj() ###