A lot of work on event related modules
This commit is contained in:
@@ -11,7 +11,7 @@ from .common_field_schema import base_fields, default_num_bytes
|
||||
|
||||
#from .event_models import Event_Base
|
||||
from .event_badge_models import Event_Badge_Base
|
||||
from .event_person_detail_models import Event_Person_Detail_Base
|
||||
#from .event_person_detail_models import Event_Person_Detail_Base
|
||||
from .event_registration_models import Event_Registration_Base
|
||||
from .person_models import Person_Base
|
||||
from .user_models import User_Base, User_Out_Base
|
||||
@@ -33,10 +33,10 @@ class Event_Person_Base(BaseModel):
|
||||
account_id: Optional[int]
|
||||
event_id_random: Optional[str]
|
||||
event_id: Optional[int]
|
||||
event_registration_id_random: Optional[str]
|
||||
event_registration_id: Optional[int]
|
||||
event_badge_id_random: Optional[str]
|
||||
event_badge_id: Optional[int]
|
||||
event_registration_id_random: Optional[str]
|
||||
event_registration_id: Optional[int]
|
||||
person_id_random: Optional[str]
|
||||
person_id: Optional[int]
|
||||
user_id_random: Optional[str]
|
||||
@@ -51,18 +51,17 @@ class Event_Person_Base(BaseModel):
|
||||
updated_on: Optional[datetime.datetime] = None
|
||||
|
||||
# Including other related objects
|
||||
#event: Optional[Event_Base]
|
||||
event_abstract: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more abstracts
|
||||
event_abstract_list: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more abstracts
|
||||
event_badge: Optional[Event_Badge_Base]
|
||||
event_exhibit: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more exhibits
|
||||
event_file: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more files
|
||||
event_location: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more locations (but unlikely?)
|
||||
event_presentation: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more presentations
|
||||
event_presenter: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more presenters (part of multiple presentations)
|
||||
event_exhibit_list: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more exhibits
|
||||
event_file_list: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more files
|
||||
event_location_list: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more locations (but unlikely?)
|
||||
#event_person_detail_list: Optional[list] # list of Event_Person_Detail
|
||||
event_presentation_list: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more presentations
|
||||
event_presenter_list: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more presenters (part of multiple presentations)
|
||||
event_registration: Optional[Event_Registration_Base]
|
||||
event_session: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more sessions
|
||||
event_track: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more tracks
|
||||
#event_person_detail_list: Optional[list] # list of Event_Person_Detail
|
||||
event_registration: Optional[Event_Registration_Base]
|
||||
person: Optional[Person_Base]
|
||||
user: Optional[User_Base]
|
||||
|
||||
@@ -105,15 +104,6 @@ class Event_Person_Base(BaseModel):
|
||||
return redis_lookup_id_random(record_id_random=values['event_id_random'], table_name='event')
|
||||
return None
|
||||
|
||||
@validator('event_registration_id', always=True)
|
||||
def event_registration_id_lookup(cls, v, values, **kwargs):
|
||||
log.setLevel(logging.WARNING)
|
||||
log.debug(locals())
|
||||
|
||||
if values['event_registration_id_random']:
|
||||
return redis_lookup_id_random(record_id_random=values['event_registration_id_random'], table_name='event_registration')
|
||||
return None
|
||||
|
||||
@validator('event_badge_id', always=True)
|
||||
def event_badge_id_lookup(cls, v, values, **kwargs):
|
||||
log.setLevel(logging.WARNING)
|
||||
@@ -123,6 +113,15 @@ class Event_Person_Base(BaseModel):
|
||||
return redis_lookup_id_random(record_id_random=values['event_badge_id_random'], table_name='event_badge')
|
||||
return None
|
||||
|
||||
@validator('event_registration_id', always=True)
|
||||
def event_registration_id_lookup(cls, v, values, **kwargs):
|
||||
log.setLevel(logging.WARNING)
|
||||
log.debug(locals())
|
||||
|
||||
if values['event_registration_id_random']:
|
||||
return redis_lookup_id_random(record_id_random=values['event_registration_id_random'], table_name='event_registration')
|
||||
return None
|
||||
|
||||
@validator('person_id', always=True)
|
||||
def person_id_lookup(cls, v, values, **kwargs):
|
||||
log.setLevel(logging.WARNING)
|
||||
|
||||
Reference in New Issue
Block a user