Work on better way to update objects.

app/methods/person_methods.py

@@ -9,8 +9,8 @@ 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, update_contact_obj
-from app.methods.organization_methods import load_organization_obj
-from app.methods.user_methods import load_user_obj
+from app.methods.organization_methods import load_organization_obj, update_organization_obj
+from app.methods.user_methods import load_user_obj, update_user_obj
 
 from app.models.person_models import Person_Base
 
@@ -128,83 +128,113 @@ def load_person_obj(
 
 
 # ### BEGIN ### API Person Methods ### update_person_obj() ###
-def update_person_obj(person_obj_update:Person_Base):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+def update_person_obj(
+        person_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
+        person_obj_up: Person_Base,
+        create_missing_obj: bool = False,
+        ) -> bool:
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    if contact_obj_update := person_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
+    if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
+    else: return False
+
+    person_obj_up.id = person_id
+
+    log.debug(person_obj_up)
+    # log.debug(person_obj_up.dict(by_alias=True, exclude_unset=True))
+    log.debug(person_obj_up.dict(by_alias=False, exclude_unset=True))
+    # log.debug(person_obj_up.dict(by_alias=False, exclude_unset=False))
+
+    if person_obj_up.contact_id and person_obj_up.contact:
+        contact_id = person_obj_up.contact_id
+        contact_obj_up = person_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)
-            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
+    elif person_obj_up.contact and not person_obj_up.contact.id:
+        # NOTE: This will blindly create a new contact even if there was one associated but the person.contact_id was not found.
+        contact_obj_in = person_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)
-            return True # NOTE: This needs to return the new contact ID
+            person_obj_up.contact_id = contact_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(contact_obj_in_result)
             return False
 
-        # if contact_obj_in_result := sql_insert(data=contact_obj_update, table_name='contact', rm_id_random=True, id_random_length=8): pass
-        # else:
-        #     return False
-    
-    if organization_obj_update := person_obj_update.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
+    if person_obj_up.organization_id and person_obj_up.organization:
+        organization_id = person_obj_up.organization_id
+        organization_obj_up = person_obj_up.organization
+        log.debug(organization_id)
+        log.debug(organization_obj_up)
+        if organization_obj_up_result := update_organization_obj(
+            organization_id=organization_id,
+            organization_obj_up=organization_obj_up,
+            create_missing_obj=create_missing_obj,
+            ):
             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
+    elif person_obj_up.organization and not person_obj_up.organization.id:
+        # NOTE: This will blindly create a new organization even if there was one associated but the person.organization_id was not found.
+        organization_obj_in = person_obj_up.organization
+        log.debug(organization_obj_in)
+        if organization_obj_in_result := create_organization_obj(organization_obj_new=organization_obj_in):
+            # 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
+            person_obj_up.organization_id = organization_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(organization_obj_in_result)
             return False
-    
-    if user_obj_update := person_obj_update.user:
-        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
-            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
-    else:
-        if user_obj_in_result := insert_user_obj(user_obj_insert):
-            log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-            log.debug(user_obj_in_result)
-            return True # NOTE: This needs to return the new user ID
-        else:
-            log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-            log.debug(user_obj_in_result)
-            return False
-    
-    person_obj_update.pop('contact')
-    person_obj_update.pop('organization')
-    person_obj_update.pop('user')
-    log.debug(person_obj_update)
-    if person_obj_up_result = update_person_obj(person_obj_update):
+
+    if person_obj_up.user_id and person_obj_up.user:
         log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        user_id = person_obj_up.user_id
+        user_obj_up = person_obj_up.user
+        log.debug(user_id)
+        log.debug(user_obj_up)
+        if user_obj_up_result := update_user_obj(
+            user_id=user_id,
+            user_obj_up=user_obj_up,
+            create_missing_obj=create_missing_obj,
+            ):
+            log.debug(user_obj_up_result)
+        else:
+            log.debug(user_obj_up_result)
+            return False
+    elif person_obj_up.user and not person_obj_up.user.id:
+        # NOTE: This will blindly create a new user even if there was one associated but the person.user_id was not found.
+        user_obj_in = person_obj_up.user
+        log.debug(user_obj_in)
+        if user_obj_in_result := create_user_obj(user_obj_new=user_obj_in):
+            # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+            log.debug(user_obj_in_result)
+            person_obj_up.user_id = user_obj_in_result
+        else:
+            # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+            log.debug(user_obj_in_result)
+            return False
+
+    person_dict_up = person_obj_up.dict(by_alias=False, exclude_unset=True, exclude={'contact', 'organization', 'user'})
+    log.debug(person_dict_up)
+
+    if person_obj_up_result := sql_update(data=person_dict_up, table_name='person', rm_id_random=True):
         log.debug(person_obj_up_result)
         return True
     else:
-        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(person_obj_up_result)
         return False
+# ### END ### API Person Methods ### update_person_obj() ###