fixes:

- invalid person contact fields set (should have been contactInformation
- non-copied request fields on reprocessing

Author: Pa-Touche

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java

@@ -82,6 +82,8 @@
 import de.symeda.sormas.api.externalmessage.NewMessagesState;
 import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto;
 import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult;
+import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest;
+import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper;
 import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData;
 import de.symeda.sormas.api.externalmessage.survey.SurveyAsExternalMessageAdapterFacade;
 import de.symeda.sormas.api.feature.FeatureType;
@@ -974,25 +976,22 @@ public ExternalMessageDto getForSurveillanceReport(SurveillanceReportReferenceDt
 	@RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS)
 	public ExternalMessageDto reprocessSurveyResponse(String uuid, java.util.Map<String, Object> correctedDictionary) {
 		ExternalMessageDto externalMessage = getByUuid(uuid);
-		de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest latestRequest =
-			externalMessage.getSurveyResponseData().getLatest().getRequest();
-
-		de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest correctedRequest =
-			new de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest().setToken(latestRequest.getToken())
-				.setExternalSurveyId(latestRequest.getExternalSurveyId())
-				.setExternalRespondentId(latestRequest.getExternalRespondentId())
-				.setResponseReceivedDate(latestRequest.getResponseReceivedDate())
-				.setReplacementStrategy(latestRequest.getReplacementStrategy())
-				.setEmptyValueBehavior(latestRequest.getEmptyValueBehavior())
-				.setOrigin(latestRequest.getOrigin())
-				.setInputLanguages(latestRequest.getInputLanguages())
-				.setAllowFallbackValues(latestRequest.isAllowFallbackValues())
-				.setSkipIfAlreadyProcessed(false)
-				.setPatchedInCaseOfFailures(true)
-				.setPatchDictionary(correctedDictionary);
-
-		de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper updatedWrapper =
-			new de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper().setRequest(correctedRequest);
+		ExternalMessageSurveyResponseRequest latestRequest = externalMessage.getSurveyResponseData().getLatest().getRequest();
+
+		ExternalMessageSurveyResponseRequest correctedRequest = new ExternalMessageSurveyResponseRequest().setToken(latestRequest.getToken())
+			.setExternalSurveyId(latestRequest.getExternalSurveyId())
+			.setExternalRespondentId(latestRequest.getExternalRespondentId())
+			.setResponseReceivedDate(latestRequest.getResponseReceivedDate())
+			.setReplacementStrategy(latestRequest.getReplacementStrategy())
+			.setEmptyValueBehavior(latestRequest.getEmptyValueBehavior())
+			.setOrigin(latestRequest.getOrigin())
+			.setInputLanguages(latestRequest.getInputLanguages())
+			.setAllowFallbackValues(latestRequest.isAllowFallbackValues())
+			.setSkipIfAlreadyProcessed(latestRequest.isSkipIfAlreadyProcessed())
+			.setPatchedInCaseOfFailures(latestRequest.isPatchedInCaseOfFailures())
+			.setPatchDictionary(correctedDictionary);
+
+		ExternalMessageSurveyResponseWrapper updatedWrapper = new ExternalMessageSurveyResponseWrapper().setRequest(correctedRequest);
 		externalMessage.getSurveyResponseData().setUpdated(updatedWrapper);
 
 		try {

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

@@ -78,7 +78,7 @@ private PersonContactDetailDto buildGenericContactDetail(FieldPatchRequest reque
 		PersonContactDetailDto detail = new PersonContactDetailDto();
 		detail.setUuid(DataHelper.createUuid());
 		detail.setPerson(personDto.toReference());
-		detail.setDetails((String) request.getValue());
+		detail.setContactInformation((String) request.getValue());
 		detail.setAdditionalInformation(request.getOrigin());
 
 		return detail;
@@ -101,7 +101,7 @@ private PersonContactDetailDto buildEmailContactDetail(FieldPatchRequest request
 
 	@Override
 	public Set<String> supportedFields() {
-		return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.DETAILS)
+		return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.CONTACT_INFORMATION)
 			.map(suffix -> PersonDto.I18N_PREFIX + PATH_SEPARATOR + PersonDto.PERSON_CONTACT_DETAILS + PATH_SEPARATOR + suffix)
 			.collect(Collectors.toSet());
 	}

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

@@ -30,7 +30,7 @@ class PersonContactDetailsFieldMapperTest extends AbstractUnitTest {
 	@Test
 	void supportedFields_containsPhoneNumberTypeAndDetails() {
 		// PREPARE
-		Set<String> expected = Set.of("Person.personContactDetails.details, Person.personContactDetails.phoneNumberType");
+		Set<String> expected = Set.of("Person.personContactDetails.contactInformation", "Person.personContactDetails.phoneNumberType");
 
 		// EXECUTE
 		Set<String> actual = victim.supportedFields();
@@ -75,7 +75,7 @@ void map_phoneField_contactDetailNotPresent_addsPhoneContactDetail() {
 		assertEquals(1, personDto.getPersonContactDetails().size());
 		PersonContactDetailDto added = personDto.getPersonContactDetails().get(0);
 		assertEquals(PersonContactDetailType.PHONE, added.getPersonContactDetailType());
-		assertEquals("0123456789", added.getDetails());
+		assertEquals("0123456789", added.getContactInformation());
 		assertEquals(PhoneNumberType.OTHER, added.getPhoneNumberType());
 		assertEquals("someOrigin", added.getAdditionalInformation());
 	}
@@ -147,7 +147,7 @@ void map_emailField_contactDetailNotPresent_addsEmailContactDetail() {
 		assertEquals(1, personDto.getPersonContactDetails().size());
 		PersonContactDetailDto added = personDto.getPersonContactDetails().get(0);
 		assertEquals(PersonContactDetailType.EMAIL, added.getPersonContactDetailType());
-		assertEquals("test@example.com", added.getDetails());
+		assertEquals("test@example.com", added.getContactInformation());
 		assertEquals("someOrigin", added.getAdditionalInformation());
 	}
 

sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java

@@ -131,7 +131,7 @@ void patch_noErrorsReplaceAlwaysPersonContactDetails() {
 			.setReplacementStrategy(DataReplacementStrategy.ALWAYS)
 			.setPatchDictionary(
 				Map.of(
-					"Person.personContactDetails.details",
+					"Person.personContactDetails.contactInformation",
 					newEmail,
 
 					"Person.personContactDetails.phoneNumberType",
@@ -157,14 +157,14 @@ void patch_noErrorsReplaceAlwaysPersonContactDetails() {
 				contactDetailsStreamProvider.get()
 					.anyMatch(
 						contactDetail -> contactDetail.getPersonContactDetailType() == PersonContactDetailType.PHONE
-							&& newPhoneNumber.equals(contactDetail.getDetails())
+							&& newPhoneNumber.equals(contactDetail.getContactInformation())
 							&& contactDetail.getPhoneNumberType() == PhoneNumberType.OTHER)),
 
 			() -> Assertions.assertTrue(
 				contactDetailsStreamProvider.get()
 					.anyMatch(
 						contactDetail -> contactDetail.getPersonContactDetailType() == PersonContactDetailType.EMAIL
-							&& newEmail.equals(contactDetail.getDetails()))));
+							&& newEmail.equals(contactDetail.getContactInformation()))));
 	}
 
 	@ParameterizedTest

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java

@@ -61,7 +61,7 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable
 		VerticalLayout layout = new VerticalLayout();
 		layout.setMargin(true);
 		layout.setSpacing(true);
-		layout.setWidth(800, Sizeable.Unit.PIXELS);
+		layout.setWidth(100, Sizeable.Unit.PERCENTAGE);
 
 		Window window = new Window(I18nProperties.getString(Strings.headingSurveyResponseDetails));
 		window.setModal(true);