#13589 - Added update of person address when external message is processed

raulbob · raulbob · commit b173e4d6b662 · 2025-11-07T18:33:49.000+01:00
- Deprecated PhysiciansReport classes due to not being used anymore
- Deprecated ExternalMessageController.processPhysiciansReport() due to not being used anymore
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractMessageProcessingFlowBase.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractMessageProcessingFlowBase.java
@@ -46,9 +46,11 @@
 import de.symeda.sormas.api.externalmessage.processing.labmessage.LabMessageProcessingHelper;
 import de.symeda.sormas.api.externalmessage.processing.labmessage.SampleAndPathogenTests;
 import de.symeda.sormas.api.feature.FeatureType;
+import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto;
 import de.symeda.sormas.api.infrastructure.facility.FacilityDto;
 import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto;
 import de.symeda.sormas.api.infrastructure.facility.FacilityType;
+import de.symeda.sormas.api.location.LocationDto;
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.person.PersonReferenceDto;
 import de.symeda.sormas.api.sample.PathogenTestDto;
@@ -57,6 +59,7 @@
 import de.symeda.sormas.api.sample.SampleSimilarityCriteria;
 import de.symeda.sormas.api.user.UserDto;
 import de.symeda.sormas.api.user.UserRight;
+import de.symeda.sormas.api.utils.dataprocessing.EntitySelection;
 import de.symeda.sormas.api.utils.dataprocessing.HandlerCallback;
 import de.symeda.sormas.api.utils.dataprocessing.PickOrCreateEntryResult;
 import de.symeda.sormas.api.utils.dataprocessing.ProcessingResult;
@@ -979,6 +982,49 @@ protected abstract void markExternalMessageAsProcessed(
         ProcessingResult<ExternalMessageProcessingResult> result,
         SurveillanceReportDto surveillanceReport);
 
