Work on exhibit tracking export and API badge ID lookup
This commit is contained in:
Scott Idem
@@ -62,16 +62,11 @@ class Event_Badge_Base(BaseModel):
|
||||
professional_title_override: Optional[str] # Override professional title
|
||||
# title: Optional[str] # NOTE: Phasing out! Use *professional_title* instead.
|
||||
|
||||
display_name: Optional[str] # NOTE: Deprecated! Phasing out! Use *full_name_override* instead.
|
||||
full_name_override: Optional[str] # # Override full_name; Actual name shown on badge and other "public" areas
|
||||
|
||||
# BEGIN # Auto created name variations
|
||||
full_name: Optional[str] # title_names given_name middle_name family_name designations
|
||||
full_name_override: Optional[str] # # Override full_name; Actual name shown on badge and other "public" areas
|
||||
|
||||
affiliations: Optional[str] # One or more affiliations with organizations, companies, and other groups
|
||||
# affiliation: Optional[str] # NOTE: Phasing out! Use *affiliations* instead.
|
||||
# affiliation_name: Optional[str] # NOTE: Phasing out! Use *affiliations* instead.
|
||||
display_affiliations: Optional[str] # NOTE: Deprecated! Phasing out! Use *affiliations_override* instead.
|
||||
affiliations_override: Optional[str] # Override affiliations
|
||||
|
||||
email: Optional[str]
|
||||
@@ -100,10 +95,9 @@ class Event_Badge_Base(BaseModel):
|
||||
# full_address: Optional[str]
|
||||
|
||||
location: Optional[str] # Actual location name shown on badge and other "public" areas
|
||||
location_override: Optional[str] # Override location
|
||||
location_short: Optional[str] # Auto generated short version
|
||||
location_long: Optional[str] # Auto generated long version
|
||||
display_location: Optional[str] # NOTE: Deprecated! Phasing out! Use *location_override* instead.
|
||||
location_override: Optional[str] # Override location
|
||||
|
||||
# This is updated using SQL triggers and a SQL function
|
||||
# Combines informal, given, middle, family, email
|
||||
@@ -233,6 +227,8 @@ class Event_Badge_Basic_Base(BaseModel):
|
||||
# external_reg_id: Optional[str] # Registration ID generated by external system (should be stable and not change)
|
||||
|
||||
pronouns: Optional[str] # Preferred pronouns
|
||||
pronouns_override: Optional[str] # Preferred pronouns
|
||||
|
||||
informal_name: Optional[str]
|
||||
|
||||
title_names: Optional[str] # Title for generation, official position, or professional or academic qualification, other honorific, or other name prefix
|
||||
@@ -242,17 +238,20 @@ class Event_Badge_Basic_Base(BaseModel):
|
||||
designations: Optional[str] # Temporary or long-term designations related to family, relationships, person differentiation (Junior/Senior), location, social status, professional qualifications, legal status, or other name suffix
|
||||
|
||||
professional_title: Optional[str] # Professional title
|
||||
display_professional_title: Optional[str] # Override professional title
|
||||
|
||||
display_name: Optional[str] # Override full_name; Actual name shown on badge and other "public" areas
|
||||
professional_title_override: Optional[str] # Override professional title
|
||||
|
||||
# BEGIN # Auto created name variations
|
||||
full_name: Optional[str] # title_names given_name middle_name family_name designations
|
||||
full_name_override: Optional[str] # Override full_name; Actual name shown on badge and other "public" areas
|
||||
|
||||
affiliations: Optional[str] # One or more affiliations with organizations, companies, and other groups
|
||||
display_affiliations: Optional[str] # Override affiliations
|
||||
affiliations_override: Optional[str] # Override affiliations
|
||||
|
||||
email: Optional[str]
|
||||
email_override: Optional[str]
|
||||
|
||||
phone: Optional[str]
|
||||
phone_override: Optional[str]
|
||||
|
||||
# address_line_1: Optional[str]
|
||||
# address_line_2: Optional[str]
|
||||
@@ -272,10 +271,10 @@ class Event_Badge_Basic_Base(BaseModel):
|
||||
country: Optional[str]
|
||||
|
||||
# full_address: Optional[str]
|
||||
# location: Optional[str] # Actual location name shown on badge and other "public" areas
|
||||
location: Optional[str] # Actual location name shown on badge and other "public" areas
|
||||
location_override: Optional[str] # Override location
|
||||
# location_short: Optional[str] # Auto generated short version
|
||||
# location_long: Optional[str] # Auto generated long version
|
||||
display_location: Optional[str] # Override location
|
||||
|
||||
# NOTE: More badge fields need to be added here once things are cleaned up
|
||||
# badge_type_code: Optional[str]
|
||||
@@ -289,7 +288,7 @@ class Event_Badge_Basic_Base(BaseModel):
|
||||
# other_2: Optional[str]
|
||||
|
||||
# agree_to_tc: Optional[bool] # Agree to terms and conditions
|
||||
allow_tracking: Optional[bool] # Allow tracking for lead retrival and other marketing
|
||||
allow_tracking: Optional[bool] # Allow tracking for lead retrieval and other marketing
|
||||
|
||||
# print_first_datetime: Optional[datetime.datetime] = None
|
||||
# print_last_datetime: Optional[datetime.datetime] = None
|
||||
@@ -312,36 +311,6 @@ class Event_Badge_Basic_Base(BaseModel):
|
||||
|
||||
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
|
||||
|
||||
#@validator('event_badge_id_random', always=True)
|
||||
# def event_badge_id_random_copy(cls, v, values, **kwargs):
|
||||
# log.setLevel(logging.WARNING)
|
||||
# log.debug(locals())
|
||||
|
||||
# if values['id_random']:
|
||||
# return values['id_random']
|
||||
# return None
|
||||
|
||||
# @validator('id', always=True)
|
||||
# def event_badge_id_lookup(cls, v, values, **kwargs):
|
||||
# if isinstance(v, int) and v > 0: return v
|
||||
# elif id_random := values.get('id_random'):
|
||||
# return redis_lookup_id_random(record_id_random=id_random, table_name='event_badge')
|
||||
# return None
|
||||
|
||||
# @validator('event_badge_template_id', always=True)
|
||||
# def event_badge_template_id_lookup(cls, v, values, **kwargs):
|
||||
# if isinstance(v, int) and v > 0: return v
|
||||
# elif id_random := values.get('event_badge_template_id_random'):
|
||||
# return redis_lookup_id_random(record_id_random=id_random, table_name='event_badge_template')
|
||||
# return None
|
||||
|
||||
# @validator('event_person_id', always=True)
|
||||
# def event_person_id_lookup(cls, v, values, **kwargs):
|
||||
# if isinstance(v, int) and v > 0: return v
|
||||
# elif id_random := values.get('event_person_id_random'):
|
||||
# return redis_lookup_id_random(record_id_random=id_random, table_name='event_person')
|
||||
# return None
|
||||
|
||||
class Config:
|
||||
underscore_attrs_are_private = True
|
||||
allow_population_by_field_name = True
|
||||
|
||||
@@ -58,21 +58,67 @@ class Event_Exhibit_Tracking_Base(BaseModel):
|
||||
|
||||
# Including convenience data
|
||||
# This is only for convenience. Probably going to keep unless it causes a problem.
|
||||
event_badge_informal_name: Optional[str]
|
||||
event_badge_title_names: Optional[str]
|
||||
event_badge_given_name: Optional[str]
|
||||
event_badge_middle_name: Optional[str]
|
||||
event_badge_family_name: Optional[str]
|
||||
event_badge_full_name: Optional[str]
|
||||
event_badge_full_name_override: Optional[str]
|
||||
event_badge_pronouns: Optional[str] = Field(
|
||||
alias = 'person_pronouns'
|
||||
) # Preferred pronouns
|
||||
event_badge_pronouns_override: Optional[str] = Field(
|
||||
alias = 'person_pronouns_override'
|
||||
) # Override pronouns
|
||||
|
||||
event_badge_designations: Optional[str]
|
||||
event_badge_professional_title: Optional[str]
|
||||
event_badge_professional_title_override: Optional[str]
|
||||
event_badge_affiliations: Optional[str]
|
||||
event_badge_affiliations_override: Optional[str]
|
||||
event_badge_informal_name: Optional[str] = Field(
|
||||
alias = 'person_informal_name'
|
||||
)
|
||||
|
||||
event_badge_email: Optional[str]
|
||||
event_badge_title_names: Optional[str] = Field(
|
||||
# alias = 'person_title_names'
|
||||
)
|
||||
event_badge_given_name: Optional[str] = Field(
|
||||
# alias = 'person_given_name'
|
||||
)
|
||||
event_badge_middle_name: Optional[str] = Field(
|
||||
# alias = 'person_middle_name'
|
||||
)
|
||||
event_badge_family_name: Optional[str] = Field(
|
||||
# alias = 'person_family_name'
|
||||
)
|
||||
event_badge_designations: Optional[str] = Field(
|
||||
# alias = 'person_designations'
|
||||
)
|
||||
|
||||
event_badge_professional_title: Optional[str] = Field(
|
||||
# alias = 'person_pronouns_override'
|
||||
)
|
||||
event_badge_professional_title_override: Optional[str] = Field(
|
||||
# alias = 'person_professional_title'
|
||||
)
|
||||
|
||||
event_badge_full_name: Optional[str] = Field(
|
||||
# alias = 'person_full_name'
|
||||
)
|
||||
event_badge_full_name_override: Optional[str] = Field(
|
||||
# alias = 'person_full_name_override'
|
||||
)
|
||||
|
||||
event_badge_affiliations: Optional[str] = Field(
|
||||
# alias = 'person_affiliations'
|
||||
)
|
||||
event_badge_affiliations_override: Optional[str] = Field(
|
||||
# alias = 'person_affiliations_override'
|
||||
)
|
||||
|
||||
event_badge_email: Optional[str] = Field(
|
||||
# alias = 'person_email'
|
||||
)
|
||||
event_badge_email_override: Optional[str] = Field(
|
||||
# alias = 'person_email_override'
|
||||
)
|
||||
|
||||
event_badge_phone: Optional[str] = Field(
|
||||
# alias = 'person_phone'
|
||||
)
|
||||
event_badge_phone_override: Optional[str] = Field(
|
||||
# alias = 'person_phone_override'
|
||||
)
|
||||
|
||||
# event_badge_address_line_1: Optional[str]
|
||||
# event_badge_address_line_2: Optional[str]
|
||||
@@ -80,17 +126,27 @@ class Event_Exhibit_Tracking_Base(BaseModel):
|
||||
|
||||
# event_badge_city: Optional[str]
|
||||
|
||||
# event_badge_county: Optional[str] # NOTE: This is for a county within a state or province
|
||||
|
||||
# event_badge_country_subdivision_code: Optional[str]
|
||||
# event_badge_state_province_abb: Optional[str]
|
||||
# event_badge_state_province: Optional[str]
|
||||
# event_badge_state_province_abb: Optional[str]
|
||||
|
||||
# event_badge_postal_code: Optional[str]
|
||||
|
||||
event_badge_country_alpha_2_code: Optional[str]
|
||||
event_badge_country: Optional[str]
|
||||
event_badge_country_alpha_2_code: Optional[str] = Field(
|
||||
# alias = 'person_country_alpha_2_code'
|
||||
)
|
||||
event_badge_country: Optional[str] = Field(
|
||||
# alias = 'person_country'
|
||||
)
|
||||
|
||||
# event_badge_location: Optional[str]
|
||||
event_badge_location_override: Optional[str]
|
||||
event_badge_location: Optional[str] = Field(
|
||||
# alias = 'person_location'
|
||||
)
|
||||
event_badge_location_override: Optional[str] = Field(
|
||||
# alias = 'person_location_override'
|
||||
)
|
||||
|
||||
event_person_informal_name: Optional[str]
|
||||
event_person_given_name: Optional[str]
|
||||
|
||||
Reference in New Issue
Block a user