Merge pull request #13169 from SORMAS-Foundation/change-#13168-automa…

…tic-message-processing-person-matching #13168 Normalization of Automatic Processing for Name, Birthdate, and…
SORMAS-Foundation · Oct 23, 2024 · 9d73733 · 9d73733
2 parents 6dda78d + 8bb7730
commit 9d73733
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/...ava/de/symeda/sormas/backend/externalmessage/labmessage/AutomaticLabMessageProcessor.java b/...ava/de/symeda/sormas/backend/externalmessage/labmessage/AutomaticLabMessageProcessor.java
@@ -15,6 +15,7 @@
 
 package de.symeda.sormas.backend.externalmessage.labmessage;
 
+import java.text.Collator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -316,5 +317,20 @@ private <T> boolean unsetOrMatches(T personValue, T messageValue) {
 
 			return personValue.equals(messageValue);
 		}
+
+		private boolean unsetOrMatches(String personValue, String messageValue) {
+			if (personValue == null || messageValue == null) {
+				return true;
+			}
+
+			Collator collator = Collator.getInstance();
+			collator.setStrength(Collator.PRIMARY);
+
+			return collator.compare(normalizatString(personValue), normalizatString(messageValue)) == 0;
+		}
+
+		private String normalizatString(String string) {
+			return string.replaceAll("[\\s-,;:]", "");
+		}
 	}
 }
diff --git a/...de/symeda/sormas/backend/externalmessage/labmessage/AutomaticLabMessageProcessorTest.java b/...de/symeda/sormas/backend/externalmessage/labmessage/AutomaticLabMessageProcessorTest.java
@@ -40,6 +40,7 @@
 import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult;
 import de.symeda.sormas.api.infrastructure.facility.FacilityDto;
 import de.symeda.sormas.api.infrastructure.facility.FacilityType;
+import de.symeda.sormas.api.person.PersonCriteria;
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.person.Sex;
 import de.symeda.sormas.api.sample.PathogenTestDto;
@@ -310,6 +311,29 @@ public void testProcessWithExistingPersonWithSameNationalHealthIdButDifferentDet
 		assertThat(getPathogenTestFacade().getAllActiveUuids(), hasSize(0));
 	}
 
+	@Test
+	public void testProcessWithExistingPersonWithSameNationalHealthIdAndPersonDetailsNormalizedCheck()
+		throws ExecutionException, InterruptedException {
+		ExternalMessageDto externalMessage = createExternalMessage(m -> {
+			m.setPersonFirstName("john vander");
+			m.setPersonLastName("DOÉ");
+			m.setPersonCity("	PERSON  	 city  \n");
+			m.setPersonStreet(" person   STREET   12A");
+		});
+
+		creator.createPerson("John Van Der", "Doe", Sex.MALE, p -> {
+			p.setNationalHealthId(externalMessage.getPersonNationalHealthId());
+			p.getAddress().setCity("person city");
+			p.getAddress().setStreet("PERSON STREET, 12a");
+		});
+
+		ProcessingResult<ExternalMessageProcessingResult> result = runFlow(externalMessage);
+		assertThat(result.getStatus(), is(DONE));
+		assertThat(externalMessage.getStatus(), is(ExternalMessageStatus.PROCESSED));
+		assertThat(getExternalMessageFacade().getByUuid(externalMessage.getUuid()).getStatus(), is(ExternalMessageStatus.PROCESSED));
+		assertThat(getPersonFacade().count(new PersonCriteria()), is(1L));
+	}
+
 	@Test
 	public void testProcessWithExistingSimilarPerson() throws ExecutionException, InterruptedException {
 		ExternalMessageDto externalMessage = createExternalMessage(m -> m.setPersonNationalHealthId(null));