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

Updating event abstracts related.

Browse Source
This commit is contained in:
Scott Idem
2023-03-20 15:29:08 -04:00
parent a07c0121df
commit 02fa7225ac
2 changed files with 32 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/log.py
View File

@@ -28,7 +28,7 @@ logging.config.dictConfig({
'class': 'logging.handlers.RotatingFileHandler', 'class': 'logging.handlers.RotatingFileHandler',
'formatter': 'long', 'formatter': 'long',
'filename': settings.LOG_PATH['app'], 'filename': settings.LOG_PATH['app'],
'maxBytes': 5242880, # 524,2880 = 5 MB 'maxBytes': 10485760, # 5,242,880 = 5 MB; 10,485,760 = 10 MB
'backupCount': 9 'backupCount': 9
}, },
# 'log_file_warning': { # 'log_file_warning': {

98
app/models/event_abstract_models.py
View File

@@ -13,38 +13,42 @@ from app.models.event_person_models import Event_Person_Base
from app.models.event_presentation_models import Event_Presentation_Base from app.models.event_presentation_models import Event_Presentation_Base
#from app.models.event_presenter_models import Event_Presenter_Base # This creates an import loop #from app.models.event_presenter_models import Event_Presenter_Base # This creates an import loop
from app.models.event_session_models import Event_Session_Base from app.models.event_session_models import Event_Session_Base
from app.models.event_track_models import Event_Track_Base
from app.models.person_models import Person_Base
# ### BEGIN ### API Event Abstract Models ### Event_Abstract_Base() ### # ### BEGIN ### API Event Abstract Models ### Event_Abstract_Base() ###
# Update 2023-03-20
class Event_Abstract_Base(BaseModel): class Event_Abstract_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['event_abstract_id_random'], # **base_fields['event_abstract_id_random'],
alias = 'event_abstract_id_random', alias = 'event_abstract_id_random',
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'event_abstract_id' alias = 'event_abstract_id'
) )
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]
event_presentation_id_random: Optional[str] event_presentation_id_random: Optional[str]
event_presentation_id: Optional[int] event_presentation_id: Optional[int]
event_presenter_id_random: Optional[str] event_presenter_id_random: Optional[str]
event_presenter_id: Optional[int] event_presenter_id: Optional[int]
event_session_id_random: Optional[str] event_session_id_random: Optional[str]
event_session_id: Optional[int] event_session_id: Optional[int]
event_track_id_random: Optional[str]
event_track_id: Optional[int] # 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_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: Optional[int] # Maybe change this to primary_event_person?
poc_person_id_random: Optional[str] # Maybe change this to primary_person?
poc_person_id: Optional[int] # Maybe change this to primary_person?
code: Optional[str] code: Optional[str]
@@ -72,83 +76,52 @@ class Event_Abstract_Base(BaseModel):
#event_presenter: Optional[Event_Presenter_Base] # This creates an import loop #event_presenter: Optional[Event_Presenter_Base] # This creates an import loop
event_presenter_list: Optional[list] # Optional[Event_Presenter_Base] event_presenter_list: Optional[list] # Optional[Event_Presenter_Base]
event_session: Optional[Event_Session_Base] event_session: Optional[Event_Session_Base]
event_track: Optional[Event_Track_Base] # event_track: Optional[Event_Track_Base]
poc_event_person: Optional[Event_Person_Base] # Maybe change this to primary_event_person? poc_event_person: Optional[Event_Person_Base] # Maybe change this to primary_event_person?
poc_person: Optional[Person_Base] # Maybe change this to primary_person? # poc_person: Optional[Person_Base] # Maybe change this to primary_person?
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('event_abstract_id_random', always=True)
def event_abstract_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) @validator('id', always=True)
def event_abstract_id_lookup(cls, v, values, **kwargs): def event_abstract_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) if isinstance(v, int) and v > 0: return v
log.debug(locals()) elif id_random := values.get('id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='event_abstract')
if values['id_random']:
log.debug(values['id_random'])
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='event_abstract')
return None return None
@validator('event_id', always=True) @validator('event_id', always=True)
def event_id_lookup(cls, v, values, **kwargs): def event_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) if isinstance(v, int) and v > 0: return v
log.debug(locals()) elif id_random := values.get('event_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='event')
if values['event_id_random']:
return redis_lookup_id_random(record_id_random=values['event_id_random'], table_name='event')
return None return None
@validator('event_person_id', always=True) @validator('event_person_id', always=True)
def event_person_id_lookup(cls, v, values, **kwargs): def event_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) if isinstance(v, int) and v > 0: return v
log.debug(locals()) elif id_random := values.get('event_person_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='event_person')
if values['event_person_id_random']:
return redis_lookup_id_random(record_id_random=values['event_person_id_random'], table_name='event_person')
return None return None
@validator('event_presentation_id', always=True) @validator('event_presentation_id', always=True)
def event_presentation_id_lookup(cls, v, values, **kwargs): def event_presentation_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) if isinstance(v, int) and v > 0: return v
log.debug(locals()) elif id_random := values.get('event_presentation_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='event_presentation')
if values['event_presentation_id_random']:
return redis_lookup_id_random(record_id_random=values['event_presentation_id_random'], table_name='event_presentation')
return None return None
@validator('event_presenter_id', always=True) @validator('event_presenter_id', always=True)
def event_presenter_id_lookup(cls, v, values, **kwargs): def event_presenter_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) if isinstance(v, int) and v > 0: return v
log.debug(locals()) elif id_random := values.get('event_presenter_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='event_presenter')
if values['event_presenter_id_random']:
return redis_lookup_id_random(record_id_random=values['event_presenter_id_random'], table_name='event_presenter')
return None return None
@validator('event_session_id', always=True) @validator('event_session_id', always=True)
def event_session_id_lookup(cls, v, values, **kwargs): def event_session_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) if isinstance(v, int) and v > 0: return v
log.debug(locals()) elif id_random := values.get('event_session_id_random'):
return redis_lookup_id_random(record_id_random=id_random, table_name='event_session')
if values['event_session_id_random']:
return redis_lookup_id_random(record_id_random=values['event_session_id_random'], table_name='event_session')
return None
@validator('event_track_id', always=True)
def event_track_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['event_track_id_random']:
return redis_lookup_id_random(record_id_random=values['event_track_id_random'], table_name='event_track')
return None return None
@validator('poc_event_person_id', always=True) @validator('poc_event_person_id', always=True)
@@ -160,15 +133,6 @@ class Event_Abstract_Base(BaseModel):
return redis_lookup_id_random(record_id_random=values['poc_event_person_id_random'], table_name='poc_event_person') return redis_lookup_id_random(record_id_random=values['poc_event_person_id_random'], table_name='poc_event_person')
return None return None
@validator('poc_person_id', always=True)
def poc_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['poc_person_id_random']:
return redis_lookup_id_random(record_id_random=values['poc_person_id_random'], table_name='poc_person')
return None
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True