General clean up of models and methods.

app/methods/address_methods.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_insert, sql_select
 
-from .address_model import Address_Base
+from ..models.address_models import Address_Base
 
 
 # ### BEGIN ### API Address Methods ### create_address_obj() ###

app/methods/contact_methods.py

@@ -7,8 +7,9 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
 
-from .contact_model import Contact_Base
+from ..methods.address_methods import create_address_obj
-from ..models.address_methods import create_address_obj
+
+from ..models.contact_models import Contact_Base
 
 
 # ### BEGIN ### API Contact Methods ### create_contact_obj() ###
@@ -62,13 +63,13 @@ def load_contact_obj(contact_id:int|str, inc_address:bool=False) -> Contact_Base
     else: return False
 
     if contact_rec := sql_select(table_name='v_contact', record_id=contact_id):
-        #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         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.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
             log.debug(address_rec)
     else:
         return False

app/methods/event_person_methods.py

@@ -7,8 +7,9 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
 
-from ..models.person_methods import load_person_obj
+from ..methods.person_methods import load_person_obj
-from ..models.user_methods import load_user_obj
+from ..methods.user_methods import load_user_obj
+
 from ..models.event_person_models import Event_Person_New_Base, Event_Person_Base
 
 

app/methods/order_cart_methods.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_insert_or_update, sql_insert, sql_update, sql_select
 
-from .order_cart_model import Order_Cart_Base
+from ..models.order_cart_model import Order_Cart_Base
 
 
 def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_li:bool=False):

app/methods/order_methods.py

@@ -7,9 +7,9 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_select
 
-from .order_model import Order_Base
+from ..models.order_model import Order_Base
-#from .person_model import Person_Base
+#from ..models.person_models import Person_Base
-#from .user_model import User_Base
+#from ..models.user_models import User_Base
 
 
 # ### BEGIN ### API Order Methods ### save_order_obj() ###

app/methods/organization_methods.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+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
+
+from ..models.organization_models import Organization_Base
+
+
+# ### BEGIN ### API Organization Methods ### load_organization_obj() ###
+def load_organization_obj(organization_id:int|str) -> Organization_Base|bool:
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    if organization_id := redis_lookup_id_random(record_id_random=organization_id, table_name='organization'): pass
+    else: return False
+
+    if organization_rec := sql_select(table_name='v_organization', record_id=organization_id):
+        #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        log.debug(organization_rec)
+    else:
+        return False
+
+    try:
+        organization_obj = Organization_Base(**organization_rec)
+        log.debug(organization_obj)
+    except ValidationError as e:
+        log.error(e.json())
+        return False
+
+    return organization_obj
+# ### END ### API Organization Methods ### load_organization_obj() ###

app/methods/person_methods.py

@@ -7,9 +7,12 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
 
-from .person_model import Person_Base
+from ..methods.address_methods import load_address_obj
-from ..models.address_methods import load_address_obj
+from ..methods.contact_methods import create_contact_obj, load_contact_obj
-from ..models.contact_methods import create_contact_obj
+from ..methods.organization_methods import load_organization_obj
+from ..methods.user_methods import load_user_obj
+
+from ..models.person_models import Person_Base
 
 
 # ### BEGIN ### API Person Methods ### create_person_obj() ###
@@ -57,7 +60,7 @@ def create_person_obj(person_obj_new:Person_Base):
 
 
 # ### BEGIN ### API Person Methods ### load_person_obj() ###
