SORMAS-Foundation#1999 add more explicit validation message

Author: danRosca

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

@@ -62,6 +62,7 @@ public interface Validations {
 	String importRegionAlreadyExists = "importRegionAlreadyExists";
 	String importRegionNotUnique = "importRegionNotUnique";
 	String importUnexpectedError = "importUnexpectedError";
+	String importWrongDataTypeError = "importWrongDataTypeError";
 	String investigationStatusUnclassifiedCase = "investigationStatusUnclassifiedCase";
 	String noCommunityInDistrict = "noCommunityInDistrict";
 	String noDistrictInRegion = "noDistrictInRegion";

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

@@ -27,6 +27,7 @@ importCasesPropertyTypeNotAllowed = Property type %s not allowed when importing
 importPropertyTypeNotAllowed = Property type %s not allowed
 importCasesUnexpectedError = Unexpected error when trying to import this case. Please send your error report file to an administrator and remove this case from your import file.
 importUnexpectedError = Unexpected error when trying to import this row. Please send your error report file to an administrator and remove this row from your import file.
+importWrongDataTypeError = Value %s in column %s does not match expected data type.
 importCommunityNotUnique = Invalid value %s in column %s; Community name is not unique in the chosen district, make sure there is only one community with this name belonging to the chosen district in the database
 importDistrictNotUnique = Invalid value %s in column %s; District name is not unique in the chosen region, make sure there is only one district with this name belonging to the chosen region in the database
 importEntryDoesNotExist = Invalid value %s in column %s; Entry does not exist in the database or is archived

sormas-backend/src/main/java/de/symeda/sormas/backend/importexport/ImportFacadeEjb.java

@@ -108,6 +108,7 @@
 import de.symeda.sormas.api.utils.CSVCommentLineValidator;
 import de.symeda.sormas.api.utils.CSVUtils;
 import de.symeda.sormas.api.utils.DependingOnFeatureType;
+import de.symeda.sormas.backend.campaign.form.CampaignFormMetaFacadeEjb;
 import de.symeda.sormas.backend.campaign.form.CampaignFormMetaFacadeEjb.CampaignFormMetaFacadeEjbLocal;
 import de.symeda.sormas.backend.common.ConfigFacadeEjb.ConfigFacadeEjbLocal;
 import de.symeda.sormas.backend.disease.DiseaseConfigurationFacadeEjb.DiseaseConfigurationFacadeEjbLocal;

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignFormDataImporter.java

@@ -7,8 +7,11 @@
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -84,10 +87,13 @@ protected ImportLineResult importDataFromCsvLine(
 			CampaignFormMetaDto campaginMetaDto = FacadeProvider.getCampaignFormMetaFacade().getCampaignFormMetaByUuid(campaignFormMetaUUID);
 			campaignFormData.setCampaign(campaignReferenceDto);
 			campaignFormData.setCampaignFormMeta(new CampaignFormMetaReferenceDto(campaignFormMetaUUID, campaginMetaDto.getFormName()));
-			if (validateFormValues(campaginMetaDto, campaignFormData) == false) {
-				writeImportError(values, I18nProperties.getValidationError(Validations.importUnexpectedError));
+			Map<String,String> invalidEntries =  validateFormValues(campaginMetaDto, campaignFormData);
+			if (!invalidEntries.isEmpty()) {
+				for(String e:invalidEntries.keySet()){
+					writeImportError(values, I18nProperties.getValidationError(Validations.importWrongDataTypeError,invalidEntries.get(e),e));
+				}
 				return ImportLineResult.ERROR;
-			} else {
+				} else {
 				FacadeProvider.getCampaignFormDataFacade().saveCampaignFormData(campaignFormData);
 			}
 		} catch (ImportErrorException e) {
@@ -97,19 +103,20 @@ protected ImportLineResult importDataFromCsvLine(
 		return ImportLineResult.SUCCESS;
 	}
 
-	private boolean validateFormValues(CampaignFormMetaDto campaginMetaDto, CampaignFormDataDto campaignFormData) {
-		boolean isRowValid = true;
+	private Map<String,String> validateFormValues(CampaignFormMetaDto campaginMetaDto, CampaignFormDataDto campaignFormData) {
+		Map<String,String> wrongEntries = new LinkedHashMap<>();
 		List<CampaignFormElement> formElements = campaginMetaDto.getCampaignFormElements();
 		Optional<CampaignFormElement> formElementOptional;
 		for (CampaignFormDataEntry formDataEntry : campaignFormData.getFormValues()) {
 			formElementOptional = formElements.stream().filter(formElement -> formElement.getId().equals(formDataEntry.getId())).findFirst();
 			if (formElementOptional.isPresent()) {
 				if (!isEntryValid(formElementOptional.get(), formDataEntry)) {
-					isRowValid = false;
+					wrongEntries.put(formElementOptional.get().getId(),formDataEntry.getValue().toString());
+
 				}
 			}
 		}
-		return isRowValid;
+		return wrongEntries;
 	}
 
 	private boolean isEntryValid(CampaignFormElement definition, CampaignFormDataEntry entry) {