Work on better way to update objects.
This commit is contained in:
Scott Idem
@@ -7,9 +7,9 @@ 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.user_methods import load_user_obj
|
||||
from app.methods.organization_methods import load_organization_obj
|
||||
#from app.methods.person_methods import load_person_obj
|
||||
from app.methods.contact_methods import load_contact_obj, update_contact_obj
|
||||
from app.methods.organization_methods import load_organization_obj, update_organization_obj
|
||||
# from app.methods.person_methods import load_person_obj, update_person_obj
|
||||
|
||||
from app.models.user_models import User_Base, User_New_Base, User_Out_Base
|
||||
from app.models.user_role_models import User_Role_Base
|
||||
@@ -70,7 +70,13 @@ def create_user_obj(user_obj_new:User_New_Base) -> int|bool:
|
||||
|
||||
|
||||
# ### BEGIN ### API User Methods ### load_user_obj() ###
|
||||
def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_user:bool=False, inc_organization:bool=False, inc_person:bool=False) -> User_Out_Base|bool:
|
||||
def load_user_obj(
|
||||
user_id: int|str,
|
||||
inc_contact: bool = False,
|
||||
inc_organization: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_user_role_li: bool = False,
|
||||
) -> User_Out_Base|bool:
|
||||
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
@@ -78,7 +84,7 @@ def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_user:bool=False, in
|
||||
else: return False
|
||||
|
||||
if user_rec := sql_select(table_name='v_user', record_id=user_id): pass
|
||||
else: return false
|
||||
else: return False
|
||||
|
||||
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(user_rec)
|
||||
@@ -90,26 +96,16 @@ def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_user:bool=False, in
|
||||
log.error(e.json())
|
||||
return False
|
||||
|
||||
if inc_roles:
|
||||
if role_rec_li := sql_select(table_name='v_user_role_detail', field_name='user_id', field_value=user_id, as_list=True):
|
||||
user_rec['role_list'] = role_rec_li
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(role_rec_li)
|
||||
user_obj.role_list = role_rec_li
|
||||
else:
|
||||
user_rec['role_list'] = None
|
||||
user_obj.role_list = None
|
||||
|
||||
if inc_user:
|
||||
user_id = user_rec.get('user_id', None)
|
||||
if user_obj_result := load_user_obj(user_id=user_id):
|
||||
user_obj = user_obj_result
|
||||
user_rec['user'] = 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.user = user_obj
|
||||
user_obj.contact = contact_obj
|
||||
else:
|
||||
user_rec['user'] = None
|
||||
user_obj.user = None
|
||||
user_rec['contact'] = None
|
||||
user_obj.contact = None
|
||||
|
||||
if inc_organization:
|
||||
organization_id = user_rec.get('organization_id', None)
|
||||
@@ -128,7 +124,21 @@ def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_user:bool=False, in
|
||||
# person_obj = person_obj_result
|
||||
# user_rec['person'] = person_obj
|
||||
# log.debug(user_rec)
|
||||
# #else: user_rec['person'] = None
|
||||
# user_obj.person = person_obj
|
||||
# else:
|
||||
# user_rec['person'] = None
|
||||
# user_obj.person = None
|
||||
|
||||
# NOTE: Including user roles should probably be reviewed
|
||||
if inc_user_role_li:
|
||||
if role_rec_li := sql_select(table_name='v_user_role_detail', field_name='user_id', field_value=user_id, as_list=True):
|
||||
user_rec['role_list'] = role_rec_li
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(role_rec_li)
|
||||
user_obj.role_list = role_rec_li
|
||||
else:
|
||||
user_rec['role_list'] = None
|
||||
user_obj.role_list = None
|
||||
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(user_rec)
|
||||
@@ -138,37 +148,106 @@ def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_user:bool=False, in
|
||||
|
||||
|
||||
# ### BEGIN ### API User Methods ### update_user_obj() ###
|
||||
def update_user_obj(user_obj_update:User_Base):
|
||||
def update_user_obj(
|
||||
user_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
|
||||
user_obj_up: User_Base,
|
||||
create_missing_obj: bool = False,
|
||||
) -> bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if contact_obj_update := user_obj_update.contact:
|
||||
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
|
||||
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
|
||||
else:
|
||||
if contact_obj_in_result := insert_contact_obj(contact_obj_insert):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(contact_obj_in_result)c
|
||||
return True # NOTE: This needs to return the new contact ID
|
||||
else:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(contact_obj_in_result)
|
||||
return False
|
||||
|
||||
user_obj_update.pop('contact')
|
||||
log.debug(user_obj_update)
|
||||
if user_obj_up_result = update_user_obj(user_obj_update):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
|
||||
else: return False
|
||||
|
||||
user_obj_up.id = user_id
|
||||
|
||||
log.debug(user_obj_up)
|
||||
# log.debug(user_obj_up.dict(by_alias=True, exclude_unset=True))
|
||||
log.debug(user_obj_up.dict(by_alias=False, exclude_unset=True))
|
||||
# log.debug(user_obj_up.dict(by_alias=False, exclude_unset=False))
|
||||
|
||||
# if user_obj_up.contact_id and user_obj_up.contact:
|
||||
# contact_id = user_obj_up.contact_id
|
||||
# contact_obj_up = user_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 user_obj_up.contact and not user_obj_up.contact.id:
|
||||
# # NOTE: This will blindly create a new contact even if there was one associated but the user.contact_id was not found.
|
||||
# contact_obj_in = user_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)
|
||||
# user_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
|
||||
|
||||
# if organization_obj_update := user_obj_up.organization:
|
||||
# log.debug(organization_obj_update)
|
||||
# if organization_obj_up_result := update_organization_obj(organization_obj_update):
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(organization_obj_up_result)
|
||||
# return True
|
||||
# else:
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(organization_obj_up_result)
|
||||
# return False
|
||||
# else:
|
||||
# if organization_obj_in_result := insert_organization_obj(organization_obj_insert):
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(organization_obj_in_result)
|
||||
# return True # NOTE: This needs to return the new organization ID
|
||||
# else:
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(organization_obj_in_result)
|
||||
# return False
|
||||
|
||||
# if user_obj_up.person_id and user_obj_up.person:
|
||||
# person_id = user_obj_up.person_id
|
||||
# person_obj_up = user_obj_up.person
|
||||
# log.debug(person_id)
|
||||
# log.debug(person_obj_up)
|
||||
# if person_obj_up_result := update_person_obj(
|
||||
# person_id=person_id,
|
||||
# person_obj_up=person_obj_up,
|
||||
# create_missing_obj=create_missing_obj,
|
||||
# ):
|
||||
# log.debug(person_obj_up_result)
|
||||
# else:
|
||||
# log.debug(person_obj_up_result)
|
||||
# return False
|
||||
# elif user_obj_up.person and not user_obj_up.person.id:
|
||||
# # NOTE: This will blindly create a new person even if there was one associated but the user.person_id was not found.
|
||||
# person_obj_in = user_obj_up.person
|
||||
# log.debug(person_obj_in)
|
||||
# if person_obj_in_result := create_person_obj(person_obj_new=person_obj_in):
|
||||
# # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(person_obj_in_result)
|
||||
# person_obj_up.person_id = person_obj_in_result
|
||||
# else:
|
||||
# # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(person_obj_in_result)
|
||||
# return False
|
||||
|
||||
# IMPORTANT NOTE: Need to be extra careful if allowing an update to password, super, or manager. Maybe other fields?
|
||||
user_dict_up = user_obj_up.dict(by_alias=False, exclude_unset=True, exclude={'password', 'super', 'manager', 'contact', 'organization', 'person'})
|
||||
log.debug(user_dict_up)
|
||||
|
||||
if user_obj_up_result := sql_update(data=user_dict_up, table_name='user', rm_id_random=True):
|
||||
log.debug(user_obj_up_result)
|
||||
return True
|
||||
else:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(user_obj_up_result)
|
||||
return False
|
||||
# ### END ### API User Methods ### update_user_obj() ###
|
||||
|
||||
Reference in New Issue
Block a user