diff --git a/app/methods/event_badge_methods.py b/app/methods/event_badge_methods.py index e06d6c6..b4198df 100644 --- a/app/methods/event_badge_methods.py +++ b/app/methods/event_badge_methods.py @@ -322,11 +322,12 @@ def create_update_event_badge_obj_v4( elif event_person_id := event_badge_obj.event_person_id: pass if event_badge_id: - if event_badge_dict_up_result := sql_update(data=event_badge_dict, table_name='event_badge', rm_id_random=True): pass - else: - log.warning(f'Event Badge not updated. Event Badge ID: {event_badge_id}') + event_badge_dict_up_result = sql_update(data=event_badge_dict, table_name='event_badge', record_id=event_badge_id, rm_id_random=True) + if event_badge_dict_up_result is False: + log.warning(f'Event Badge update failed (DB error). Event Badge ID: {event_badge_id}') log.debug(event_badge_dict_up_result) return False + # None means 0 rows affected (record unchanged) — not an error log.debug(event_badge_dict_up_result) else: if event_badge_dict_in_result := sql_insert(data=event_badge_dict, table_name='event_badge', rm_id_random=True, id_random_length=None): pass diff --git a/app/methods/event_person_methods.py b/app/methods/event_person_methods.py index ed3536f..b3d26ba 100644 --- a/app/methods/event_person_methods.py +++ b/app/methods/event_person_methods.py @@ -355,7 +355,7 @@ def create_update_event_person_obj_v4( fail_any: bool = False, # Fail if any thing goes wrong for sub objects return_outline: bool = False, ) -> int|bool: - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) # ### SECTION ### Secondary data validation @@ -474,11 +474,11 @@ def create_update_event_person_obj_v4( event_person_profile_id = event_person_obj.event_person_profile_id if event_person_id: - if event_person_dict_up_result := sql_update(data=event_person_dict, table_name='event_person', rm_id_random=True): pass - else: - log.warning(f'Event Person not updated. Event Person ID: {event_person_id}') - log.debug(event_person_dict_up_result) + event_person_dict_up_result = sql_update(data=event_person_dict, table_name='event_person', record_id=event_person_id, rm_id_random=True) + if event_person_dict_up_result is False: + log.warning(f'Event Person update failed (DB error). Event Person ID: {event_person_id}') return False + # None means 0 rows affected (record unchanged) — not an error, continue to sub-objects log.debug(event_person_dict_up_result) else: if event_person_dict_in_result := sql_insert(data=event_person_dict, table_name='event_person', rm_id_random=True, id_random_length=None): pass diff --git a/app/methods/event_person_profile_methods.py b/app/methods/event_person_profile_methods.py index f7a4781..fc2786a 100644 --- a/app/methods/event_person_profile_methods.py +++ b/app/methods/event_person_profile_methods.py @@ -154,11 +154,12 @@ def create_update_event_person_profile_obj_v4( contact_id = event_person_profile_obj.contact_id if event_person_profile_id: - if event_person_profile_dict_up_result := sql_update(data=event_person_profile_dict, table_name='event_person_profile', rm_id_random=True): pass - else: - log.warning(f'Event Person Profile not updated. Event Person Profile ID: {event_person_profile_id}') + event_person_profile_dict_up_result = sql_update(data=event_person_profile_dict, table_name='event_person_profile', record_id=event_person_profile_id, rm_id_random=True) + if event_person_profile_dict_up_result is False: + log.warning(f'Event Person Profile update failed (DB error). Event Person Profile ID: {event_person_profile_id}') log.debug(event_person_profile_dict_up_result) return False + # None means 0 rows affected (record unchanged) — not an error log.debug(event_person_profile_dict_up_result) else: if event_person_profile_dict_in_result := sql_insert(data=event_person_profile_dict, table_name='event_person_profile', rm_id_random=True, id_random_length=8): pass diff --git a/app/methods/event_presentation_methods.py b/app/methods/event_presentation_methods.py index 337d0c0..26d0426 100644 --- a/app/methods/event_presentation_methods.py +++ b/app/methods/event_presentation_methods.py @@ -429,9 +429,9 @@ def create_update_event_presentation_obj_v4( event_presentation_dict = event_presentation_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presenter', 'event_presenter_list', 'created_on', 'updated_on'}) if event_presentation_id: - if event_presentation_dict_up_result := sql_update(data=event_presentation_dict, table_name='event_presentation', rm_id_random=True): pass - else: - log.warning(f'Event Presentation not updated. Event Presentation ID: {event_presentation_id}') + event_presentation_dict_up_result = sql_update(data=event_presentation_dict, table_name='event_presentation', record_id=event_presentation_id, rm_id_random=True) + if event_presentation_dict_up_result is False: + log.warning(f'Event Presentation update failed (DB error). Event Presentation ID: {event_presentation_id}') log.debug(event_presentation_dict_up_result) return False log.debug(event_presentation_dict_up_result) diff --git a/app/methods/event_presenter_methods.py b/app/methods/event_presenter_methods.py index 32dc49d..1c77a29 100644 --- a/app/methods/event_presenter_methods.py +++ b/app/methods/event_presenter_methods.py @@ -404,9 +404,9 @@ def create_update_event_presenter_obj_v4( event_presenter_dict = event_presenter_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'}) if event_presenter_id: - if event_presenter_dict_up_result := sql_update(data=event_presenter_dict, table_name='event_presenter', rm_id_random=True): pass - else: - log.warning(f'Event Presenter not updated. Event Presenter ID: {event_presenter_id}') + event_presenter_dict_up_result = sql_update(data=event_presenter_dict, table_name='event_presenter', record_id=event_presenter_id, rm_id_random=True) + if event_presenter_dict_up_result is False: + log.warning(f'Event Presenter update failed (DB error). Event Presenter ID: {event_presenter_id}') log.debug(event_presenter_dict_up_result) return False log.debug(event_presenter_dict_up_result) diff --git a/app/routers/event_badge_importing.py b/app/routers/event_badge_importing.py index a19c674..a1278c0 100644 --- a/app/routers/event_badge_importing.py +++ b/app/routers/event_badge_importing.py @@ -647,11 +647,14 @@ async def event_id_badge_import_zoom_csv( # TEMPORARY: Axonius-specific mapping for certain ticket / badge labels # to internal `badge_type_code` values. Remove after the event (~2 weeks). - axonius_badge_map = { - 'in-person attendee': 'attendee', - 'adapt26 sponsor': 'sponsor', - } - badge_type_code = axonius_badge_map.get(ticket_name.strip().lower()) + normalized_ticket = ticket_name.strip().lower() + badge_type_code = None + if 'sponsor' in normalized_ticket: + badge_type_code = 'sponsor' + elif 'attend' in normalized_ticket or 'attendee' in normalized_ticket: + badge_type_code = 'attendee' + if badge_type_code: + log.info(f"Axonius mapping applied: '{ticket_name}' -> '{badge_type_code}'") event_person_data = { 'account_id': account_id,