General clean up of models and methods.

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 ..models.person_methods import create_person_obj, load_person_obj
-from ..models.user_model import User_New_Base, User_Base
-from ..models.user_methods import create_user_obj, load_user_obj
+from ..methods.person_methods import create_person_obj, load_person_obj
+from ..methods.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 ..models.person_methods import load_person_obj
+from ..methods.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.user_methods import load_user_obj
-from ..models.person_model import Person_Base
-from ..models.person_methods import load_person_obj
+from ..models.person_models import Person_Base
 from ..models.response_model import *
+from ..models.user_models import User_Base, User_New_Base, User_Out_Base
 
 
 router = APIRouter()