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

Working on post and post_comment and event

Browse Source
This commit is contained in:
Scott Idem
2021-06-29 15:15:46 -04:00
parent 0e15d8e3c0
commit 2d988fc405
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/db_sql.py
View File

@@ -811,6 +811,14 @@ def lookup_id_random_pop(obj_data:dict):
obj_data['contact_id'] = redis_lookup_id_random(record_id_random=obj_data['contact_id_random'], table_name='contact') obj_data['contact_id'] = redis_lookup_id_random(record_id_random=obj_data['contact_id_random'], table_name='contact')
obj_data.pop('contact_id_random') obj_data.pop('contact_id_random')
if 'contact_1_id_random' in obj_data:
obj_data['contact_1_id'] = redis_lookup_id_random(record_id_random=obj_data['contact_1_id_random'], table_name='contact')
obj_data.pop('contact_1_id_random')
if 'contact_2_id_random' in obj_data:
obj_data['contact_2_id'] = redis_lookup_id_random(record_id_random=obj_data['contact_2_id_random'], table_name='contact')
obj_data.pop('contact_2_id_random')
if 'event_id_random' in obj_data: if 'event_id_random' in obj_data:
obj_data['event_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_id_random', None), table_name='event') obj_data['event_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_id_random', None), table_name='event')
obj_data.pop('event_id_random') obj_data.pop('event_id_random')

8
app/models/event_models.py
View File

@@ -25,16 +25,20 @@ class Event_Base(BaseModel):
default_factory = lambda:secrets.token_urlsafe(default_num_bytes), default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
#alias = 'event_id' alias = 'event_id'
) )
account_id_random: Optional[str] account_id_random: Optional[str]
account_id: Optional[int] account_id: Optional[int]
poc_event_person_id_random: Optional[str] poc_event_person_id_random: Optional[str]
poc_event_person_id: Optional[int] poc_event_person_id: Optional[int]
poc_person_id_random: Optional[str] poc_person_id_random: Optional[str]
poc_person_id: Optional[int] poc_person_id: Optional[int]
user_id_random: Optional[str] user_id_random: Optional[str]
user_id: Optional[int] user_id: Optional[int]
lu_event_type_id: Optional[int] lu_event_type_id: Optional[int]
#lu_event_type: Optional[str] # Needs to be reviewed #lu_event_type: Optional[str] # Needs to be reviewed
@@ -169,7 +173,6 @@ class Event_Base(BaseModel):
return redis_lookup_id_random(record_id_random=values['poc_person_id_random'], table_name='person') return redis_lookup_id_random(record_id_random=values['poc_person_id_random'], table_name='person')
return None return None
@validator('user_id', always=True) @validator('user_id', always=True)
def user_id_lookup(cls, v, values, **kwargs): def user_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) log.setLevel(logging.WARNING)
@@ -181,6 +184,7 @@ class Event_Base(BaseModel):
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields fields = base_fields