-def load_person_obj(person_id:int|str, inc_contact:bool=False, inc_address:bool=False, inc_organization:bool=False, inc_user:bool=False) -> Person_Base:
+def load_person_obj(person_id:int|str, inc_contact:bool=False, inc_address:bool=False, inc_organization:bool=False, inc_user:bool=False) -> Person_Base|bool:
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
@@ -65,37 +68,40 @@ def load_person_obj(person_id:int|str, inc_contact:bool=False, inc_address:bool=
     else: return False
 
     if person_rec := sql_select(table_name='v_person', record_id=person_id):
-        #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(person_rec)
 
         if inc_contact:
-            if contact_rec := sql_select(table_name='v_contact', field_name='contact_id', field_value=person_rec.get('contact_id', None)):
+            contact_id = person_rec.get('contact_id', None)
-                person_rec['contact'] = contact_rec
+            if contact_obj_result := load_contact_obj(contact_id=contact_id):
-            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+                contact_obj = contact_obj_result
-            log.debug(contact_rec)
+                person_rec['contact'] = contact_obj
+                log.debug(person_rec)
+            #else: person_rec['contact'] = None
 
             if inc_address:
-                address_id = contact_rec.get('address_id', None)
+                address_id = contact_obj.address_id
                 if address_obj_result := load_address_obj(address_id=address_id):
                     address_obj = address_obj_result
-                    person_rec['contact']['address'] = address_obj
+                    person_rec['contact'].address = address_obj
                     log.debug(person_rec)
-                # if address_rec := sql_select(table_name='v_address', field_name='address_id', field_value=contact_rec.get('address_id', None)):
+                #else: person_rec['contact'].address = None
-                #     person_rec['contact']['address'] = address_rec
-                # #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
-                # log.debug(address_rec)
 
         if inc_organization:
-            if organization_rec := sql_select(table_name='v_organization', field_name='organization_id', field_value=person_rec.get('organization_id', None)):
+            organization_id = person_rec.get('organization_id', None)
-                person_rec['organization'] = organization_rec
+            if organization_obj_result := load_organization_obj(organization_id=organization_id):
-            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+                organization_obj = organization_obj_result
-            log.debug(organization_rec)
+                person_rec['organization'] = organization_obj
+                log.debug(person_rec)
+            #else: person_rec['organization'] = None
 
         if inc_user:
-            if user_rec := sql_select(table_name='v_user', field_name='user_id', field_value=person_rec.get('user_id', None)):
+            user_id = person_rec.get('user_id', None)
-                person_rec['user'] = user_rec
+            if user_obj_result := load_user_obj(user_id=user_id):
-            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+                user_obj = user_obj_result
-            log.debug(user_rec)
+                person_rec['user'] = user_obj
+                log.debug(person_rec)
+            #else: person_rec['user'] = None
 
         #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(person_rec)

app/methods/user_methods.py

@@ -7,8 +7,12 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
 
-from .user_model import User_Base, User_New_Base, User_Out_Base
+from ..methods.contact_methods import load_contact_obj
-from .user_role_model import User_Role_Base
+from ..methods.organization_methods import load_organization_obj
+#from ..methods.person_methods import load_person_obj
+
+from ..models.user_models import User_Base, User_New_Base, User_Out_Base
+from ..models.user_role_model import User_Role_Base
 
 
 # ### BEGIN ### API User Methods ### create_user_obj() ###
@@ -84,22 +88,28 @@ def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_contact:bool=False,
             log.debug(role_rec_li)
 
         if inc_contact:
-            if contact_rec := sql_select(table_name='v_contact', field_name='contact_id', field_value=user_rec.get('contact_id', None)):
+            contact_id = user_rec.get('contact_id', None)
-                user_rec['contact'] = contact_rec
+            if contact_obj_result := load_contact_obj(contact_id=contact_id):
-            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+                contact_obj = contact_obj_result
-            log.debug(contact_rec)
+                user_rec['contact'] = contact_obj
+                log.debug(user_rec)
+            #else: user_rec['contact'] = None
 
         if inc_organization:
-            if organization_rec := sql_select(table_name='v_organization', field_name='organization_id', field_value=user_rec.get('organization_id', None)):
+            organization_id = user_rec.get('organization_id', None)
-                user_rec['organization'] = organization_rec
+            if organization_obj_result := load_organization_obj(organization_id=organization_id):
-            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+                organization_obj = organization_obj_result
-            log.debug(organization_rec)
+                user_rec['organization'] = organization_obj
+                log.debug(user_rec)
+            #else: user_rec['organization'] = None
 
-        if inc_person:
+        # if inc_person:
-            if person_rec := sql_select(table_name='v_person', field_name='person_id', field_value=user_rec.get('person_id', None)):
+        #     person_id = user_rec.get('person_id', None)
-                user_rec['person'] = person_rec
+        #     if person_obj_result := load_person_obj(person_id=person_id):
-            log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        #         person_obj = person_obj_result
-            log.debug(person_rec)
+        #         user_rec['person'] = person_obj
+        #         log.debug(user_rec)
+        #     #else: user_rec['person'] = None
 
         #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(user_rec)

app/models/address_models.py

@@ -8,7 +8,7 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-#from .account_model import Account_Base
+#from .account_models import Account_Base
 
 
 class Address_Base(BaseModel):

app/models/contact_models.py

@@ -8,8 +8,8 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-#from .account_model import Account_Base
+#from .account_models import Account_Base
-from .address_model import Address_Base
+from .address_models import Address_Base
 
 
 class Contact_Base(BaseModel):

app/models/event_person_models.py

@@ -12,8 +12,8 @@ from .event_models import Event_Base
 from .event_badge_models import Event_Badge_Base
 from .event_person_detail_models import Event_Person_Detail_Base
 from .event_registration_models import Event_Registration_Base
-from .person_model import Person_Base
+from .person_models import Person_Base
-from .user_model import User_Base, User_Out_Base
+from .user_models import User_Base, User_Out_Base
 
 
 class Event_Person_New_Base(BaseModel):

app/models/membership_models.py

@@ -8,11 +8,11 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-from .address_model import Address_Base
+from .address_models import Address_Base
-from .contact_model import Contact_Base
+from .contact_models import Contact_Base
-from .organization_model import Organization_Base
+from .organization_models import Organization_Base
-from .person_model import Person_Base
+from .person_models import Person_Base
-from .user_model import User_Base
+from .user_models import User_Base
 
 
 class Membership_Cfg_Base(BaseModel):

app/models/order_model.py

@@ -9,8 +9,8 @@ from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
 #from .supporting_core_models import *
-from .person_model import Person_Base
+from .person_models import Person_Base
-from .user_model import User_Base
+from .user_models import User_Base
 
 
 class Order_Cfg_Base(BaseModel):

app/models/organization_models.py

@@ -8,10 +8,10 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-#from .account_model import Account_Base
+#from .account_models import Account_Base
-from .contact_model import Contact_Base
+from .contact_models import Contact_Base
-#from .person_model import Person_Base
+#from .person_models import Person_Base
-#from .user_model import User_Base
+#from .user_models import User_Base
 
 
 class Organization_Base(BaseModel):

app/models/person_models.py

@@ -8,10 +8,10 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-# from .account_model import Account_Base
+# from .account_models import Account_Base
-from .contact_model import Contact_Base
+from .contact_models import Contact_Base
-from .organization_model import Organization_Base
+from .organization_models import Organization_Base
-from .user_model import User_Base
+from .user_models import User_Base
 
 
 class Person_Base(BaseModel):
@@ -63,9 +63,9 @@ class Person_Base(BaseModel):
     created_on: Optional[datetime.datetime] = None
     updated_on: Optional[datetime.datetime] = None
 
-    contact: Contact_Base = Contact_Base()
+    contact: Optional[Contact_Base]
-    organization: Organization_Base = Organization_Base()
+    organization: Optional[Organization_Base]
-    user: User_Base = User_Base()
+    user: Optional[User_Base]
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 

app/models/user_models.py

@@ -8,10 +8,10 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-#from .account_model import Account_Base
+#from .account_models import Account_Base
-from .contact_model import Contact_Base
+from .contact_models import Contact_Base
-#from .organization_model import Organization_Base
+#from .organization_models import Organization_Base
-#from .person_model import Person_Base
+#from .person_models import Person_Base
 from .user_role_model import User_Role_Base
 
 

app/routers/account.py

@@ -11,8 +11,9 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.account_models import Account_Base
 from ..methods.account_methods import load_account_cfg_obj
+
+from ..models.account_models import Account_Base
 from ..models.response_model import *
 
 

app/routers/address.py

@@ -10,8 +10,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
+from ..models.address_models import Address_Base
 from ..models.response_model import *
-from ..models.address_model import Address_Base
 
 
 router = APIRouter()

app/routers/api_crud.py

@@ -12,10 +12,10 @@ from ..models.response_model import *
 
 from ..models.account_models import *
 from ..models.account_cfg_model import *
-from ..models.address_model import *
+from ..models.address_models import *
 from ..models.archive_model import *
 from ..models.archive_content_model import *
-from ..models.contact_model import *
+from ..models.contact_models import *
 from ..models.event_models import *
 from ..models.event_exhibit_models import *
 from ..models.event_person_models import *
@@ -23,15 +23,15 @@ from ..models.event_registration_models import *
 from ..models.membership_models import *
 from ..models.order_model import *
 from ..models.order_cart_model import *
-from ..models.organization_model import *
+from ..models.organization_models import *
 from ..models.page_model import *
-from ..models.person_model import *
+from ..models.person_models import *
 from ..models.product_model import *
 from ..models.post_model import *
 from ..models.post_comment_model import *
 from ..models.site_model import *
 from ..models.site_domain_model import *
-from ..models.user_model import *
+from ..models.user_models import *
 from ..models.user_role_model import *
 
 obj_type_li = {}

app/routers/contact.py

@@ -10,8 +10,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
+from ..models.contact_models import Contact_Base
 from ..models.response_model import *
-from ..models.contact_model import Contact_Base
 
 
 router = APIRouter()

app/routers/event_person.py

@@ -11,13 +11,14 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.event_person_models import Event_Person_New_Base, Event_Person_Base
 from ..methods.event_person_methods import create_event_person_obj, load_event_person_obj
-from ..models.person_model import Person_Base
+from ..methods.person_methods import create_person_obj, load_person_obj
-from ..models.person_methods import create_person_obj, load_person_obj
+from ..methods.user_methods import create_user_obj, load_user_obj
-from ..models.user_model import User_New_Base, User_Base
+
-from ..models.user_methods import create_user_obj, load_user_obj
+from ..models.event_person_models import Event_Person_New_Base, Event_Person_Base
+from ..models.person_models import Person_Base
 from ..models.response_model import *
+from ..models.user_models import User_New_Base, User_Base
 
 
 router = APIRouter()
@@ -100,7 +101,7 @@ async def post_event_person_new(
     user_new['username'] = email
     user_new['email'] = email
     user_new['new_password'] = new_password
-    user_new['contact_id_random'] = person_obj.contact_id_random
+    user_new['contact_id_random'] = person_obj.contact.id_random
     user_new['person_id_random'] = person_obj.id_random
 
     user_obj_new = User_New_Base(**user_new)

app/routers/order.py

@@ -11,9 +11,10 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
+from ..methods.order_methods import load_order_obj, save_order_obj
+
 from ..models.response_model import *
 from ..models.order_model import Order_Base
-from ..models.order_methods import load_order_obj, save_order_obj
 
 
 router = APIRouter()

app/routers/order_cart.py

@@ -11,8 +11,9 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
+from ..methods.order_cart_methods import update_order_cart_obj, load_order_cart_obj
+
 from ..models.order_cart_model import Order_Cart_Base
-from ..models.order_cart_methods import update_order_cart_obj, load_order_cart_obj
 from ..models.response_model import *
 
 

app/routers/organization.py

@@ -11,7 +11,7 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.organization_model import Organization_Base
+from ..models.organization_models import Organization_Base
 from ..models.response_model import *
 
 

app/routers/person.py

@@ -11,8 +11,9 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.person_model import Person_Base
+from ..methods.person_methods import load_person_obj
-from ..models.person_methods import load_person_obj
+
+from ..models.person_models import Person_Base
 from ..models.response_model import *
 
 

app/routers/user.py

@@ -11,10 +11,11 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
+from ..methods.user_methods import load_user_obj
+
 from ..models.common_field_schema import default_num_bytes
-from ..models.user_model import User_Base, User_New_Base, User_Out_Base
-from ..models.user_methods import load_user_obj
 from ..models.response_model import *
+from ..models.user_models import User_Base, User_New_Base, User_Out_Base
 
 
 router = APIRouter()

app/routers/user_person.py

@@ -11,12 +11,13 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
+from ..methods.person_methods import load_person_obj
+from ..methods.user_methods import load_user_obj
+
 from ..models.common_field_schema import default_num_bytes
-from ..models.user_model import User_Base, User_New_Base, User_Out_Base
+from ..models.person_models import Person_Base
-from ..models.user_methods import load_user_obj
-from ..models.person_model import Person_Base
-from ..models.person_methods import load_person_obj
 from ..models.response_model import *
+from ..models.user_models import User_Base, User_New_Base, User_Out_Base
 
 
 router = APIRouter()