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

70
app/methods/user_methods.py
View File

@@ -112,16 +112,19 @@ def load_user_obj(
if inc_contact:
contact_id = user_rec.get('contact_id', None)
if contact_obj_result := load_contact_obj(contact_id=contact_id):
contact_obj = contact_obj_result
user_rec['contact'] = contact_obj
log.debug(user_rec)
user_obj.contact = contact_obj
else:
user_rec['contact'] = None
user_obj.contact = None
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,
):
user_obj.contact = contact_dict
else: user_obj.contact = None
if inc_event_list:
from app.methods.event_methods import load_event_obj_list
if event_dict_list := load_event_obj_list(
user_id = user_id,
limit = limit,
@@ -129,32 +132,41 @@ def load_user_obj(
enabled = enabled,
):
user_obj.event_list = event_dict_list
else: user_obj.event_list = None
else: user_obj.event_list = []
if inc_organization:
organization_id = user_rec.get('organization_id', None)
if organization_obj_result := load_organization_obj(organization_id=organization_id):
organization_obj = organization_obj_result
user_rec['organization'] = organization_obj
log.debug(user_rec)
user_obj.organization = organization_obj
else:
user_rec['organization'] = None
user_obj.organization = None
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,
):
user_obj.organization = organization_dict
else: user_obj.organization = None
# if inc_person:
# person_id = user_rec.get('person_id', None)
# if person_obj_result := load_person_obj(person_id=person_id):
# person_obj = person_obj_result
# user_rec['person'] = person_obj
# log.debug(user_rec)
# user_obj.person = person_obj
# else:
# user_rec['person'] = None
# user_obj.person = None
if inc_person:
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
person_id = user_rec.get('person_id', None)
log.debug(person_id)
from app.methods.person_methods import load_person_obj
if person_dict := load_person_obj(
person_id = person_id,
limit = limit,
model_as_dict = model_as_dict,
enabled = enabled,
inc_address = inc_address,
inc_contact = inc_contact,
inc_organization = inc_organization,
):
user_obj.person = person_dict
else: user_obj.person = None
if inc_post_list:
from app.methods.post_methods import load_post_obj_list
if post_dict_list := load_post_obj_list(
user_id = user_id,
limit = limit,
@@ -162,7 +174,7 @@ def load_user_obj(
enabled = enabled,
):
user_obj.post_list = post_dict_list
else: user_obj.post_list = None
else: user_obj.post_list = []
# NOTE: Including user roles should probably be reviewed