SORMAS-Foundation#3210 sormas2sormas - fixed merge issues

Author: lgal

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java

@@ -83,6 +83,7 @@ public interface Validations {
 	String sormasToSormasContactCaseNotExists = "sormasToSormasContactCaseNotExists";
 	String sormasToSormasContactExists = "sormasToSormasContactExists";
 	String sormasToSormasOrganizationIdMissing = "sormasToSormasOrganizationIdMissing";
+	String sormasToSormasSampleExists = "sormasToSormasSampleExists";
 	String sormasToSormasSenderNameMissing = "sormasToSormasSenderNameMissing";
 	String sormasToSormasShareInfoMissing = "sormasToSormasShareInfoMissing";
 	String specifyFirstName = "specifyFirstName";

sormas-api/src/main/resources/validations.properties

@@ -117,4 +117,5 @@ sormasToSormasShareInfoMissing = Sender information is missing
 sormasToSormasOrganizationIdMissing = Sender organization is is missing
 sormasToSormasSenderNameMissing = Sender name is missing
 validPhoneNumber = %s must be a valid phone number
-validEmailAddress = %s must be a valid email address
+validEmailAddress = %s must be a valid email address
+sormasToSormasSampleExists = This sample already exists

sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/SormasToSormasFacadeEjb.java

@@ -232,7 +232,7 @@ public void saveSharedCases(SormasToSormasEncryptedDataDto encryptedData) throws
 			}
 
 			if (samples != null) {
-				Map<String, Map<String, List<String>>> sampleErrors = processSamples(samples);
+				Map<String, ValidationErrors> sampleErrors = processSamples(samples);
 				validationErrors.putAll(sampleErrors);
 			}
 
@@ -302,7 +302,7 @@ public void saveSharedContacts(SormasToSormasEncryptedDataDto sharedData) throws
 			}
 
 			if (samples != null) {
-				Map<String, Map<String, List<String>>> sampleErrors = processSamples(samples);
+				Map<String, ValidationErrors> sampleErrors = processSamples(samples);
 				validationErrors.putAll(sampleErrors);
 			}
 
@@ -580,40 +580,54 @@ private Map<String, ValidationErrors> processAssociatedContacts(
 		SormasToSormasOriginInfoDto originInfo) {
 		Map<String, ValidationErrors> validationErrors = new HashMap<>();
 
-		associatedContacts.forEach(associatedContact -> {
+		for (SormasToSormasCaseDto.AssociatedContactDto associatedContact : associatedContacts) {
 			ContactDto contact = associatedContact.getContact();
+			ValidationErrors contactErrors = new ValidationErrors();
 
-			ValidationErrors contactErrors = processContactData(contact, associatedContact.getPerson(), originInfo);
+			if (contactFacade.exists(contact.getUuid())) {
+				contactErrors
+					.add(I18nProperties.getCaption(Captions.Contact), I18nProperties.getValidationError(Validations.sormasToSormasContactExists));
+				continue;
+			}
+
+			ValidationErrors contactProcessingErrors = processContactData(contact, associatedContact.getPerson(), originInfo);
+			contactErrors.addAll(contactProcessingErrors);
 
 			if (contactErrors.hasError()) {
 				validationErrors.put(buildContactValidationGroupName(contact), contactErrors);
 			}
-		});
+		}
 
 		return validationErrors;
 	}
 
-	private Map<String, Map<String, List<String>>> processSamples(List<SormasToSormasSampleDto> samples) {
-		Map<String, Map<String, List<String>>> validationErrors = new HashMap<>();
+	private Map<String, ValidationErrors> processSamples(List<SormasToSormasSampleDto> samples) {
+		Map<String, ValidationErrors> validationErrors = new HashMap<>();
 
 		samples.forEach(sormasToSormasSample -> {
 			SampleDto sample = sormasToSormasSample.getSample();
+			ValidationErrors sampleErrors = new ValidationErrors();
+
+			if (sampleFacade.exists(sample.getUuid())) {
+				sampleErrors
+					.add(I18nProperties.getCaption(Captions.Sample), I18nProperties.getValidationError(Validations.sormasToSormasSampleExists));
+			}
 
 			sample.setReportingUser(userService.getCurrentUser().toReference());
 
 			DataHelper.Pair<InfrastructureData, List<String>> infrastructureAndErrors =
 				loadLocalInfrastructure(null, null, null, null, sample.getLab(), null);
 
-			ValidationErrors sampleErrors = new ValidationErrors();
 			handleInfraStructure(infrastructureAndErrors, Captions.Sample_lab, sampleErrors, (infrastructureData -> {
 				sample.setLab(infrastructureData.facility);
 			}));
 			if (sampleErrors.hasError()) {
-				validationErrors.put(buildSampleValidationGroupName(sample), sampleErrors.getErrors());
+				validationErrors.put(buildSampleValidationGroupName(sample), sampleErrors);
 			}
 
 			sormasToSormasSample.getPathogenTests().forEach(pathogenTest -> {
 				pathogenTest.setUuid(DataHelper.createUuid());
+
 				DataHelper.Pair<InfrastructureData, List<String>> ptInfrastructureAndErrors =
 					loadLocalInfrastructure(null, null, null, FacilityType.LABORATORY, pathogenTest.getLab(), null);
 
@@ -623,7 +637,7 @@ private Map<String, Map<String, List<String>>> processSamples(List<SormasToSorma
 				}));
 
 				if (pathogenTestErrors.hasError()) {
-					validationErrors.put(buildPathogenTestValidationGroupName(pathogenTest), pathogenTestErrors.getErrors());
+					validationErrors.put(buildPathogenTestValidationGroupName(pathogenTest), pathogenTestErrors);
 				}
 			});