Minor updates

This commit is contained in:
Scott Idem
2021-09-17 17:31:41 -04:00
parent 23c63ff09d
commit adb90fd214
2 changed files with 26 additions and 1 deletions

View File

@@ -9,6 +9,8 @@ from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.event_badge_template_models import Event_Badge_Template_Base from app.models.event_badge_template_models import Event_Badge_Template_Base
from app.models.order_models import Order_Base
class Event_Badge_Base(BaseModel): class Event_Badge_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -25,10 +27,13 @@ class Event_Badge_Base(BaseModel):
# account_id_random: Optional[str] # account_id_random: Optional[str]
# account_id: Optional[int] # account_id: Optional[int]
event_id_random: Optional[str] event_id_random: Optional[str]
event_id: Optional[int] event_id: Optional[int]
event_person_id_random: Optional[str] event_person_id_random: Optional[str]
event_person_id: Optional[int] event_person_id: Optional[int]
person_id_random: Optional[str] person_id_random: Optional[str]
person_id: Optional[int] person_id: Optional[int]
@@ -68,6 +73,24 @@ class Event_Badge_Base(BaseModel):
full_address: Optional[str] full_address: Optional[str]
# NOTE: More badge fields need to be added here once things are cleaned up # NOTE: More badge fields need to be added here once things are cleaned up
badge_type_code: Optional[str]
badge_type: Optional[str]
member_type_code: Optional[str]
member_type: Optional[str]
registration_type_code: Optional[str]
registration_type: Optional[str]
ticket_0_code: Optional[str]
ticket_1_code: Optional[str]
ticket_2_code: Optional[str]
ticket_3_code: Optional[str]
ticket_4_code: Optional[str]
ticket_5_code: Optional[str]
ticket_6_code: Optional[str]
ticket_7_code: Optional[str]
ticket_8_code: Optional[str]
ticket_9_code: Optional[str]
ticket_10_code: Optional[str]
priority: Optional[bool] priority: Optional[bool]
sort: Optional[int] sort: Optional[int]
@@ -78,6 +101,8 @@ class Event_Badge_Base(BaseModel):
updated_on: Optional[datetime.datetime] = None updated_on: Optional[datetime.datetime] = None
# Including other related objects # Including other related objects
order: Optional[Union[Order_Base, None]]
ticket_list: Optional[list]
event_badge_template: Optional[Union[Event_Badge_Template_Base, None]] event_badge_template: Optional[Union[Event_Badge_Template_Base, None]]
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)

View File

@@ -96,7 +96,7 @@ class Person_Base(BaseModel):
test_field: str = 'asdf 1234' test_field: str = 'asdf 1234'
# Convenience Data # Including convenience data
# This is only for convenience. Probably going to keep unless it causes a problem. # This is only for convenience. Probably going to keep unless it causes a problem.
email: Optional[str] email: Optional[str]
cc_email: Optional[str] cc_email: Optional[str]