#13147 - Phone Number Validation for E-Santé Reports – Remove and Sto…

…re Non-Numeric Text
SORMAS-Foundation · Oct 8, 2024 · 2452c70 · 2452c70
1 parent f1f33f3
commit 2452c70
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/...src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractProcessingFlow.java b/...src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractProcessingFlow.java
@@ -15,6 +15,12 @@
 
 package de.symeda.sormas.api.externalmessage.processing;
 
+import java.util.concurrent.CompletionStage;
+import java.util.function.Function;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.externalmessage.ExternalMessageDto;
@@ -29,11 +35,6 @@
 import de.symeda.sormas.api.utils.dataprocessing.ProcessingResult;
 import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus;
 import de.symeda.sormas.api.utils.dataprocessing.flow.FlowThen;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletionStage;
-import java.util.function.Function;
 
 public abstract class AbstractProcessingFlow {
 
@@ -102,7 +103,7 @@ private CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> check
 
 	protected abstract CompletionStage<Boolean> handleRelatedForwardedMessages();
 
-	protected CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> pickOrCreatePerson(ExternalMessageProcessingResult previousResult, ExternalMessageDto externalMessageDto) {
+	protected CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> pickOrCreatePerson(ExternalMessageProcessingResult previousResult) {
 
 		final PersonDto person = buildPerson();
 

diff --git a/.../src/main/java/de/symeda/sormas/api/externalmessage/processing/ExternalMessageMapper.java b/.../src/main/java/de/symeda/sormas/api/externalmessage/processing/ExternalMessageMapper.java
@@ -82,7 +82,12 @@ public List<String[]> mapToPerson(PersonDto person) {
 					person::setNationalHealthId,
 					person.getNationalHealthId(),
 					externalMessage.getPersonNationalHealthId(),
-					PersonDto.NATIONAL_HEALTH_ID)));
+					PersonDto.NATIONAL_HEALTH_ID),
+				Mapping.of(
+					person::setAdditionalDetails,
+					person.getAdditionalDetails(),
+					externalMessage.getPersonAdditionalDetails(),
+					PersonDto.ADDITIONAL_DETAILS)));
 
 		if (person.getBirthdateYYYY() != null) {
 			DataHelper.Pair<Integer, ApproximateAgeType> ageAndAgeType = ApproximateAgeType.ApproximateAgeHelper
@@ -99,8 +104,6 @@ public List<String[]> mapToPerson(PersonDto person) {
 							PersonDto.APPROXIMATE_AGE_TYPE))));
 		}
 
-		Mapping.of(person::setAdditionalDetails, person.getAdditionalDetails(),
-				externalMessage.getPersonAdditionalDetails(), PersonDto.ADDITIONAL_DETAILS);
 		return changedFields;
 	}
 

diff --git a/...da/sormas/api/externalmessage/processing/labmessage/AbstractLabMessageProcessingFlow.java b/...da/sormas/api/externalmessage/processing/labmessage/AbstractLabMessageProcessingFlow.java
@@ -126,7 +126,7 @@ public CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> run()
 		return doInitialChecks(externalMessage, new ExternalMessageProcessingResult())
 			.then(initialCheckResult -> handleRelatedLabMessages(relatedLabMessageHandler, initialCheckResult))
 			// if no handling happened, or opted to continue regular processing, ignore results
-			.then(ignored -> pickOrCreatePerson(new ExternalMessageProcessingResult(), externalMessage))
+			.then(ignored -> pickOrCreatePerson(new ExternalMessageProcessingResult()))
 			.thenSwitch(p -> pickOrCreateEntry(p.getData(), externalMessage))
 				.when(PickOrCreateEntryResult::isNewCase, (f, p, r) -> doCreateCaseFlow(f))
 				.when(PickOrCreateEntryResult::isNewContact, (f, p, r) -> doCreateContactFlow(f))

diff --git a/...da/sormas/ui/externalmessage/physiciansreport/AbstractPhysiciansReportProcessingFlow.java b/...da/sormas/ui/externalmessage/physiciansreport/AbstractPhysiciansReportProcessingFlow.java
@@ -46,7 +46,7 @@ public CompletionStage<ProcessingResult<CaseDataDto>> run(ExternalMessageDto ext
 
 		//@formatter:off
 		return doInitialChecks(externalMessage, new ExternalMessageProcessingResult())
-			.then(initialResult -> pickOrCreatePerson(initialResult.getData(), externalMessage))
+			.then(initialResult -> pickOrCreatePerson(initialResult.getData()))
 			.thenSwitch(p -> pickOrCreateEntry(p.getData(), externalMessage))
 				.when(PersonAndPickOrCreateEntryResult::isNewCase, (f, e, p) -> f
 						.then(ignored -> createCase(e.getPerson(), externalMessage)).then(c ->