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

Work on abstracts.

Browse Source
This commit is contained in:
Scott Idem
2023-05-05 17:29:02 -04:00
parent 2698f06c57
commit 916cca1d73
4 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/data_store_models.py
View File

@@ -41,6 +41,9 @@ class Data_Store_Base(BaseModel):
description: Optional[str]
# json: Optional[str] # "json" is reserved; need to change field name? json_str?
json_str: Optional[Union[Json, None]] = Field(
alias = 'json',
)
text: Optional[str]
meta_json: Optional[str]
meta_text: Optional[str]

31
app/models/event_abstract_models.py
View File

@@ -33,7 +33,7 @@ class Event_Abstract_Base(BaseModel):
event_id_random: Optional[str]
event_id: Optional[int]
event_person_id_random: Optional[str]
event_person_id_random: Optional[str] # This is the primary person/submitter
event_person_id: Optional[int]
event_presentation_id_random: Optional[str]
@@ -48,15 +48,19 @@ class Event_Abstract_Base(BaseModel):
# event_track_id_random: Optional[str]
# event_track_id: Optional[int]
poc_event_person_id_random: Optional[str] # Maybe change this to primary_event_person?
poc_event_person_id: Optional[int] # Maybe change this to primary_event_person?
# poc_event_person_id_random: Optional[str] # Maybe change this to primary_event_person?
# poc_event_person_id: Optional[int] # Maybe change this to primary_event_person?
external_id: Optional[str]
grant_id: Optional[str]
code: Optional[str]
name: Optional[str]
description: Optional[str]
abstract: Optional[str]
passcode: Optional[str] # = '7777777'
data_json: Optional[Json]
enable: Optional[bool]
@@ -127,14 +131,14 @@ class Event_Abstract_Base(BaseModel):
return redis_lookup_id_random(record_id_random=id_random, table_name='event_session')
return None
@validator('poc_event_person_id', always=True)
def poc_event_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
# @validator('poc_event_person_id', always=True)
# def poc_event_person_id_lookup(cls, v, values, **kwargs):
# log.setLevel(logging.WARNING)
# log.debug(locals())
if values['poc_event_person_id_random']:
return redis_lookup_id_random(record_id_random=values['poc_event_person_id_random'], table_name='poc_event_person')
return None
# if values['poc_event_person_id_random']:
# return redis_lookup_id_random(record_id_random=values['poc_event_person_id_random'], table_name='poc_event_person')
# return None
class Config:
underscore_attrs_are_private = True
@@ -173,11 +177,16 @@ class Event_Abstract_Base_New(Core_Std_Obj_Base):
# event_track_id_random: Optional[str]
poc_event_person_id_random: Optional[str] # Maybe change this to primary_event_person?
# poc_event_person_id_random: Optional[str] # Maybe change this to primary_event_person?
external_id: Optional[str]
grant_id: Optional[str]
description: Optional[str]
abstract: Optional[str]
passcode: Optional[str]
class Config:
underscore_attrs_are_private = True
allow_population_by_field_name = True