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

Work on better way to update objects.

Browse Source
This commit is contained in:
Scott Idem
2021-06-10 15:23:57 -04:00
parent 264fced5a6
commit b8da9d99eb
13 changed files with 459 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/methods/organization_methods.py
View File

@@ -8,12 +8,13 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_select
from app.lib_general import log, logging
from app.methods.address_methods import load_address_obj
from app.methods.contact_methods import create_contact_obj, load_contact_obj
from app.methods.contact_methods import create_contact_obj, load_contact_obj, update_contact_obj
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:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -52,3 +53,51 @@ def load_organization_obj(organization_id:int|str, inc_contact:bool=False, inc_a
return organization_obj
# ### END ### API Organization Methods ### load_organization_obj() ###
# ### BEGIN ### API Organization Methods ### update_organization_obj() ###
def update_organization_obj(
organization_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
organization_obj_up: Organization_Base,
create_missing_obj: bool = False,
) -> bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if organization_obj_up.contact_id and organization_obj_up.contact:
contact_id = organization_obj_up.contact_id
contact_obj_up = organization_obj_up.contact
log.debug(contact_id)
log.debug(contact_obj_up)
if contact_obj_up_result := update_contact_obj(
contact_id=contact_id,
contact_obj_up=contact_obj_up,
create_missing_obj=create_missing_obj,
):
log.debug(contact_obj_up_result)
else:
log.debug(contact_obj_up_result)
return False
elif organization_obj_up.contact and not organization_obj_up.contact.id:
# NOTE: This will blindly create a new contact even if there was one associated but the organization.contact_id was not found.
contact_obj_in = organization_obj_up.contact
log.debug(contact_obj_in)
if contact_obj_in_result := create_contact_obj(contact_obj_new=contact_obj_in):
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(contact_obj_in_result)
organization_obj_up.contact_id = contact_obj_in_result
else:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(contact_obj_in_result)
return False
organization_dict_up = organization_obj_up.dict(by_alias=False, exclude_unset=True, exclude={'contact', 'person', 'user'})
log.debug(organization_dict_up)
if organization_obj_up_result := sql_update(data=organization_dict_up, table_name='organization', rm_id_random=True):
log.debug(organization_obj_up_result)
return True
else:
log.debug(organization_obj_up_result)
return False
# ### END ### API Organization Methods ### update_organization_obj() ###