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

General clean up. Workon event abstracts.

Browse Source
This commit is contained in:
Scott Idem
2023-03-20 19:39:41 -04:00
parent 02fa7225ac
commit df26128ce4
10 changed files with 589 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/models/event_abstract_models.py
View File

@@ -9,10 +9,10 @@ from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes
#from app.models.event_models import Event_Base
from app.models.event_person_models import Event_Person_Base
from app.models.event_presentation_models import Event_Presentation_Base
# from app.models.event_person_models import Event_Person_Base
# from app.models.event_presentation_models import Event_Presentation_Base
#from app.models.event_presenter_models import Event_Presenter_Base # This creates an import loop
from app.models.event_session_models import Event_Session_Base
# from app.models.event_session_models import Event_Session_Base
# ### BEGIN ### API Event Abstract Models ### Event_Abstract_Base() ###
@@ -56,10 +56,10 @@ class Event_Abstract_Base(BaseModel):
description: Optional[str]
abstract: Optional[str]
hide: Optional[bool]
public: Optional[bool]
public_hide: Optional[bool]
data_json: Optional[Json]
enable: Optional[bool]
hide: Optional[bool]
priority: Optional[bool]
sort: Optional[int]
group: Optional[str]
@@ -71,13 +71,13 @@ class Event_Abstract_Base(BaseModel):
# Including other related objects
#event: Optional[Event_Base]
event_file_list: Optional[list] # Optional[Event_File_Base]
event_person: Optional[Event_Person_Base]
event_presentation: Optional[Event_Presentation_Base]
# event_person: Optional[Event_Person_Base]
# event_presentation: Optional[Event_Presentation_Base]
#event_presenter: Optional[Event_Presenter_Base] # This creates an import loop
event_presenter_list: Optional[list] # Optional[Event_Presenter_Base]
event_session: Optional[Event_Session_Base]
# event_session: Optional[Event_Session_Base]
# event_track: Optional[Event_Track_Base]
poc_event_person: Optional[Event_Person_Base] # Maybe change this to primary_event_person?
# poc_event_person: Optional[Event_Person_Base] # Maybe change this to primary_event_person?
# poc_person: Optional[Person_Base] # Maybe change this to primary_person?
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)

4
app/models/event_exhibit_tracking_models.py
View File

@@ -43,8 +43,8 @@ class Event_Exhibit_Tracking_Base(BaseModel):
# responses_json: Optional[Json] = Field(
# default_factory = lambda:[{'test': ''}]
# )
# json_data: Optional[str]
json_data: Optional[Json]
data_json: Optional[Json]
# data_json: Optional[str]
enable: Optional[bool]
hide: Optional[bool]

3
app/models/event_person_models.py
View File

@@ -8,6 +8,7 @@ from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.event_models import Event_Base # Causes an import loop
from app.models.event_abstract_models import Event_Abstract_Base
from app.models.event_badge_models import Event_Badge_Base
# from app.models.event_exhibit_tracking_models import Event_Exhibit_Tracking_Base # Causes an import loop
from app.models.event_person_profile_models import Event_Person_Profile_Base
@@ -113,7 +114,7 @@ class Event_Person_Base(BaseModel):
# Including other related objects
# event: Optional[Event_Base] # Causes an import loop
event_abstract_list: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more abstracts
event_abstract_list: Optional[list[Event_Abstract_Base]] # Use event_person_detail table. An event_person record can be linked to one or more abstracts
event_badge: Optional[Event_Badge_Base] # Default attendee badge
event_badge_vendor: Optional[Event_Badge_Base] # Additional vendor badge
event_badge_vip: Optional[Event_Badge_Base] # Additional VIP badge

1
app/models/person_models.py
View File

@@ -120,6 +120,7 @@ class Person_Base(BaseModel):
# Maybe add timezone in the future?
# Including JSON data
data_json: Optional[Json]
other_json: Optional[Json]
meta_json: Optional[Json]