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

More work on abstract submissions and related grants

Browse Source
This commit is contained in:
Scott Idem
2023-06-26 14:52:31 -04:00
parent 702357910a
commit 5b4af4bb34
2 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/models/event_person_models.py
View File

@@ -80,8 +80,22 @@ class Event_Person_Base(BaseModel):
# Including convenience data
# This is only for convenience. Probably going to keep unless it causes a problem.
# This block of person data should come from the event_person_profile table
informal_name: Optional[str]
given_name: Optional[str]
middle_name: Optional[str]
family_name: Optional[str]
full_name_override: Optional[str]
full_name: Optional[str]
affiliations: Optional[str]
email: Optional[str]
website_url: Optional[str]
# state_province_name: Optional[str] # Using extended_json for now for AACC abstracts
extended_json: Optional[Union[Json, None]]
event_badge_informal_name: 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]
@@ -92,16 +106,20 @@ class Event_Person_Base(BaseModel):
event_badge_country_alpha_2_code: Optional[str]
event_badge_country: Optional[str]
# This is the same as the other person data above
event_person_informal_name: Optional[str]
event_person_given_name: Optional[str]
event_person_middle_name: Optional[str]
event_person_family_name: Optional[str]
event_person_name_override: Optional[str]
event_person_full_name: Optional[str]
event_person_affiliations: Optional[str]
event_person_email: Optional[str]
event_person_extended_json: Optional[Union[Json, None]]
person_informal_name: Optional[str]
person_given_name: Optional[str]
person_middle_name: Optional[str]
person_family_name: Optional[str]
person_display_name: Optional[str]
person_full_name: Optional[str]
@@ -234,14 +252,54 @@ class Event_Person_New_Base(BaseModel):
event_id_random: Optional[str]
event_id: Optional[int]
extended_json: Optional[Union[Json, None]]
# Including convenience data
# This is only for convenience. Probably going to keep unless it causes a problem.
# This block of person data should come from the event_person_profile table
informal_name: Optional[str]
given_name: Optional[str]
middle_name: Optional[str]
family_name: Optional[str]
full_name: Optional[str]
full_name_override: Optional[str]
affiliations: Optional[str]
email: Optional[str]
website_url: Optional[str]
state_province_name: Optional[str]
event_badge_informal_name: 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_affiliations: Optional[str]
event_badge_email: Optional[str]
event_badge_city: Optional[str]
event_badge_state_province: Optional[str]
event_badge_country_alpha_2_code: Optional[str]
event_badge_country: Optional[str]
# This is the same as the other person data above
event_person_informal_name: Optional[str]
event_person_given_name: Optional[str]
event_person_middle_name: Optional[str]
event_person_family_name: Optional[str]
event_person_name_override: Optional[str]
event_person_full_name: Optional[str]
event_person_affiliations: Optional[str]
event_person_email: Optional[str]
person_given_name: Optional[str]
person_middle_name: Optional[str]
person_family_name: Optional[str]
person_full_name: Optional[str]
person_display_name: Optional[str]
affiliations: Optional[str] # One or more affiliations with organizations, companies, and other groups
# affiliations: Optional[str] # One or more affiliations with organizations, companies, and other groups
email: Optional[str]
# email: Optional[str]
#new_password: str = Field(default_factory = lambda:secrets.token_urlsafe(default_num_bytes))
#password: Optional[str]