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

Prep for ISHLT

Browse Source
This commit is contained in:
Scott Idem
2023-04-10 18:54:42 -04:00
parent d7e1ad6010
commit 4c18d50c3b
5 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/routers/event_exhibit_tracking.py
View File

@@ -226,7 +226,7 @@ async def get_event_exhibit_tracking_obj(
# ### BEGIN ### API Event Exhibit Tracking ### get_event_exhibit_obj_tracking_export() ###
# Updated 2022-04-21
# Updated 2023-04-10
@router.get('/event/exhibit/{event_exhibit_id}/tracking/export', response_model=Resp_Body_Base)
async def get_event_exhibit_obj_tracking_list(
event_exhibit_id: str = Query(..., min_length=11, max_length=22),
@@ -243,6 +243,9 @@ async def get_event_exhibit_obj_tracking_list(
if event_exhibit_id := redis_lookup_id_random(record_id_random=event_exhibit_id, table_name='event_exhibit'): pass
else: return mk_resp(data=None, status_code=404, response=commons.response)
# NOTE FUTURE: Use allowed_field_names in the future either set from the event as a whole or individual person. Use as column_name_li below.
# allowed_field_names = ['exhibit_tracking_id', 'badge_id']
if event_exhibit_tracking_rec_list_result := get_event_exhibit_tracking_rec_list(
event_exhibit_id = event_exhibit_id,
enabled = commons.enabled,
@@ -261,6 +264,7 @@ async def get_event_exhibit_obj_tracking_list(
event_exhibit_tracking_result_list.append(load_event_exhibit_tracking_result)
event_exhibit_tracking_obj = load_event_exhibit_tracking_result
# NOTE: Deal with field overrides made within Aether
if event_exhibit_tracking_obj.event_badge_pronouns_override:
event_exhibit_tracking_obj.event_badge_pronouns = event_exhibit_tracking_obj.event_badge_pronouns_override
event_exhibit_tracking_obj.event_badge_pronouns_override = None
@@ -301,9 +305,9 @@ async def get_event_exhibit_obj_tracking_list(
# return False
data_dict = event_exhibit_tracking_dict
# data_dict = event_exhibit_tracking_obj.dict(by_alias=True, exclude_unset=False)
# NOTE: Rename the fields to be more end user (exhibitor) friendly
# NOTE: The field overrides are taken care above
data_dict['exhibit_tracking_id'] = data_dict.pop('event_exhibit_tracking_id_random', None)
data_dict['badge_id'] = data_dict.pop('event_badge_id_random', None)
@@ -316,25 +320,22 @@ async def get_event_exhibit_obj_tracking_list(
data_dict['person_designations'] = data_dict.pop('event_badge_designations', None)
data_dict['person_professional_title'] = data_dict.pop('event_badge_professional_title', None)
# data_dict['person_professional_title_override'] = data_dict.pop('event_badge_professional_title_override', None)
data_dict['person_full_name'] = data_dict.pop('event_badge_full_name', None)
# data_dict['person_full_name_override'] = data_dict.pop('event_badge_full_name_override', None)
data_dict['person_affiliations'] = data_dict.pop('event_badge_affiliations', None)
# data_dict['person_affiliations_override'] = data_dict.pop('event_badge_affiliations_override', None)
data_dict['person_email'] = data_dict.pop('event_badge_email', None)
# if 'event_badge_address_line_1' in data_dict:
# data_dict['person_address_line_1'] = data_dict.pop('event_badge_address_line_1', None)
# else: data_dict['person_address_line_1'] = None
# if 'event_badge_address_line_2' in data_dict:
# data_dict['person_address_line_2'] = data_dict.pop('event_badge_address_line_2', None)
# else: data_dict['person_address_line_2'] = None
# if 'event_badge_address_line_3' in data_dict:
# data_dict['person_address_line_3'] = data_dict.pop('event_badge_address_line_3', None)
# else: data_dict['person_address_line_3'] = None
if 'event_badge_address_line_1' in data_dict:
data_dict['person_address_line_1'] = data_dict.pop('event_badge_address_line_1', None)
else: data_dict['person_address_line_1'] = None
if 'event_badge_address_line_2' in data_dict:
data_dict['person_address_line_2'] = data_dict.pop('event_badge_address_line_2', None)
else: data_dict['person_address_line_2'] = None
if 'event_badge_address_line_3' in data_dict:
data_dict['person_address_line_3'] = data_dict.pop('event_badge_address_line_3', None)
else: data_dict['person_address_line_3'] = None
if 'event_badge_city' in data_dict:
data_dict['person_city'] = data_dict.pop('event_badge_city', None)
@@ -364,9 +365,6 @@ async def get_event_exhibit_obj_tracking_list(
if 'event_badge_location' in data_dict:
data_dict['person_location'] = data_dict.pop('event_badge_location', None)
else: data_dict['person_location'] = None
# if 'event_badge_location_override' in data_dict:
# data_dict['person_location_override'] = data_dict.pop('event_badge_location_override', None)
# else: data_dict['person_location_override'] = None
log.debug(data_dict)
@@ -402,16 +400,16 @@ async def get_event_exhibit_obj_tracking_list(
'person_email',
# # 'person_address_line_1',
# # 'person_address_line_2',
# # 'person_address_line_3',
# 'person_address_line_1',
# 'person_address_line_2',
# 'person_address_line_3',
# # 'person_city',
'person_city',
# # 'person_country_subdivision_code', 'person_state_province_abb',
# # 'person_state_province',
'person_country_subdivision_code', 'person_state_province_abb',
'person_state_province',
# # 'person_postal_code',
# 'person_postal_code',
'person_country_alpha_2_code',
'person_country',