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

Minor badge clean up

Browse Source
This commit is contained in:
Scott Idem
2022-07-06 12:06:07 -04:00
parent 511f420555
commit 0a41699f5b
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/db_sql.py
View File

@@ -1046,6 +1046,10 @@ def lookup_id_random_pop(
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')
if 'event_id_random_only' in obj_data:
obj_data['event_id_only'] = redis_lookup_id_random(record_id_random=obj_data.get('event_id_random_only', None), table_name='event')
obj_data.pop('event_id_random_only')
if 'event_abstract_id_random' in obj_data: if 'event_abstract_id_random' in obj_data:
obj_data['event_abstract_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_abstract_id_random', None), table_name='event_abstract') obj_data['event_abstract_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_abstract_id_random', None), table_name='event_abstract')
obj_data.pop('event_abstract_id_random') obj_data.pop('event_abstract_id_random')
@@ -1054,6 +1058,10 @@ def lookup_id_random_pop(
obj_data['event_badge_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_badge_id_random', None), table_name='event_badge') obj_data['event_badge_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_badge_id_random', None), table_name='event_badge')
obj_data.pop('event_badge_id_random') obj_data.pop('event_badge_id_random')
if 'event_badge_template_id_random' in obj_data:
obj_data['event_badge_template_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_badge_template_id_random', None), table_name='event_badge_template')
obj_data.pop('event_badge_template_id_random')
if 'event_exhibit_id_random' in obj_data: if 'event_exhibit_id_random' in obj_data:
obj_data['event_exhibit_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_exhibit_id_random', None), table_name='event_exhibit') obj_data['event_exhibit_id'] = redis_lookup_id_random(record_id_random=obj_data.get('event_exhibit_id_random', None), table_name='event_exhibit')
obj_data.pop('event_exhibit_id_random') obj_data.pop('event_exhibit_id_random')

7
app/models/event_badge_models.py
View File

@@ -175,6 +175,13 @@ class Event_Badge_Base(BaseModel):
return redis_lookup_id_random(record_id_random=id_random, table_name='event') return redis_lookup_id_random(record_id_random=id_random, table_name='event')
return None return None
@validator('event_id_only', always=True)
def event_id_only_lookup(cls, v, values, **kwargs):
if isinstance(v, int) and v > 0: return v
elif id_random := values.get('event_id_random_only'):
return redis_lookup_id_random(record_id_random=id_random, table_name='event')
return None
@validator('event_badge_template_id', always=True) @validator('event_badge_template_id', always=True)
def event_badge_template_id_lookup(cls, v, values, **kwargs): def event_badge_template_id_lookup(cls, v, values, **kwargs):
if isinstance(v, int) and v > 0: return v if isinstance(v, int) and v > 0: return v