Added additional handling for multiple contact updates.

Author: raulbob

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/doctordeclaration/DoctorDeclarationMessageProcessingFlow.java

@@ -62,7 +62,6 @@
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto;
-import de.symeda.sormas.api.person.PersonContext;
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.person.notifier.NotifierDto;
 import de.symeda.sormas.api.sample.PathogenTestDto;
@@ -298,15 +297,21 @@ protected void handlePickOrCreateEntry(
 				@Override
 				public void done(PickOrCreateEntryResult result) {
 					if (result.getCaze() != null) {
-						applyPersonUpdates(PersonContext.CASE, result.getCaze().getUuid());
 						CaseDataDto caze = FacadeProvider.getCaseFacade().getByUuid(result.getCaze().getUuid());
-						if (caze != null) {
+						if (caze != null && caze.getPerson() != null) {
+							applyPersonUpdates(caze.getPerson().getUuid());
 							applyNotifierUpdate(caze, externalMessage);
 						}
 					} else if (result.getContact() != null) {
-						applyPersonUpdates(PersonContext.CONTACT, result.getContact().getUuid());
+						ContactDto contact = FacadeProvider.getContactFacade().getByUuid(result.getContact().getUuid());
+						if (contact != null && contact.getPerson() != null) {
+							applyPersonUpdates(contact.getPerson().getUuid());
+						}
 					} else if (result.getEventParticipant() != null) {
-						applyPersonUpdates(PersonContext.EVENT_PARTICIPANT, result.getEventParticipant().getUuid());
+						EventParticipantDto ep = FacadeProvider.getEventParticipantFacade().getByUuid(result.getEventParticipant().getUuid());
+						if (ep != null && ep.getPerson() != null) {
+							applyPersonUpdates(ep.getPerson().getUuid());
+						}
 					}
 
 					callback.done(result);
@@ -318,8 +323,9 @@ public void cancel() {
 				}
 			};
 
-			ProcessingUiHelper
-				.showPickOrCreateEntryWindow(new EntrySelectionComponentForExternalMessage(externalMessage, optionsBuilder.build()), postUpdateCallback);
+			ProcessingUiHelper.showPickOrCreateEntryWindow(
+				new EntrySelectionComponentForExternalMessage(externalMessage, optionsBuilder.build()),
+				postUpdateCallback);
 		} else {
 			// If only one option is available, directly proceed with it
 			callback.done(optionsBuilder.getSingleAvailableCreateResult());
@@ -346,7 +352,9 @@ protected void handleCreateCase(CaseDataDto caze, PersonDto person, ExternalMess
 
 			@Override
 			public void done(CaseDataDto result) {
-				applyPersonUpdates(PersonContext.CASE, result.getUuid());
+				if (result.getPerson() != null) {
+					applyPersonUpdates(result.getPerson().getUuid());
+				}
 				callback.done(applyNotifierUpdate(result, externalMessage));
 			}
 
@@ -358,17 +366,19 @@ public void cancel() {
 	}
 
 	/**
-	 * Fetches the person associated with the given entity, applies all relevant external message data
+	 * Fetches the person by UUID, applies all relevant external message data
 	 * (address, contact details, guardian, occupation), then persists the person in a single save.
 	 *
-	 * @param personContext
-	 *            The context used to look up the person (e.g. CASE, CONTACT).
-	 * @param entityUuid
-	 *            The UUID of the owning entity.
+	 * @param personUuid
+	 *            The UUID of the person to update.
 	 */
-	private void applyPersonUpdates(PersonContext personContext, String entityUuid) {
+	private void applyPersonUpdates(String personUuid) {
 
-		PersonDto person = getExternalMessageProcessingFacade().getPersonByContext(personContext, entityUuid);
+		if (personUuid == null) {
+			return;
+		}
+
+		final PersonDto person = FacadeProvider.getPersonFacade().getByUuid(personUuid);
 
 		if (person == null) {
 			return;
@@ -444,7 +454,9 @@ protected void handleCreateContact(
 
 		contactCreateComponent.addCommitListener(() -> {
 			ContactDto createdContact = contactCreateComponent.getWrappedComponent().getValue();
-			applyPersonUpdates(PersonContext.CONTACT, createdContact.getUuid());
+			if (createdContact.getPerson() != null) {
+				applyPersonUpdates(createdContact.getPerson().getUuid());
+			}
 			callback.done(createdContact);
 		});
 		contactCreateComponent.addDiscardListener(callback::cancel);
@@ -586,6 +598,10 @@ protected void handleCreateEventParticipant(
 				EventParticipantDto savedDto = FacadeProvider.getEventParticipantFacade().save(dto);
 				Notification.show(I18nProperties.getString(Strings.messageEventParticipantCreated), Notification.Type.ASSISTIVE_NOTIFICATION);
 
+				if (savedDto.getPerson() != null) {
+					applyPersonUpdates(savedDto.getPerson().getUuid());
+				}
+
 				callback.done(savedDto);
 			}
 		});

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/labmessage/LabMessageProcessingFlow.java

@@ -163,14 +163,7 @@ public void done(PickOrCreateEntryResult result) {
 						personUuid = eventParticipant != null && eventParticipant.getPerson() != null ? eventParticipant.getPerson().getUuid() : null;
 					}
 
-					final PersonDto processedPerson = FacadeProvider.getPersonFacade().getByUuid(personUuid);
-
-					if (processedPerson == null) {
-						callback.done(result);
-						return;
-					}
-
-					ExternalMessageProcessingUIHelper.updateAddressAndSavePerson(processedPerson, getMapper());
+					ExternalMessageProcessingUIHelper.updateAddressAndSavePerson(personUuid, getMapper());
 
 					callback.done(result);
 				}
@@ -199,8 +192,9 @@ public void done(CaseDataDto result) {
 				// compared to automatic processing the person is processed by the case controller
 				// @see{CaseController#getCaseCreateComponent} methods
 				// we need to load the person again from the database to get the updates following case form changes
-				final PersonDto processedPerson = FacadeProvider.getPersonFacade().getByUuid(result.getPerson().getUuid());
-				ExternalMessageProcessingUIHelper.updateAddressAndSavePerson(processedPerson, getMapper());
+				ExternalMessageProcessingUIHelper.updateAddressAndSavePerson(
+					result.getPerson() != null ? result.getPerson().getUuid() : null,
+					getMapper());
 
 				callback.done(result);
 			}
@@ -263,8 +257,9 @@ protected void handleCreateContact(ContactDto contact, PersonDto person, Externa
 			// we need to load the person again from the database to get the updates following contact form changes
 			// ofc. here we have another way to do it because whoever did it was too lazy to fix the contact controller
 			final ContactDto processedContact = contactCreateComponent.getWrappedComponent().getValue();
-			final PersonDto processedPerson = FacadeProvider.getPersonFacade().getByUuid(processedContact.getPerson().getUuid());
-			ExternalMessageProcessingUIHelper.updateAddressAndSavePerson(processedPerson, getMapper());
+			ExternalMessageProcessingUIHelper.updateAddressAndSavePerson(
+				processedContact.getPerson() != null ? processedContact.getPerson().getUuid() : null,
+				getMapper());
 
 			callback.done(processedContact);
 		});
@@ -365,6 +360,10 @@ protected void handleCreateEventParticipant(
 				EventParticipantDto savedDto = FacadeProvider.getEventParticipantFacade().save(dto);
 				Notification.show(I18nProperties.getString(Strings.messageEventParticipantCreated), Notification.Type.ASSISTIVE_NOTIFICATION);
 
+				ExternalMessageProcessingUIHelper.updateAddressAndSavePerson(
+					savedDto.getPerson() != null ? savedDto.getPerson().getUuid() : null,
+					getMapper());
+
 				callback.done(savedDto);
 			}
 		});

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/processing/ExternalMessageProcessingUIHelper.java

@@ -161,16 +161,26 @@ public static void showCreateCaseWindow(
 	}
 
 	/**
-	 * Merges person address and contact details from the external message mapper and saves the person.
-	 * This should be called after a case or contact is created, because the case/contact controller
-	 * processes the person data independently and we need to ensure the external message data is applied.
+	 * Loads the person by UUID, merges address and contact details from the external message mapper, and saves the person.
+	 * This should be called after a case, contact or event participant is created, because the respective controllers
+	 * process the person data independently and we need to ensure the external message data is applied.
+	 * Does nothing if {@code personUuid} is {@code null} or no person with that UUID exists.
 	 *
-	 * @param person
-	 *            the person to update (should be freshly loaded from the database)
+	 * @param personUuid
+	 *            the UUID of the person to update
 	 * @param mapper
 	 *            the external message mapper providing the address/contact data
 	 */
-	public static void updateAddressAndSavePerson(PersonDto person, ExternalMessageMapper mapper) {
+	public static void updateAddressAndSavePerson(String personUuid, ExternalMessageMapper mapper) {
+		if (personUuid == null) {
+			return;
+		}
+
+		final PersonDto person = FacadeProvider.getPersonFacade().getByUuid(personUuid);
+		if (person == null) {
+			return;
+		}
+
 		mapper.mergePersonAddress(person);
 		mapper.mergePersonContactDetails(person);
 		// finally it is safe to save even if no changes were actually made