User related clean up

app/models/user_models.py

@@ -8,8 +8,8 @@ from app.db_sql import redis_lookup_id_random
 from app.lib_general import log, logging, secure_hash_string
 
 from app.models.common_field_schema import base_fields, default_num_bytes
-# from app.models.account_models import Account_Base
 from app.models.contact_models import Contact_Base
+# from app.models.membership_models import Membership_Base
 from app.models.organization_models import Organization_Base
 # from app.models.person_models import Person_Base # Causes circular import
 from app.models.user_role_models import User_Role_Base
@@ -181,12 +181,19 @@ class User_Out_Base(BaseModel):
     updated_on: Optional[datetime.datetime]
 
     # Including other related objects
-    #account: Optional[Account_Base]
-    contact: Optional[Union[Contact_Base, None]]
-    organization: Optional[Union[Organization_Base, None]]
-    #person: Optional[Union[Person_Base, None]]# Causes circular import
-    role_list: Optional[Union[list, None]] = []
-
+    archive_list: Optional[list] # Archive_Base()
+    contact: Optional[Contact_Base]
+    event_list: Optional[list] # Event_Base() # Priority l1
+    hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l2
+    journal_list: Optional[list] # Journal_Base() # Priority l3
+    # membership: Optional[Membership_Base] # Priority l2
+    order_list: Optional[list] # Order_Base() # Priority l2
+    order_cart_list: Optional[list] # Order_Base() # Priority l2
+    organization: Optional[Organization_Base] # Organization_Base() # Priority l3
+    # person: Optional[Person_Base] # Person_Base() # Priority l2
+    post_list: Optional[list] # Post_Base() # Priority l1
+    user_role_list: Optional[list] # User_Role_Base()
+    role_list: Optional[list] = [] # User_Role_Base() # NOTE <- This is a duplicate of above!
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
@@ -201,11 +208,6 @@ class User_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    #from .account_models import Account_Base
-    #from .contact_models import Contact_Base
-    #from .organization_models import Organization_Base
-    #from .person_models import Person_Base
-
     #if TYPE_CHECKING:
         #from .person_models import Person_Base
 
@@ -259,11 +261,19 @@ class User_Base(BaseModel):
     updated_on: Optional[datetime.datetime] = None
 
     # Including other related objects
-    #account: Optional[Account_Base]
+    archive_list: Optional[list] # Archive_Base()
     contact: Optional[Contact_Base]
-    #organization: Optional[Organization_Base]
-    #person: Optional[Person_Base]
-    role_list: Optional[list] = [] # User_Role_Base()
+    event_list: Optional[list] # Event_Base() # Priority l1
+    hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l2
+    journal_list: Optional[list] # Journal_Base() # Priority l3
+    # membership: Optional[Membership_Base] # Priority l2
+    order_list: Optional[list] # Order_Base() # Priority l2
+    order_cart_list: Optional[list] # Order_Base() # Priority l2
+    organization: Optional[Organization_Base] # Organization_Base() # Priority l3
+    # person: Optional[Person_Base] # Person_Base() # Priority l2
+    post_list: Optional[list] # Post_Base() # Priority l1
+    user_role_list: Optional[list] # User_Role_Base()
+    role_list: Optional[list] = [] # User_Role_Base() # NOTE <- This is a duplicate of above!
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)