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

Code clean up. Better debugging

Browse Source
This commit is contained in:
Scott Idem
2021-09-29 17:44:51 -04:00
parent c77e066f9e
commit f98c57157b
5 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/models/event_presentation_models.py
View File

@@ -39,14 +39,14 @@ class Event_Presentation_Base(BaseModel):
event_abstract_id_random: Optional[str]
event_abstract_id: Optional[int]
#event_location_id_random: Optional[str]
#event_location_id: Optional[int]
event_location_id_random: Optional[str]
event_location_id: Optional[int]
event_session_id_random: Optional[str]
event_session_id: Optional[int]
#event_track_id_random: Optional[str]
#event_track_id: Optional[int]
event_track_id_random: Optional[str]
event_track_id: Optional[int]
poc_event_person: Optional[Event_Person_Base]
poc_person: Optional[Person_Base]
@@ -79,6 +79,17 @@ class Event_Presentation_Base(BaseModel):
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
# Including convenience data
# This is only for convenience. Probably going to keep unless it causes a problem.
event_name: Optional[str]
event_start_datetime: Optional[datetime.datetime]
event_end_datetime: Optional[datetime.datetime]
event_location_name: Optional[str]
event_session_name: Optional[str]
event_session_start_datetime: Optional[datetime.datetime]
event_session_end_datetime: Optional[datetime.datetime]
event_track_name: Optional[str]
# Including other related objects
#event: Optional[Event_Base]
#event_abstract: Optional[Event_Abstract_Base] # This creates an import loop

22
app/models/event_presenter_models.py
View File

@@ -43,8 +43,8 @@ class Event_Presenter_Base(BaseModel):
# event_abstract_id_random: Optional[str]
# event_abstract_id: Optional[int]
#event_location_id_random: Optional[str]
#event_location_id: Optional[int]
event_location_id_random: Optional[str]
event_location_id: Optional[int]
event_person_id_random: Optional[str]
event_person_id: Optional[int]
@@ -55,8 +55,8 @@ class Event_Presenter_Base(BaseModel):
event_session_id_random: Optional[str]
event_session_id: Optional[int]
#event_track_id_random: Optional[str]
#event_track_id: Optional[int]
event_track_id_random: Optional[str]
event_track_id: Optional[int]
# person_id_random: Optional[str]
# person_id: Optional[int]
@@ -119,6 +119,20 @@ class Event_Presenter_Base(BaseModel):
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
# Including convenience data
# This is only for convenience. Probably going to keep unless it causes a problem.
event_name: Optional[str]
event_start_datetime: Optional[datetime.datetime]
event_end_datetime: Optional[datetime.datetime]
event_location_name: Optional[str]
event_presentation_name: Optional[str]
event_presentation_start_datetime: Optional[datetime.datetime]
event_presentation_end_datetime: Optional[datetime.datetime]
event_session_name: Optional[str]
event_session_start_datetime: Optional[datetime.datetime]
event_session_end_datetime: Optional[datetime.datetime]
event_track_name: Optional[str]
# Including other related objects
# event: Optional[Event_Base]
# event_abstract: Optional[Event_Abstract_Base]

18
app/models/event_session_models.py
View File

@@ -105,13 +105,17 @@ class Event_Session_Base(BaseModel):
# Including convenience data
# This is only for convenience. Probably going to keep unless it causes a problem.
location_name: Optional[str] = Field(
alias = 'event_location_name'
)
track_name: Optional[str] = Field(
alias = 'event_track_name'
)
# Maybe add xxx in the future?
event_name: Optional[str]
event_start_datetime: Optional[datetime.datetime]
event_end_datetime: Optional[datetime.datetime]
event_location_name: Optional[str]
event_track_name: Optional[str]
# location_name: Optional[str] = Field(
# alias = 'event_location_name'
# )
# track_name: Optional[str] = Field(
# alias = 'event_track_name'
# )
# Including other related objects
# event: Optional[Event_Base]