diff --git a/app/routers/event_importing.py b/app/routers/event_importing.py index fdf0f79..26484a5 100644 --- a/app/routers/event_importing.py +++ b/app/routers/event_importing.py @@ -411,7 +411,7 @@ async def event_importing_program_data( 'location_external_id': str, 'location_code': str, 'location_sort': int, 'presentation_external_id': str, 'presentation_code': str, 'presentation_sort': int, - 'presenter_external_id': str, 'presenter_code': str, 'presenter_number': int, 'presenter_designations': str, 'presenter_sort': int, + 'presenter_external_id': str, 'presenter_code': str, 'presenter_number': int, 'presenter_designations': str, 'presenter_sort': int, 'presenter_given_name': str, 'session_external_id': str, 'session_code': str, 'session_sort': int, 'source_id': str, 'Source ID': str, 'email': str, 'Email Address': str @@ -426,10 +426,12 @@ async def event_importing_program_data( 'Prefix': 'presenter_title_names', 'Informal_name': 'presenter_informal_name', 'Nickname': 'presenter_informal_name', + 'given_name': 'presenter_given_name', 'given_name (first)': 'presenter_given_name', 'Given Name': 'presenter_given_name', 'First Name': 'presenter_given_name', 'Middle Name': 'presenter_middle_name', + 'family_name': 'presenter_family_name', 'family_name (last)': 'presenter_family_name', 'Family Name': 'presenter_family_name', 'Last Name': 'presenter_family_name', @@ -754,6 +756,11 @@ 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'): + event_presenter_data['code'] = event_presenter_code + elif event_presenter_code := record.get('presenter_number'): + event_presenter_data['code'] = event_presenter_code + if event_presenter_number := record.get('presenter_number'): event_presenter_data['sort'] = event_presenter_number elif event_presenter_number := isinstance(record.get('presenter_code'), int): @@ -808,7 +815,8 @@ async def event_importing_program_data( log.warning(event_presenter_obj_in_result) continue # Something unexpected may have happened data['event_presenter_id'] = event_presenter_id - data['event_presenter_code'] = event_presenter_number + data['event_presenter_code'] = event_presenter_code + data['event_presenter_number'] = event_presenter_number data['event_presenter_full_name'] = event_presenter_full_name # End of the loop. Append to program list data results.