diff --git a/app/methods/e_impexium_methods.py b/app/methods/e_impexium_methods.py index 3baafb9..16e5597 100644 --- a/app/methods/e_impexium_methods.py +++ b/app/methods/e_impexium_methods.py @@ -28,7 +28,7 @@ api['headers'] = { 'Content-Type': 'application/json;charset=UTF-8' } # Updated 2022-02-18 @logger_reset def get_access_token(): - log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) log.debug(f'App data:\n{app}') @@ -64,7 +64,7 @@ def get_access_token(): # Updated 2022-02-18 @logger_reset def authenticate(): - log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) result = get_access_token() diff --git a/app/methods/event_person_methods.py b/app/methods/event_person_methods.py index 731be0d..dba2437 100644 --- a/app/methods/event_person_methods.py +++ b/app/methods/event_person_methods.py @@ -403,7 +403,7 @@ def create_update_event_person_obj_v4( event_person_obj.event_id = event_id log.debug(event_person_obj) - event_person_dict = event_person_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_badge', 'event_person_profile', 'event_registration', 'created_on', 'updated_on'}) + event_person_dict = event_person_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_badge', 'event_person_profile', 'event_registration', 'created_on', 'updated_on', 'external_id_old'}) # ### SECTION ### Process data if not event_badge_id: diff --git a/app/methods/event_person_profile_methods.py b/app/methods/event_person_profile_methods.py index ccf8f44..95587fe 100644 --- a/app/methods/event_person_profile_methods.py +++ b/app/methods/event_person_profile_methods.py @@ -144,7 +144,7 @@ def create_update_event_person_profile_obj_v4( event_person_profile_obj.id = event_person_profile_id log.debug(event_person_profile_obj) - event_person_profile_dict = event_person_profile_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'account_id', 'account_id_random', 'contact', 'event_cfg', 'event_id', 'event_id_random', 'event_person_id', 'event_person_id_random', 'organization', 'created_on', 'updated_on'}) + event_person_profile_dict = event_person_profile_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'account_id', 'account_id_random', 'contact', 'event_cfg', 'event_id', 'event_id_random', 'event_person_id', 'event_person_id_random', 'organization', 'created_on', 'updated_on', 'external_id_old'}) # ### SECTION ### Process data contact_id = None @@ -219,4 +219,4 @@ def create_update_event_person_profile_obj_v4( else: log.debug(f'Returning the Event Person Profile ID: {event_person_profile_id}') return event_person_profile_id -# ### END ### API Event Person Profile Methods ### create_update_event_person_profile_obj_v4() ### \ No newline at end of file +# ### END ### API Event Person Profile Methods ### create_update_event_person_profile_obj_v4() ### diff --git a/app/routers/e_impexium.py b/app/routers/e_impexium.py index 4a2617b..ad58f89 100644 --- a/app/routers/e_impexium.py +++ b/app/routers/e_impexium.py @@ -56,12 +56,14 @@ async def event_import_reg( log.debug(event_registrant) # Creating an external ID from the Impexium record number and registration number. Very explicitly converting each number to a string before joining, just in case. - external_id = str(event_registrant.get('recordNumber'))+':'+str(event_registrant.get('registrationNumber')) + external_id_old = str(event_registrant.get('recordNumber'))+':'+str(event_registrant.get('registrationNumber')) + external_id_new = str(e_impexium_event_id)+':'+str(event_registrant.get('recordNumber'))+':'+str(event_registrant.get('registrationNumber')) event_person_data = {} event_person_data['account_id'] = account_id event_person_data['event_id'] = event_id - event_person_data['external_id'] = external_id + event_person_data['external_id'] = external_id_new + event_person_data['external_id_old'] = external_id_old email = None if details: @@ -92,7 +94,8 @@ async def event_import_reg( event_badge_data = {} event_badge_data['event_id'] = event_id - event_badge_data['external_id'] = external_id + event_badge_data['external_id'] = external_id_new + event_badge_data['external_id_old'] = external_id_old if reg_type_code := event_registrant.get('registrantTypeCode'): event_badge_data['badge_type_code'] = event_registrant.get('registrantTypeCode') # Using this as the badge_type @@ -202,7 +205,7 @@ async def event_import_reg( SELECT id AS event_person_id, id_random AS event_person_id_random, external_id AS event_person_external_id, event_badge_id AS event_badge_id, event_person_profile_id AS event_person_profile_id FROM `event_person` AS `event_person` WHERE event_person.event_id = :event_id - AND event_person.external_id = :external_id + AND event_person.external_id = :external_id_old /*LIMIT 1*/; """ @@ -289,4 +292,4 @@ async def event_import_reg( loop_count = loop_count + 1 return mk_resp(data=event_person_li, response=commons.response) -# ### END ### API Impexium ### event_import_reg() ### \ No newline at end of file +# ### END ### API Impexium ### event_import_reg() ###