Updated to include standard fields.
This commit is contained in:
@@ -67,7 +67,15 @@ class Activity_Log_Base(BaseModel):
|
|||||||
other_json: Optional[str] # When getting the dict version for SQL this should be a string.
|
other_json: Optional[str] # When getting the dict version for SQL this should be a string.
|
||||||
meta_json: Optional[str] # When getting the dict version for SQL this should be a string.
|
meta_json: Optional[str] # When getting the dict version for SQL this should be a string.
|
||||||
|
|
||||||
|
enable: Optional[bool]
|
||||||
|
|
||||||
|
hide: Optional[bool]
|
||||||
|
priority: Optional[bool]
|
||||||
|
sort: Optional[int]
|
||||||
|
group: Optional[str]
|
||||||
|
|
||||||
notes: Optional[str]
|
notes: Optional[str]
|
||||||
|
|
||||||
created_on: Optional[datetime.datetime] = None
|
created_on: Optional[datetime.datetime] = None
|
||||||
updated_on: Optional[datetime.datetime] = None
|
updated_on: Optional[datetime.datetime] = None
|
||||||
|
|
||||||
@@ -94,29 +102,23 @@ class Activity_Log_Base(BaseModel):
|
|||||||
|
|
||||||
@validator('account_id', always=True)
|
@validator('account_id', always=True)
|
||||||
def account_id_lookup(cls, v, values, **kwargs):
|
def account_id_lookup(cls, v, values, **kwargs):
|
||||||
log.setLevel(logging.WARNING)
|
if isinstance(v, int) and v > 0: return v
|
||||||
log.debug(locals())
|
elif id_random := values.get('account_id_random'):
|
||||||
|
return redis_lookup_id_random(record_id_random=id_random, table_name='account')
|
||||||
if values['account_id_random']:
|
|
||||||
return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@validator('person_id', always=True)
|
@validator('person_id', always=True)
|
||||||
def person_id_lookup(cls, v, values, **kwargs):
|
def person_id_lookup(cls, v, values, **kwargs):
|
||||||
log.setLevel(logging.WARNING)
|
if isinstance(v, int) and v > 0: return v
|
||||||
log.debug(locals())
|
elif id_random := values.get('person_id_random'):
|
||||||
|
return redis_lookup_id_random(record_id_random=id_random, table_name='person')
|
||||||
if values['person_id_random']:
|
|
||||||
return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person')
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@validator('user_id', always=True)
|
@validator('user_id', always=True)
|
||||||
def user_id_lookup(cls, v, values, **kwargs):
|
def user_id_lookup(cls, v, values, **kwargs):
|
||||||
log.setLevel(logging.WARNING)
|
if isinstance(v, int) and v > 0: return v
|
||||||
log.debug(locals())
|
elif id_random := values.get('user_id_random'):
|
||||||
|
return redis_lookup_id_random(record_id_random=id_random, table_name='user')
|
||||||
if values['user_id_random']:
|
|
||||||
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user')
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
class Config:
|
class Config:
|
||||||
|
|||||||
Reference in New Issue
Block a user