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()

app/models/user_role_models.py

@@ -15,26 +15,34 @@ class User_Role_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    id_random: Optional[str] = Field(
-        **base_fields['user_role_id_random'],
-        alias = 'user_role_id_random',
-        default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
-    )
+    # id_random: Optional[str] = Field(
+    #     **base_fields['user_role_id_random'],
+    #     alias = 'user_role_id_random',
+    #     default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
+    # )
     id: Optional[int] = Field(
-        #alias = 'user_role_id'
+        alias = 'user_role_id'
     )
-    user_id_random: Optional[str] # NOTE: This needs to be reviewed. Current a user_role record does not have an id_random
+
+    user_id_random: Optional[str]
     user_id: Optional[int]
-    #role_id_random: Optional[str]
-    role_id: Optional[int]
+
+    # user_role_id_random: Optional[str]
+    # user_role_id: Optional[int] = Field(
+    #     alias = 'role_id'
+    # )
 
     for_type: Optional[str]
     for_id_random: Optional[str]
     for_id: Optional[int]
 
+    code: Optional[str]
+    name: Optional[str]
+    description: Optional[str]
+
     enable: Optional[bool]
-    enable_from: Optional[datetime.datetime] = None
-    enable_to: Optional[datetime.datetime] = None
+    enable_from: Optional[datetime.datetime]
+    enable_to: Optional[datetime.datetime]
 
     notes: Optional[str]
     created_on: Optional[datetime.datetime] = None
@@ -51,15 +59,15 @@ class User_Role_Base(BaseModel):
             return values['id_random']
         return None
 
-    @validator('id', always=True)
-    def user_role_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
+    # @validator('id', always=True)
+    # def user_role_id_lookup(cls, v, values, **kwargs):
+    #     log.setLevel(logging.WARNING)
+    #     log.debug(locals())
 
-        if values['id_random']:
-            log.debug(values['id_random'])
-            return redis_lookup_id_random(record_id_random=values['id_random'], table_name='user_role')
-        return None
+    #     if values['id_random']:
+    #         log.debug(values['id_random'])
+    #         return redis_lookup_id_random(record_id_random=values['id_random'], table_name='user_role')
+    #     return None
 
     @validator('user_id', always=True)
     def user_id_lookup(cls, v, values, **kwargs):