+
+    protected void doPersonUpdates(EntitySelection<PersonDto> personSelection) {
+        // requested for #13589
+        // TODO: we need to find a better way to handle this
+
+        if(personSelection.isNew()) {
+            // no updates for new persons
+            return;
+        }
+
+        final PersonDto person = personSelection.getEntity();
+        if(person == null) {
+            return;
+        }
+
+        final LocationDto personAddress = person.getAddress();
+
+        if(personAddress != null) {
+            final String houseNumber = getExternalMessage().getPersonHouseNumber();
+            if(houseNumber != null ) {
+                personAddress.setHouseNumber(houseNumber);
+            }
+            final String street = getExternalMessage().getPersonStreet();
+            if(street != null) {
+                personAddress.setStreet(street);
+            }
+            final String city = getExternalMessage().getPersonCity();
+            if(city != null) {
+                personAddress.setCity(city);
+            }
+            final String postalCode = getExternalMessage().getPersonPostalCode();
+            if(postalCode != null) {
+                personAddress.setPostalCode(postalCode);
+            }
+            final CountryReferenceDto country = getExternalMessage().getPersonCountry();
+            if(country != null) {
+                personAddress.setCountry(country);
+            }
+
+            getExternalMessageProcessingFacade().updatePerson(person);
+        }
+    }
+
     /**
      * Retrieves the external message associated with the processing flow.
      *
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractProcessingFlow.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractProcessingFlow.java
@@ -151,6 +151,10 @@ protected CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> pic
 
 		return mapHandlerResult(callback, previousResult, personSelection -> {
 			logger.debug("[MESSAGE PROCESSING] Continue processing with person: {}", personSelection);
+
+			// requested for #13589
+			doPersonUpdates(personSelection);
+
 			return previousResult.withPerson(personSelection.getEntity(), personSelection.isNew());
 		});
 	}
@@ -171,6 +175,8 @@ protected <T> CompletionStage<ProcessingResult<ExternalMessageProcessingResult>>
 
 	protected abstract void handlePickOrCreatePerson(PersonDto person, HandlerCallback<EntitySelection<PersonDto>> callback);
 
+	protected abstract void doPersonUpdates(EntitySelection<PersonDto> personSelection);
+
 	private PersonDto buildPerson() {
 
 		final PersonDto personDto = PersonDto.build();
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/ExternalMessageProcessingFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/ExternalMessageProcessingFacade.java
@@ -246,4 +246,15 @@ public CaseDataDto updateAndSetCaseNotifier(String caseUuid, NotifierDto notifie
 		caseDto.setNotifier(notifierReferenceDto);
 		return caseFacade.save(caseDto);
 	}
+
+	public void updatePerson(PersonDto personDto) {
+		if(personFacade == null) {
+			return;
+		}
+		if(personDto == null) {
+			return;
+		}
+
+		personFacade.save(personDto);
+	}
 }
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java
@@ -209,6 +209,7 @@ public void processDoctorDeclarationMessage(String messageUuid) {
 		});
 	}
 
+	@Deprecated
 	public void processPhysiciansReport(String uuid) {
 		ExternalMessageDto physicianReport = FacadeProvider.getExternalMessageFacade().getByUuid(uuid);
 		ExternalMessageProcessingFacade processingFacade = getExternalMessageProcessingFacade();
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/physiciansreport/AbstractPhysiciansReportProcessingFlow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/physiciansreport/AbstractPhysiciansReportProcessingFlow.java
@@ -31,11 +31,13 @@
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.person.PersonReferenceDto;
 import de.symeda.sormas.api.user.UserDto;
+import de.symeda.sormas.api.utils.dataprocessing.EntitySelection;
 import de.symeda.sormas.api.utils.dataprocessing.HandlerCallback;
 import de.symeda.sormas.api.utils.dataprocessing.PickOrCreateEntryResult;
 import de.symeda.sormas.api.utils.dataprocessing.ProcessingResult;
 import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus;
 
+@Deprecated
 public abstract class AbstractPhysiciansReportProcessingFlow extends AbstractProcessingFlow {
 
 	public AbstractPhysiciansReportProcessingFlow(UserDto user, ExternalMessageMapper mapper, ExternalMessageProcessingFacade processingFacade) {
@@ -136,4 +138,9 @@ protected void postBuildCase(CaseDataDto caseDto, ExternalMessageDto externalMes
 	protected void postBuildPerson(PersonDto personDto, ExternalMessageDto externalMessageDto) {
 		// No additional actions needed for physicians report
 	}
+
+	@Override
+	protected void doPersonUpdates(EntitySelection<PersonDto> personSelection) {
+		// No additional actions needed for physicians report
+	}
 }
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/physiciansreport/PhysiciansReportCaseEditComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/physiciansreport/PhysiciansReportCaseEditComponent.java
@@ -42,6 +42,7 @@
 import de.symeda.sormas.ui.utils.DirtyCheckPopup;
 import de.symeda.sormas.ui.utils.ViewMode;
 
+@Deprecated
 public class PhysiciansReportCaseEditComponent extends CommitDiscardWrapperComponent<VerticalLayout> {
 
 	private static final long serialVersionUID = 1452145334216485391L;
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/physiciansreport/PhysiciansReportCaseImmunizationsComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/physiciansreport/PhysiciansReportCaseImmunizationsComponent.java
@@ -60,6 +60,7 @@
 import de.symeda.sormas.ui.utils.FieldAccessHelper;
 import de.symeda.sormas.ui.vaccination.VaccinationEditForm;
 
+@Deprecated
 public class PhysiciansReportCaseImmunizationsComponent extends CommitDiscardWrapperComponent<VerticalLayout> {
 
 	private static final long serialVersionUID = -5128676869217088760L;
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/physiciansreport/PhysiciansReportProcessingFlow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/physiciansreport/PhysiciansReportProcessingFlow.java
@@ -41,6 +41,7 @@
 import de.symeda.sormas.ui.utils.VaadinUiUtil;
 import de.symeda.sormas.ui.utils.processing.EntrySelectionField;
 
+@Deprecated
 public class PhysiciansReportProcessingFlow extends AbstractPhysiciansReportProcessingFlow {
 
 	public PhysiciansReportProcessingFlow(ExternalMessageMapper mapper, ExternalMessageProcessingFacade processingFacade) {

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,7 @@ public void processDoctorDeclarationMessage(String messageUuid) {`
`209`	`209`	`});`
`210`	`210`	`}`
`211`	`211`
	`212`	`+ @Deprecated`
`212`	`213`	`public void processPhysiciansReport(String uuid) {`
`213`	`214`	`ExternalMessageDto physicianReport = FacadeProvider.getExternalMessageFacade().getByUuid(uuid);`
`214`	`215`	`ExternalMessageProcessingFacade processingFacade = getExternalMessageProcessingFacade();`