🐛✅ Do not add duplicate contactInfo details

Author: Pa-Touche

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java

@@ -11,6 +11,8 @@
 
 import javax.enterprise.context.ApplicationScoped;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +58,7 @@ public Optional<DataPatchFailure> map(FieldPatchRequest request) {
 		Optional<PersonContactDetailDto> alreadyPresentContactDetail = personDto.getPersonContactDetails()
 			.stream()
 			.filter(appropriatePredicate)
-			.filter(contactDetail -> contactDetail.getDetails().equals(request.getValue()))
+			.filter(contactDetail -> request.getValue().equals(contactDetail.getContactInformation()))
 			.findAny();
 
 		if (alreadyPresentContactDetail.isPresent()) {

sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java

@@ -85,7 +85,7 @@ void map_phoneField_contactDetailAlreadyPresent_doesNotAddDuplicate() {
 		// PREPARE
 		PersonContactDetailDto existing = new PersonContactDetailDto();
 		existing.setPersonContactDetailType(PersonContactDetailType.PHONE);
-		existing.setDetails("0123456789");
+		existing.setContactInformation("0123456789");
 
 		PersonDto personDto = new PersonDto();
 		personDto.setPersonContactDetails(new ArrayList<>(List.of(existing)));
@@ -135,7 +135,7 @@ void map_emailField_contactDetailNotPresent_addsEmailContactDetail() {
 
 		FieldPatchRequest request = mock(FieldPatchRequest.class);
 		when(request.getTarget()).thenReturn(personDto);
-		when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details");
+		when(request.getFieldName()).thenReturn("Person.PersonContactDetail.contactInformation");
 		when(request.getValue()).thenReturn("test@example.com");
 		when(request.getOrigin()).thenReturn("someOrigin");
 
@@ -156,14 +156,37 @@ void map_emailField_contactDetailAlreadyPresent_doesNotAddDuplicate() {
 		// PREPARE
 		PersonContactDetailDto existing = new PersonContactDetailDto();
 		existing.setPersonContactDetailType(PersonContactDetailType.EMAIL);
-		existing.setDetails("test@example.com");
+		existing.setContactInformation("test@example.com");
 
 		PersonDto personDto = new PersonDto();
 		personDto.setPersonContactDetails(new ArrayList<>(List.of(existing)));
 
 		FieldPatchRequest request = mock(FieldPatchRequest.class);
 		when(request.getTarget()).thenReturn(personDto);
-		when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details");
+		when(request.getFieldName()).thenReturn("Person.PersonContactDetail.contactInformation");
+		when(request.getValue()).thenReturn("test@example.com");
+
+		// EXECUTE
+		Optional<DataPatchFailure> actual = victim.map(request);
+
+		// CHECK
+		assertTrue(actual.isEmpty());
+		assertEquals(1, personDto.getPersonContactDetails().size());
+	}
+
+	@Test
+	void map_emailField_contactInformationAlreadyPresent_doesNotAddDuplicate() {
+		// PREPARE
+		PersonContactDetailDto existing = new PersonContactDetailDto();
+		existing.setPersonContactDetailType(PersonContactDetailType.EMAIL);
+		existing.setContactInformation("test@example.com");
+
+		PersonDto personDto = new PersonDto();
+		personDto.setPersonContactDetails(new ArrayList<>(List.of(existing)));
+
+		FieldPatchRequest request = mock(FieldPatchRequest.class);
+		when(request.getTarget()).thenReturn(personDto);
+		when(request.getFieldName()).thenReturn("PersonContactDetail.contactInformation");
 		when(request.getValue()).thenReturn("test@example.com");
 
 		// EXECUTE
@@ -186,7 +209,7 @@ void map_emailField_differentValueAlreadyPresent_addsNewEntry() {
 
 		FieldPatchRequest request = mock(FieldPatchRequest.class);
 		when(request.getTarget()).thenReturn(personDto);
-		when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details");
+		when(request.getFieldName()).thenReturn("Person.PersonContactDetail.contactInformation");
 		when(request.getValue()).thenReturn("test@example.com");
 		when(request.getOrigin()).thenReturn("someOrigin");
 
@@ -234,7 +257,7 @@ void map_emailField_existingPhoneWithSameValue_addsEmailContactDetail() {
 
 		FieldPatchRequest request = mock(FieldPatchRequest.class);
 		when(request.getTarget()).thenReturn(personDto);
-		when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details");
+		when(request.getFieldName()).thenReturn("Person.PersonContactDetail.contactInformation");
 		when(request.getValue()).thenReturn("test@example.com");
 		when(request.getOrigin()).thenReturn("someOrigin");