Clean up

app/models/person_models.py

@@ -12,7 +12,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes
 from app.models.contact_models import Contact_Base
 from app.models.membership_person_models import Membership_Person_Base
 from app.models.organization_models import Organization_Base
-# from app.models.user_models import User_Base
+from app.models.user_models import User_Base
 
 
 # ### BEGIN ### API Person Models ### Person_Base() ###
@@ -130,7 +130,9 @@ class Person_Base(BaseModel):
     order_cart: Optional[dict] # Order_Cart_Base() # Priority l2
     organization: Optional[Union[Organization_Base, None]]
     post_list: Optional[list] # Post_Base() # Priority l1
-    user: Optional[dict] # Optional[Union[User_Base, None]]
+    # user: Optional[dict] # Optional[Union[User_Base, None]]
+    # from app.models.user_models import User_Base
+    user: Optional[Union[User_Base, None]]
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 

app/models/user_models.py

@@ -11,7 +11,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes
 # from app.models.contact_models import Contact_Base
 # from app.models.membership_person_models import Membership_Person_Base
 from app.models.organization_models import Organization_Base
-from app.models.person_models import Person_Base # Causes circular import
+# from app.models.person_models import Person_Base # Causes circular import
 # from app.models.user_role_models import User_Role_Base
 
 
@@ -210,8 +210,8 @@ class User_Out_Base(BaseModel):
     order_list: Optional[list] # Order_Base() # Priority l2
     order_cart_list: Optional[list] # Order_Base() # Priority l2
     organization: Optional[Union[Organization_Base, None]] # Organization_Base() # Priority l3
-    # person: Optional[dict] # Person_Base() # Priority l2
-    person: Optional[Union[Person_Base, None]]
+    person: Optional[dict] # Person_Base() # Priority l2
+    # person: Optional[Union[Person_Base, None]]
     post_list: Optional[list] # Post_Base() # Priority l1
     user_role_list: Optional[list] = Field(
         alias = 'role_list'
@@ -296,8 +296,8 @@ class User_Base(BaseModel):
     order_list: Optional[list] # Order_Base() # Priority l2
     order_cart_list: Optional[list] # Order_Base() # Priority l2
     organization: Optional[Union[Organization_Base, None]] # Organization_Base() # Priority l3
-    # person: Optional[dict] # Person_Base() # Priority l2
-    person: Optional[Union[Person_Base, None]]
+    person: Optional[dict] # Person_Base() # Priority l2
+    # person: Optional[Union[Person_Base, None]]
     post_list: Optional[list] # Post_Base() # Priority l1
     user_role_list: Optional[list] = Field(
         alias = 'role_list'