Working on membership and users

This commit is contained in:
Scott Idem
2021-06-25 11:15:58 -04:00
parent d85ab35812
commit ca43cc4dce
9 changed files with 270 additions and 142 deletions

View File

@@ -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):