Working on all module routes, methods, and models
This commit is contained in:
@@ -10,8 +10,9 @@ from app.lib_general import log, logging
|
||||
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_member_models import Membership_Member_Base
|
||||
from app.models.organization_models import Organization_Base
|
||||
from app.models.user_models import User_Base
|
||||
# from app.models.user_models import User_Base
|
||||
|
||||
|
||||
class Person_Base(BaseModel):
|
||||
@@ -33,13 +34,16 @@ class Person_Base(BaseModel):
|
||||
)
|
||||
account_id_random: Optional[str]
|
||||
account_id: Optional[int]
|
||||
user_id_random: Optional[str]
|
||||
user_id: Optional[int]
|
||||
organization_id_random: Optional[str]
|
||||
organization_id: Optional[int]
|
||||
|
||||
contact_id_random: Optional[str]
|
||||
contact_id: Optional[int]
|
||||
|
||||
organization_id_random: Optional[str]
|
||||
organization_id: Optional[int]
|
||||
|
||||
user_id_random: Optional[str]
|
||||
user_id: Optional[int]
|
||||
|
||||
given_name: Optional[str]
|
||||
family_name: Optional[str]
|
||||
middle_name: Optional[str]
|
||||
@@ -59,9 +63,18 @@ class Person_Base(BaseModel):
|
||||
updated_on: Optional[datetime.datetime] = None
|
||||
|
||||
# Including other related objects
|
||||
# archive_list: Optional[list] # Archive_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
|
||||
contact: Optional[Union[Contact_Base, None]]
|
||||
# membership_member: Optional[Membership_Member_Base] # Priority l2
|
||||
# membership_member_list: Optional[list] # Membership_Base() ????
|
||||
order_list: Optional[list] # Order_Base() # Priority l2
|
||||
order_cart_list: Optional[list] # Order_Base() # Priority l2
|
||||
organization: Optional[Union[Organization_Base, None]]
|
||||
user: Optional[Union[User_Base, None]]
|
||||
post_list: Optional[list] # Post_Base() # Priority l1
|
||||
# user: Optional[Union[User_Base, None]]
|
||||
|
||||
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
|
||||
|
||||
@@ -93,13 +106,14 @@ class Person_Base(BaseModel):
|
||||
return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
|
||||
return None
|
||||
|
||||
@validator('user_id', always=True)
|
||||
def user_id_lookup(cls, v, values, **kwargs):
|
||||
|
||||
@validator('contact_id', always=True)
|
||||
def contact_id_lookup(cls, v, values, **kwargs):
|
||||
log.setLevel(logging.WARNING)
|
||||
log.debug(locals())
|
||||
|
||||
if values['user_id_random']:
|
||||
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user')
|
||||
if values['contact_id_random']:
|
||||
return redis_lookup_id_random(record_id_random=values['contact_id_random'], table_name='contact')
|
||||
return None
|
||||
|
||||
@validator('organization_id', always=True)
|
||||
@@ -111,13 +125,13 @@ class Person_Base(BaseModel):
|
||||
return redis_lookup_id_random(record_id_random=values['organization_id_random'], table_name='organization')
|
||||
return None
|
||||
|
||||
@validator('contact_id', always=True)
|
||||
def contact_id_lookup(cls, v, values, **kwargs):
|
||||
@validator('user_id', always=True)
|
||||
def user_id_lookup(cls, v, values, **kwargs):
|
||||
log.setLevel(logging.WARNING)
|
||||
log.debug(locals())
|
||||
|
||||
if values['contact_id_random']:
|
||||
return redis_lookup_id_random(record_id_random=values['contact_id_random'], table_name='contact')
|
||||
if values['user_id_random']:
|
||||
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user')
|
||||
return None
|
||||
|
||||
class Config:
|
||||
|
||||
Reference in New Issue
Block a user