From c4b9396f52b770914b3ce0f032f7ff2c6ad682e8 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 25 Mar 2025 15:27:15 -0400 Subject: [PATCH] Updates before BGH 2025 --- app/routers/event_importing.py | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/routers/event_importing.py b/app/routers/event_importing.py index a0f526b..b5cd2e2 100644 --- a/app/routers/event_importing.py +++ b/app/routers/event_importing.py @@ -533,7 +533,7 @@ async def event_importing_program_data( if event_presentation_external_id := record.get('presentation_external_id'): log.info('Using presentation_external_id for event_presentation_external_id') - elif event_presentation_external_id := record.get('presentation_code').strip(): + elif event_presentation_external_id := record.get('presentation_code', '').strip(): log.info('Using presentation_code for event_presentation_external_id') else: log.warning('No presentation external ID or code was found. Creating one with the name...') @@ -543,7 +543,7 @@ async def event_importing_program_data( if event_presenter_external_id := record.get('presenter_external_id'): log.info('Using presenter_external_id for event_presenter_external_id') - elif event_presenter_external_id := record.get('presenter_code').strip(): + elif event_presenter_external_id := record.get('presenter_code', '').strip(): log.info('Using presenter_code for event_presenter_external_id') elif event_presenter_external_id := record.get('presenter_number'): log.info('Using presenter_number for event_presenter_external_id') @@ -576,14 +576,14 @@ async def event_importing_program_data( event_location_data = {} if record.get('location_code'): - event_location_data['code'] = record.get('location_code').strip() + event_location_data['code'] = record.get('location_code', '').strip() elif record.get('location_name'): - event_location_data['code'] = record.get('location_name').strip() + event_location_data['code'] = record.get('location_name', '').strip() event_location_data['event_id'] = event_id # INSERT and UPDATE the event_id just in case if record.get('location_name'): - event_location_data['name'] = record.get('location_name').strip() + event_location_data['name'] = record.get('location_name', '').strip() elif record.get('location_code'): - event_location_data['name'] = record.get('location_code').strip() + event_location_data['name'] = record.get('location_code', '').strip() event_location_data['enable'] = True event_location_id = None @@ -634,30 +634,30 @@ async def event_importing_program_data( event_session_data = {} if record.get('session_code'): - event_session_data['code'] = record.get('session_code').strip() + event_session_data['code'] = record.get('session_code', '').strip() else: event_session_data['code'] = None event_session_data['event_id'] = event_id # INSERT and UPDATE the event_id just in case event_session_data['event_location_id'] = event_location_id # INSERT and UPDATE the event_location_id in case the session was moved if record.get('session_name'): - event_session_data['name'] = record.get('session_name').strip() + event_session_data['name'] = record.get('session_name', '').strip() else: event_session_data['name'] = None # Max length of type_code is 25 characters. We must truncate it. if record.get('session_type_code'): - event_session_data['type_code'] = record.get('session_type_code').strip()[:25] + event_session_data['type_code'] = record.get('session_type_code', '').strip()[:25] elif record.get('session_type'): - event_session_data['type_code'] = record.get('session_type').strip()[:25] + event_session_data['type_code'] = record.get('session_type', '').strip()[:25] if record.get('session_description'): event_session_data['description'] = record.get('session_description', '').strip() - event_session_data['start_datetime'] = record.get('session_start_datetime').strip() + event_session_data['start_datetime'] = record.get('session_start_datetime', '').strip() # event_session_start_datetime = record.get('event_session_start_date', '') + ' ' + record.get('event_session_start_time', '') # event_session_data['start_datetime'] = event_session_start_datetime - event_session_data['end_datetime'] = record.get('session_end_datetime').strip() + event_session_data['end_datetime'] = record.get('session_end_datetime', '').strip() # event_session_end_datetime = record.get('event_session_end_date', '') + ' ' + record.get('event_session_end_time', '') # event_session_data['end_datetime'] = event_session_end_datetime @@ -719,14 +719,14 @@ async def event_importing_program_data( event_presentation_data = {} if record.get('presentation_code'): - event_presentation_data['code'] = record.get('presentation_code').strip() + event_presentation_data['code'] = record.get('presentation_code', '').strip() else: event_presentation_data['code'] = None event_presentation_data['event_id'] = event_id # INSERT and UPDATE the event_id just in case event_presentation_data['event_session_id'] = event_session_id # UPDATE the event_session_id in case the presentation was moved if record.get('presentation_name'): - event_presentation_data['name'] = record.get('presentation_name').strip() + event_presentation_data['name'] = record.get('presentation_name', '').strip() else: event_presentation_data['name'] = None @@ -734,21 +734,21 @@ async def event_importing_program_data( event_presentation_data['description'] = record.get('presentation_description', '').strip() if record.get('presentation_start_datetime'): - event_presentation_data['start_datetime'] = record.get('presentation_start_datetime').strip() + event_presentation_data['start_datetime'] = record.get('presentation_start_datetime', '').strip() data['presentation_start_datetime'] = event_presentation_data['start_datetime'] else: event_presentation_data['start_datetime'] = None data['presentation_start_datetime'] = None if record.get('presentation_end_datetime'): - event_presentation_data['end_datetime'] = record.get('presentation_end_datetime').strip() + event_presentation_data['end_datetime'] = record.get('presentation_end_datetime', '').strip() data['presentation_end_datetime'] = event_presentation_data['end_datetime'] else: event_presentation_data['end_datetime'] = None data['presentation_end_datetime'] = None if record.get('presentation_abstract_code'): - event_presentation_data['abstract_code'] = record.get('presentation_abstract_code').strip() + event_presentation_data['abstract_code'] = record.get('presentation_abstract_code', '').strip() else: event_presentation_data['abstract_code'] = None @@ -840,7 +840,7 @@ async def event_importing_program_data( event_presenter_data['event_session_id'] = event_session_id # UPDATE the event_session_id in case the presentation was moved event_presenter_data['event_presentation_id'] = event_presentation_id # UPDATE the event_presentation_id in case the presenter was moved - if event_presenter_code := record.get('presenter_code').strip(): + if event_presenter_code := record.get('presenter_code', '').strip(): event_presenter_data['code'] = event_presenter_code elif event_presenter_code := record.get('presenter_number'): event_presenter_data['code'] = event_presenter_code