From 15c1ee9e9c909dc9f8ba4b7730aca467a2a190a2 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Fri, 29 Apr 2022 10:30:15 -0400 Subject: [PATCH] Bug fixes for export with missing fields --- app/routers/event_exhibit_tracking.py | 36 ++++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/app/routers/event_exhibit_tracking.py b/app/routers/event_exhibit_tracking.py index c891d3e..522f790 100644 --- a/app/routers/event_exhibit_tracking.py +++ b/app/routers/event_exhibit_tracking.py @@ -280,23 +280,35 @@ async def get_event_exhibit_obj_tracking_list( data_dict['person_email'] = data_dict.pop('event_badge_email') - data_dict['person_address_line_1'] = data_dict.pop('event_badge_address_line_1') - data_dict['person_address_line_2'] = data_dict.pop('event_badge_address_line_2') - data_dict['person_address_line_3'] = data_dict.pop('event_badge_address_line_3') + if 'event_badge_address_line_1' in data_dict: + data_dict['person_address_line_1'] = data_dict.pop('event_badge_address_line_1') + if 'event_badge_address_line_2' in data_dict: + data_dict['person_address_line_2'] = data_dict.pop('event_badge_address_line_2') + if 'event_badge_address_line_3' in data_dict: + data_dict['person_address_line_3'] = data_dict.pop('event_badge_address_line_3') - data_dict['person_city'] = data_dict.pop('event_badge_city') + if 'event_badge_city' in data_dict: + data_dict['person_city'] = data_dict.pop('event_badge_city') - data_dict['person_country_subdivision_code'] = data_dict.pop('event_badge_country_subdivision_code') - data_dict['person_state_province_abb'] = data_dict.pop('event_badge_state_province_abb') - data_dict['person_state_province'] = data_dict.pop('event_badge_state_province') + if 'event_badge_country_subdivision_code' in data_dict: + data_dict['person_country_subdivision_code'] = data_dict.pop('event_badge_country_subdivision_code') + if 'event_badge_state_province_abb' in data_dict: + data_dict['person_state_province_abb'] = data_dict.pop('event_badge_state_province_abb') + if 'event_badge_state_province' in data_dict: + data_dict['person_state_province'] = data_dict.pop('event_badge_state_province') - data_dict['person_postal_code'] = data_dict.pop('event_badge_postal_code') + if 'event_badge_postal_code' in data_dict: + data_dict['person_postal_code'] = data_dict.pop('event_badge_postal_code') - data_dict['person_country_alpha_2_code'] = data_dict.pop('event_badge_country_alpha_2_code') - data_dict['person_country'] = data_dict.pop('event_badge_country') + if 'event_badge_country_alpha_2_code' in data_dict: + data_dict['person_country_alpha_2_code'] = data_dict.pop('event_badge_country_alpha_2_code') + if 'event_badge_country' in data_dict: + data_dict['person_country'] = data_dict.pop('event_badge_country') - data_dict['person_location'] = data_dict.pop('event_badge_location') - data_dict['person_display_location'] = data_dict.pop('event_badge_display_location') + if 'event_badge_location' in data_dict: + data_dict['person_location'] = data_dict.pop('event_badge_location') + if 'event_badge_display_location' in data_dict: + data_dict['person_display_location'] = data_dict.pop('event_badge_display_location') data_dict_list_for_export.append(data_dict) else: