Merge pull request SORMAS-Foundation#3357 from hzi-braunschweig/3307-campaign-import-error-writer-issue

SORMAS-Foundation#3307 Add format error display in error report

Author: danRosca

sormas-api/src/main/java/de/symeda/sormas/api/utils/DateHelper.java

@@ -144,6 +144,13 @@ public static Date parseDate(String date, SimpleDateFormat dateFormat) {
 	public static Date parseDateWithException(String date) throws ParseException {
 
 		if (date != null) {
+			try {
+				SimpleDateFormat dateFormat = clone(SHORT_DATE_FORMAT);
+				dateFormat.setLenient(false);
+				return dateFormat.parse(date);
+			} catch (ParseException e) {
+				// Try next format
+			}
 			try {
 				SimpleDateFormat dateFormat = clone(DATE_FORMAT);
 				dateFormat.setLenient(false);

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignDataView.java

@@ -86,7 +86,7 @@ public CampaignDataView() {
 		List<CampaignReferenceDto> campaigns = FacadeProvider.getCampaignFacade().getAllActiveCampaignsAsReference();
 		campaignCombo.setItems(campaigns);
 		final CampaignReferenceDto lastStartedCampaign = FacadeProvider.getCampaignFacade().getLastStartedCampaign();
-		if (lastStartedCampaign != null && campaigns.contains(lastStartedCampaign)) {
+		if (lastStartedCampaign != null) {
 			campaignCombo.setValue(lastStartedCampaign);
 		}
 		criteria.setCampaign((CampaignReferenceDto) campaignCombo.getValue());

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

@@ -5,7 +5,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.text.ParseException;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -105,7 +104,7 @@ protected ImportLineResult importDataFromCsvLine(
 				FacadeProvider.getCampaignFormDataFacade().saveCampaignFormData(campaignFormData);
 			}
 		} catch (ImportErrorException e) {
-			writeImportError(values, e.getMessage());
+			writeImportError(values, e.getLocalizedMessage());
 			return ImportLineResult.ERROR;
 		}
 
@@ -220,8 +219,6 @@ private CampaignFormDataDto insertColumnEntryIntoData(CampaignFormDataDto campai
 					e.printStackTrace();
 				} catch (IllegalAccessException e) {
 					e.printStackTrace();
-				} catch (ParseException e) {
-					e.printStackTrace();
 				}
 			} else {
 				CampaignFormDataEntry formEntry = new CampaignFormDataEntry(entryHeaderPath[i], entry[i]);
@@ -241,15 +238,16 @@ private CampaignFormDataDto insertColumnEntryIntoData(CampaignFormDataDto campai
 
 	@Override
 	protected boolean executeDefaultInvokings(PropertyDescriptor pd, Object element, String entry, String[] entryHeaderPath)
-		throws InvocationTargetException, IllegalAccessException, ParseException, ImportErrorException {
+		throws InvocationTargetException, IllegalAccessException, ImportErrorException {
 		final boolean returnBoolean = super.executeDefaultInvokings(pd, element, entry, entryHeaderPath);
 		final Class<?> propertyType = pd.getPropertyType();
 		if (propertyType.isAssignableFrom(RegionReferenceDto.class)) {
 			final UserDto currentUserDto = userFacade.getByUuid(currentUser.getUuid());
 			final JurisdictionLevel jurisdictionLevel = UserRole.getJurisdictionLevel(currentUserDto.getUserRoles());
 			if (jurisdictionLevel == JurisdictionLevel.REGION && !currentUserDto.getRegion().getCaption().equals(entry)) {
 				throw new ImportErrorException(
-					I18nProperties.getValidationError(Validations.importEntryRegionNotInUsersJurisdiction, entry, buildEntityProperty(entryHeaderPath)));
+					I18nProperties
+						.getValidationError(Validations.importEntryRegionNotInUsersJurisdiction, entry, buildEntityProperty(entryHeaderPath)));
 			}
 		}
 		return returnBoolean;

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/importer/ContactImporter.java

@@ -5,14 +5,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.text.ParseException;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import com.opencsv.exceptions.CsvValidationException;
 import org.apache.commons.lang3.StringUtils;
 
+import com.opencsv.exceptions.CsvValidationException;
 import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.server.StreamResource;
 import com.vaadin.ui.UI;
@@ -401,9 +400,6 @@ private void insertColumnEntryIntoData(ContactDto contact, PersonDto person, Str
 					I18nProperties.getValidationError(Validations.importErrorInColumn, buildEntityProperty(entryHeaderPath)));
 			} catch (IllegalArgumentException e) {
 				throw new ImportErrorException(entry, buildEntityProperty(entryHeaderPath));
-			} catch (ParseException e) {
-				throw new ImportErrorException(
-					I18nProperties.getValidationError(Validations.importInvalidDate, buildEntityProperty(entryHeaderPath)));
 			} catch (ImportErrorException e) {
 				throw e;
 			} catch (Exception e) {

sormas-ui/src/main/java/de/symeda/sormas/ui/importer/DataImporter.java

@@ -1,5 +1,7 @@
 package de.symeda.sormas.ui.importer;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.io.File;
@@ -20,14 +22,13 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import com.opencsv.exceptions.CsvValidationException;
-import de.symeda.sormas.api.utils.CSVCommentLineValidator;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.opencsv.CSVReader;
 import com.opencsv.CSVWriter;
+import com.opencsv.exceptions.CsvValidationException;
 import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.server.StreamResource;
 import com.vaadin.ui.UI;
@@ -46,14 +47,13 @@
 import de.symeda.sormas.api.region.RegionReferenceDto;
 import de.symeda.sormas.api.user.UserDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
+import de.symeda.sormas.api.utils.CSVCommentLineValidator;
 import de.symeda.sormas.api.utils.CSVUtils;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.DateHelper;
 import de.symeda.sormas.ui.utils.DownloadUtil;
 import de.symeda.sormas.ui.utils.VaadinUiUtil;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 /**
  * Base class for all importers that are used to get data from CSV files into SORMAS.
  * 
@@ -220,7 +220,8 @@ public ImportResultStatus runImport() throws IOException, InvalidColumnException
 
 		CSVReader csvReader = null;
 		try {
-			csvReader = CSVUtils.createCSVReader(new InputStreamReader(new FileInputStream(inputFile), UTF_8),
+			csvReader = CSVUtils.createCSVReader(
+				new InputStreamReader(new FileInputStream(inputFile), UTF_8),
 				FacadeProvider.getConfigFacade().getCsvSeparator(),
 				new CSVCommentLineValidator());
 			errorReportCsvWriter = CSVUtils.createCSVWriter(createErrorReportWriter(), FacadeProvider.getConfigFacade().getCsvSeparator());
@@ -318,9 +319,8 @@ protected StreamResource createErrorReportStreamResource() {
 	 */
 	protected int readImportFileLength(File inputFile) throws IOException, CsvValidationException {
 		int importFileLength = 0;
-		try (CSVReader caseCountReader = CSVUtils.createCSVReader(new FileReader(inputFile),
-			FacadeProvider.getConfigFacade().getCsvSeparator(),
-			new CSVCommentLineValidator())) {
+		try (CSVReader caseCountReader =
+			CSVUtils.createCSVReader(new FileReader(inputFile), FacadeProvider.getConfigFacade().getCsvSeparator(), new CSVCommentLineValidator())) {
 
 			while (readNextValidLine(caseCountReader) != null) {
 				importFileLength++;
@@ -366,21 +366,19 @@ protected abstract ImportLineResult importDataFromCsvLine(
 		"unchecked",
 		"rawtypes" })
 	protected boolean executeDefaultInvokings(PropertyDescriptor pd, Object element, String entry, String[] entryHeaderPath)
-		throws InvocationTargetException, IllegalAccessException, ParseException, ImportErrorException {
+		throws InvocationTargetException, IllegalAccessException, ImportErrorException {
 		Class<?> propertyType = pd.getPropertyType();
 
 		if (propertyType.isEnum()) {
 			pd.getWriteMethod().invoke(element, Enum.valueOf((Class<? extends Enum>) propertyType, entry.toUpperCase()));
 			return true;
 		}
 		if (propertyType.isAssignableFrom(Date.class)) {
-			// If the string is smaller than the length of the expected date format, throw an exception
-			if (entry.length() < 10) {
-				throw new ImportErrorException(
-					I18nProperties.getValidationError(Validations.importInvalidDate, buildEntityProperty(entryHeaderPath)));
-			} else {
+			try {
 				pd.getWriteMethod().invoke(element, DateHelper.parseDateWithException(entry));
 				return true;
+			} catch (ParseException e) {
+				throw new ImportErrorException(I18nProperties.getValidationError(Validations.importInvalidDate, pd.getName()));
 			}
 		}
 		if (propertyType.isAssignableFrom(Integer.class)) {
@@ -535,7 +533,8 @@ private String[] readNextValidLine(CSVReader csvReader) throws IOException, CsvV
 					throw e;
 				}
 			}
-		} while(isCommentLine);
+		}
+		while (isCommentLine);
 		return nextValidLine;
 	}
 }