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

General code clean up. Work on event tracking related

Browse Source
This commit is contained in:
Scott Idem
2022-02-15 13:25:19 -05:00
parent b3cbfcfb9d
commit 003ffb4adf
8 changed files with 155 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/event_exhibit_models.py
View File

@@ -8,7 +8,7 @@ from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
from app.models.event_exhibit_tracking_models import Event_Exhibit_Tracking_Base
class Event_Exhibit_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -72,6 +72,9 @@ class Event_Exhibit_Base(BaseModel):
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
# Including other related objects
event_exhibit_tracking_list: Optional[list[Event_Exhibit_Tracking_Base]]
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('event_exhibit_id_random', always=True)

7
app/models/event_exhibit_tracking_models.py
View File

@@ -9,6 +9,9 @@ from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.event_badge_models import Event_Badge_Base
from app.models.event_person_models import Event_Person_Base
class Event_Exhibit_Tracking_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -65,6 +68,10 @@ class Event_Exhibit_Tracking_Base(BaseModel):
event_exhibit_name: Optional[str]
# Including other related objects
event_badge: Optional[Union[Event_Badge_Base, None]]
event_person: Optional[Union[Event_Person_Base, None]]
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('event_exhibit_tracking_id_random', always=True)

2
app/models/event_person_models.py
View File

@@ -10,6 +10,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_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
from app.models.event_registration_models import Event_Registration_Base
from app.models.person_models import Person_Base
@@ -103,6 +104,7 @@ class Event_Person_Base(BaseModel):
event_badge_vendor: Optional[Event_Badge_Base] # Additional vendor badge
event_badge_vip: Optional[Event_Badge_Base] # Additional VIP badge
event_exhibit_list: Optional[list] # Use event_person_detail table. An event_person record can be linked to one or more exhibits
# event_exhibit_tracking_list: Optional[list[Event_Exhibit_Tracking_Base]]
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