Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor updates for model

Browse Source
This commit is contained in:
Scott Idem
2024-06-17 16:54:15 -04:00
parent 7b0af5e7c5
commit 8ed0ab8413
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/event_session_models.py
View File

@@ -47,12 +47,10 @@ class Event_Session_Base(BaseModel):
poc_event_person_id_random: Optional[str] poc_event_person_id_random: Optional[str]
poc_event_person_id: Optional[int] poc_event_person_id: Optional[int]
poc_person_id_random: Optional[str]
poc_person_id: Optional[int] poc_person_id: Optional[int]
poc_kv_json: Optional[Union[Json, None]] poc_kv_json: Optional[Union[Json, None]]
# poc_person_id_random: Optional[str] # Not used or needed?
# poc_person_id: Optional[int] # Not used or needed?
# type_id_random: Optional[str] # Not used or needed? # type_id_random: Optional[str] # Not used or needed?
# type_id: Optional[int] # Not used or needed? # type_id: Optional[int] # Not used or needed?
type_code: Optional[str] # None, poster (image, video), assume presentation (PPT, Key, PDF, etc) type_code: Optional[str] # None, poster (image, video), assume presentation (PPT, Key, PDF, etc)
@@ -158,8 +156,15 @@ class Event_Session_Base(BaseModel):
event_presentation_list: Optional[list[Event_Presentation_Base]] # Optional[Event_Presentation_Base] event_presentation_list: Optional[list[Event_Presentation_Base]] # Optional[Event_Presentation_Base]
event_presenter_list: Optional[list] # Optional[Event_Presenter_Base] event_presenter_list: Optional[list] # Optional[Event_Presenter_Base]
event_track: Optional[Event_Track_Base] event_track: Optional[Event_Track_Base]
poc_event_person: Optional[Event_Person_Base] # NOTE: Using thi will probably create an import loop poc_event_person: Optional[Event_Person_Base] # NOTE: Using thi will probably create an import loop
poc_person: Optional[Person_Base]
poc_person_given_name: Optional[str]
poc_person_family_name: Optional[str]
poc_person_full_name: Optional[str]
poc_person_primary_email: Optional[str]
proposal_json: Optional[Union[Json, None]] proposal_json: Optional[Union[Json, None]]
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
@@ -192,6 +197,13 @@ class Event_Session_Base(BaseModel):
return redis_lookup_id_random(record_id_random=id_random, table_name='event_track') return redis_lookup_id_random(record_id_random=id_random, table_name='event_track')
return None return None
@validator('poc_person_id', always=True)
def poc_person_id_lookup(cls, v, values, **kwargs):
if isinstance(v, int) and v > 0: return v
elif id_random := values.get('poc_person_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='person')
return None
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True