Clean up of code...
This commit is contained in:
@@ -15,43 +15,49 @@ from app.models.organization_models import Organization_Base
|
||||
|
||||
# ### BEGIN ### API Organization Methods ### load_organization_obj() ###
|
||||
# NOTE: This needs to be updated to the newer method template. Like address, contact, or person -STI 2021-06-10
|
||||
def load_organization_obj(organization_id:int|str, inc_contact:bool=False, inc_address:bool=False) -> Organization_Base|bool:
|
||||
def load_organization_obj(
|
||||
organization_id:int|str,
|
||||
limit: int = 1000,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_contact:bool=False,
|
||||
inc_address:bool=False
|
||||
) -> Organization_Base|bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if organization_id := redis_lookup_id_random(record_id_random=organization_id, table_name='organization'): pass
|
||||
else: return False
|
||||
|
||||
if organization_rec := sql_select(table_name='v_organization', record_id=organization_id):
|
||||
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(organization_rec)
|
||||
if organization_rec := sql_select(table_name='v_organization', record_id=organization_id): pass
|
||||
else: return False
|
||||
|
||||
if inc_contact:
|
||||
contact_id = organization_rec.get('contact_id', None)
|
||||
if contact_obj_result := load_contact_obj(contact_id=contact_id):
|
||||
contact_obj = contact_obj_result
|
||||
organization_rec['contact'] = contact_obj
|
||||
log.debug(organization_rec)
|
||||
#else: organization_rec['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
|
||||
organization_rec['contact'].address = address_obj
|
||||
log.debug(organization_rec)
|
||||
#else: organization_rec['contact'].address = None
|
||||
else:
|
||||
return False
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(organization_rec)
|
||||
|
||||
try:
|
||||
organization_obj = Organization_Base(**organization_rec)
|
||||
log.debug(organization_obj)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
|
||||
return organization_obj
|
||||
if inc_contact:
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
contact_id = organization_rec.get('contact_id', None)
|
||||
log.debug(contact_id)
|
||||
from app.methods.contact_methods import load_contact_obj
|
||||
if contact_dict := load_contact_obj(
|
||||
contact_id = contact_id,
|
||||
model_as_dict = model_as_dict,
|
||||
inc_address = inc_address,
|
||||
):
|
||||
organization_obj.contact = contact_dict
|
||||
else: organization_obj.contact = None
|
||||
|
||||
if model_as_dict:
|
||||
return organization_obj.dict(by_alias=True, exclude_unset=True) # pylint: disable=no-member
|
||||
else:
|
||||
return organization_obj
|
||||
# ### END ### API Organization Methods ### load_organization_obj() ###
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user