Work on better way to update objects.
This commit is contained in:
@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from app.lib_general import log, logging
|
||||
|
||||
from app.methods.address_methods import create_address_obj
|
||||
from app.methods.address_methods import create_address_obj, update_address_obj
|
||||
|
||||
from app.models.contact_models import Contact_Base
|
||||
|
||||
@@ -88,37 +88,60 @@ def load_contact_obj(contact_id:int|str, inc_address:bool=False) -> Contact_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Contact Methods ### update_contact_obj() ###
|
||||
def update_contact_obj(contact_obj_update:Contact_Base):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
def update_contact_obj(
|
||||
contact_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
|
||||
contact_obj_up: Contact_Base,
|
||||
create_missing_obj: bool = False,
|
||||
) -> bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if address_obj_update := contact_obj_update.address:
|
||||
log.debug(address_obj_update)
|
||||
if address_obj_up_result := update_address_obj(address_obj_update):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
if contact_id := redis_lookup_id_random(record_id_random=contact_id, table_name='contact'): pass
|
||||
else: return False
|
||||
|
||||
contact_obj_up.id = contact_id
|
||||
|
||||
log.debug(contact_obj_up)
|
||||
# log.debug(contact_obj_up.dict(by_alias=True, exclude_unset=True))
|
||||
log.debug(contact_obj_up.dict(by_alias=False, exclude_unset=True))
|
||||
# log.debug(contact_obj_up.dict(by_alias=False, exclude_unset=False))
|
||||
|
||||
#contact_dict_up = contact_obj_up.dict(by_alias=False, exclude_unset=True)
|
||||
|
||||
if contact_obj_up.address_id and contact_obj_up.address:
|
||||
address_id = contact_obj_up.address_id
|
||||
address_obj_up = contact_obj_up.address
|
||||
log.debug(address_id)
|
||||
log.debug(address_obj_up)
|
||||
if address_obj_up_result := update_address_obj(
|
||||
address_id=address_id,
|
||||
address_obj_up=address_obj_up,
|
||||
create_missing_obj=create_missing_obj,
|
||||
):
|
||||
log.debug(address_obj_up_result)
|
||||
return True
|
||||
else:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(address_obj_up_result)
|
||||
return False
|
||||
else:
|
||||
if address_obj_in_result := insert_address_obj(address_obj_insert):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(address_obj_in_result)c
|
||||
return True # NOTE: This needs to return the new address ID
|
||||
elif contact_obj_up.address and not contact_obj_up.address.id:
|
||||
# NOTE: This will blindly create a new address even if there was one associated but the contact.address_id was not found.
|
||||
address_obj_in = contact_obj_up.address
|
||||
log.debug(address_obj_in)
|
||||
if address_obj_in_result := create_address_obj(address_obj_new=address_obj_in):
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(address_obj_in_result)
|
||||
contact_obj_up.address_id = address_obj_in_result
|
||||
else:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(address_obj_in_result)
|
||||
return False
|
||||
|
||||
contact_obj_update.pop('address')
|
||||
log.debug(contact_obj_update)
|
||||
if contact_obj_up_result = update_contact_obj(contact_obj_update):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
|
||||
contact_dict_up = contact_obj_up.dict(by_alias=False, exclude_unset=True, exclude={'address'})
|
||||
log.debug(contact_dict_up)
|
||||
|
||||
if contact_obj_up_result := sql_update(data=contact_dict_up, table_name='contact', rm_id_random=True):
|
||||
log.debug(contact_obj_up_result)
|
||||
return True
|
||||
else:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(contact_obj_up_result)
|
||||
return False
|
||||
# ### END ### API Contact Methods ### update_contact_obj() ###
|
||||
|
||||
Reference in New Issue
Block a user