Working on all the routes, methods, and models.
This commit is contained in:
@@ -63,6 +63,8 @@ def create_person_obj(person_obj_new:Person_Base):
|
||||
def load_person_obj(
|
||||
person_id: int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_address: bool = False, # Under contact
|
||||
@@ -85,25 +87,31 @@ def load_person_obj(
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_contact:
|
||||
contact_id = person_rec.get('contact_id', None)
|
||||
log.debug(contact_id)
|
||||
if contact_dict := load_contact_obj(
|
||||
if contact_result := load_contact_obj(
|
||||
contact_id = contact_id,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
):
|
||||
person_obj.contact = contact_dict
|
||||
person_obj.contact = contact_result
|
||||
else: person_obj.contact = None
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_organization:
|
||||
organization_id = person_rec.get('organization_id', None)
|
||||
log.debug(organization_id)
|
||||
if organization_dict := load_organization_obj(
|
||||
organization_id = organization_id,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
@@ -112,18 +120,23 @@ def load_person_obj(
|
||||
person_obj.organization = organization_dict
|
||||
else: person_obj.organization = None
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_user:
|
||||
user_id = person_rec.get('user_id', None)
|
||||
if user_obj_result := load_user_obj(user_id=user_id):
|
||||
user_obj = user_obj_result
|
||||
# person_rec['user'] = user_obj
|
||||
# log.debug(person_rec)
|
||||
#person_obj.user = user_obj.dict(by_alias=True, exclude_unset=True)
|
||||
person_obj.user = user_obj
|
||||
log.debug(user_id)
|
||||
if user_result := load_user_obj(
|
||||
user_id = user_id,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
):
|
||||
person_obj.user = user_result
|
||||
else: person_obj.user = None
|
||||
|
||||
if model_as_dict:
|
||||
return person_obj.dict(by_alias=True, exclude_unset=True) # pylint: disable=no-member
|
||||
return person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
return person_obj
|
||||
# ### END ### API Person Methods ### load_person_obj() ###
|
||||
|
||||
Reference in New Issue
Block a user