General clean up of everything.

app/methods/contact_methods.py

@@ -4,8 +4,8 @@ import datetime
 from typing import Dict, List, Optional, Set, Union
 from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
 
-from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
+from ..lib_general import log, logging
 
 from ..methods.address_methods import create_address_obj
 
@@ -67,10 +67,12 @@ def load_contact_obj(contact_id:int|str, inc_address:bool=False) -> Contact_Base
         log.debug(contact_rec)
 
         if inc_address:
-            if address_rec := sql_select(table_name='v_address', field_name='address_id', field_value=contact_rec.get('address_id', None)):
-                contact_rec['address'] = address_rec
-            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-            log.debug(address_rec)
+            address_id = contact_rec.get('address_id', None)
+            if address_obj_result := load_address_obj(address_id=address_id):
+                address_obj = address_obj_result
+                contact_rec['address'] = address_obj
+                log.debug(contact_rec)
+            #else: contact_rec['address'] = None
     else:
         return False