Working on membership and users

app/models/user_models.py

@@ -30,10 +30,13 @@ class User_New_Base(BaseModel):
     )
     account_id_random: str
     account_id: Optional[int]
+
     contact_id_random: Optional[str]
     contact_id: Optional[int]
+
     organization_id_random: Optional[str]
     organization_id: Optional[int]
+
     person_id_random: Optional[str]
     person_id: Optional[int]
 
@@ -140,6 +143,7 @@ class User_Out_Base(BaseModel):
         **base_fields['user_id_random'],
         alias = 'user_id_random',
     )
+
     account_id_random: Optional[str]
     #account_id: Optional[int]
 
@@ -198,7 +202,9 @@ class User_Out_Base(BaseModel):
     # 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] # User_Role_Base()
+    user_role_list: Optional[list] = Field(
+        alias = 'role_list'
+    ) # User_Role_Base()
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
@@ -213,16 +219,13 @@ class User_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    #if TYPE_CHECKING:
-        #from .person_models import Person_Base
-
     id_random: Optional[str] = Field(
         **base_fields['user_id_random'],
         alias = 'user_id_random',
         default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
     )
     id: Optional[int] = Field(
-        #alias = 'user_id'
+        alias = 'user_id'
     )
     account_id_random: Optional[str]
     account_id: Optional[int]
@@ -283,7 +286,9 @@ class User_Base(BaseModel):
     # 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] # User_Role_Base()
+    user_role_list: Optional[list] = Field(
+        alias = 'role_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)
@@ -347,6 +352,3 @@ class User_Base(BaseModel):
         underscore_attrs_are_private = True
         fields = base_fields
 # ### END ### API User Models ### User_Base() ###
-
-# User_Base.update_forward_refs()
-# User_Out_Base.update_forward_refs()