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

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

Hide file tree

Showing 3 changed files with 14 additions and 14 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
@@ -105,7 +105,6 @@ private CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> check
 	protected CompletionStage<ProcessingResult<ExternalMessageProcessingResult>> pickOrCreatePerson(ExternalMessageProcessingResult previousResult, ExternalMessageDto externalMessageDto) {
 
 		final PersonDto person = buildPerson();
-		person.setAdditionalDetails(externalMessageDto.getPersonAdditionalDetails());
 
 		HandlerCallback<EntitySelection<PersonDto>> callback = new HandlerCallback<>();
 		handlePickOrCreatePerson(person, callback);

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
@@ -15,17 +15,6 @@
 
 package de.symeda.sormas.api.externalmessage.processing;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutableTriple;
-
 import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.customizableenum.CustomEnumNotFoundException;
 import de.symeda.sormas.api.disease.DiseaseVariant;
@@ -45,6 +34,16 @@
 import de.symeda.sormas.api.sample.SampleDto;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.DateHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutableTriple;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public final class ExternalMessageMapper {
 
@@ -100,6 +99,8 @@ 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/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
@@ -13251,10 +13251,10 @@ INSERT INTO schema_version (version_number, comment) VALUES (550, '#13080 Keyclo
 
 -- 2024-09-23 #13147 Phone Number Validation for E-Santé Reports – Remove and Store Non-Numeric Text
 ALTER TABLE externalmessage
-    ADD COLUMN personAdditionaldetails text;
+    ADD COLUMN personadditionaldetails text;
 
 ALTER TABLE externalmessage_history
-    ADD COLUMN personAdditionaldetails text;
+    ADD COLUMN personadditionaldetails text;
 
 INSERT INTO schema_version (version_number, comment) VALUES (551, '#13147 Phone Number Validation for E-Santé Reports – Remove and Store Non-Numeric Text');
 -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***