SORMAS-Foundation#2993 PR changes

Author: [email protected]

sormas-api/src/main/java/de/symeda/sormas/api/region/CountryDto.java

@@ -1,5 +1,7 @@
 package de.symeda.sormas.api.region;
 
+import javax.validation.constraints.Size;
+
 import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.utils.DataHelper;
 
@@ -15,7 +17,9 @@ public class CountryDto extends EntityDto {
 
 	private String defaultName;
 	private String externalId;
+	@Size(min = 3, max = 3)
 	private String isoCode;
+	@Size(min = 1, max = 3)
 	private String unoCode;
 	private boolean archived;
 

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

@@ -5559,7 +5559,7 @@ CREATE TABLE country (
     changedate timestamp not null,
     archived boolean not null default false,
     defaultname varchar(255),
-    externalid varchar(4) unique,
+    externalid varchar(255),
     isocode varchar(3) unique,
     unocode varchar(3) unique,
     primary key(id)

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -5,8 +5,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
 import java.util.function.Consumer;
 
+import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.opencsv.exceptions.CsvValidationException;
@@ -88,7 +91,7 @@ private void insertColumnEntryIntoData(CountryDto newEntityDto, String value, St
 				} else {
 					PropertyDescriptor pd = new PropertyDescriptor(headerPathElementName, currentElement.getClass());
 					Class<?> propertyType = pd.getPropertyType();
-
+					validateFieldLength(headerPathElementName, value);
 					if (!executeDefaultInvokings(pd, currentElement, value, entityPropertyPath)) {
 						throw new UnsupportedOperationException(
 							I18nProperties.getValidationError(Validations.importPropertyTypeNotAllowed, propertyType.getName()));
@@ -110,6 +113,24 @@ private void insertColumnEntryIntoData(CountryDto newEntityDto, String value, St
 		}
 	}
 
+	private void validateFieldLength(String field, String value) throws ImportErrorException, InvalidColumnException {
+		try {
+			Size size = CountryDto.class.getDeclaredField(field).getAnnotation(Size.class);
+			if (StringUtils.isNotEmpty(value) && size != null) {
+				if (value.length() < size.min()) {
+					String message = "The value {0} has length {1} but the minimum length is {2}";
+					throw new ImportErrorException(MessageFormat.format(message, value, value.length(), size.min()));
+				}
+				if (value.length() > size.max()) {
+					String message = "The value {0} has length {1} but the maximum length is {2}";
+					throw new ImportErrorException(MessageFormat.format(message, value, value.length(), size.max()));
+				}
+			}
+		} catch (NoSuchFieldException e) {
+			throw new InvalidColumnException(field);
+		}
+	}
+
 	public void startImport(Consumer<StreamResource> errorReportConsumer, UI currentUI) throws IOException, CsvValidationException {
 		startImport(errorReportConsumer, currentUI, true);
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/CountryImporter.java

@@ -65,18 +65,18 @@ public void refreshMenu(SubMenu menu, Label infoLabel, Label infoLabelSub, Strin
 			params);
 
 		if (UserProvider.getCurrent().hasUserRight(UserRight.INFRASTRUCTURE_VIEW)) {
+			menu.addView(
+					CountriesView.VIEW_NAME,
+					I18nProperties.getPrefixCaption("View", CountriesView.VIEW_NAME.replaceAll("/", ".") + ".short", ""),
+					null,
+					false);
 			if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.INFRASTRUCTURE_TYPE_AREA)) {
 				menu.addView(
 					AreasView.VIEW_NAME,
 					I18nProperties.getPrefixCaption("View", AreasView.VIEW_NAME.replaceAll("/", ".") + ".short", ""),
 					null,
 					false);
 			}
-			menu.addView(
-				CountriesView.VIEW_NAME,
-				I18nProperties.getPrefixCaption("View", CountriesView.VIEW_NAME.replaceAll("/", ".") + ".short", ""),
-				null,
-				false);
 			menu.addView(
 				RegionsView.VIEW_NAME,
 				I18nProperties.getPrefixCaption("View", RegionsView.VIEW_NAME.replaceAll("/", ".") + ".short", ""),

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/AbstractConfigurationView.java

@@ -33,6 +33,7 @@ public ImportAllCountriesLayout() {
 			resetDownloadErrorReportButton();
 			try {
 				CountryImporter importer = new CountryImporter(countriesFile, currentUser);
+				importer.setCsvSeparator(',');
 				importer.startImport(this::extendDownloadErrorReportButton, currentUI);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportAllCountriesLayout.java

@@ -96,24 +96,20 @@ protected ImportLineResult importDataFromCsvLine(
 		newContactTemp.setReportingUser(currentUser);
 
 		boolean contactHasImportError =
-			insertRowIntoData(values, entityClasses, entityPropertyPaths, true, new Function<ImportCellData, Exception>() {
-
-				@Override
-				public Exception apply(ImportCellData importColumnInformation) {
-					// If the cell entry is not empty, try to insert it into the current contact or person object
-					if (!StringUtils.isEmpty(importColumnInformation.getValue())) {
-						try {
-							insertColumnEntryIntoData(
-								newContactTemp,
-								newPersonTemp,
-								importColumnInformation.getValue(),
-								importColumnInformation.getEntityPropertyPath());
-						} catch (ImportErrorException | InvalidColumnException e) {
-							return e;
-						}
+			insertRowIntoData(values, entityClasses, entityPropertyPaths, true, importColumnInformation -> {
+				// If the cell entry is not empty, try to insert it into the current contact or person object
+				if (!StringUtils.isEmpty(importColumnInformation.getValue())) {
+					try {
+						insertColumnEntryIntoData(
+							newContactTemp,
+							newPersonTemp,
+							importColumnInformation.getValue(),
+							importColumnInformation.getEntityPropertyPath());
+					} catch (ImportErrorException | InvalidColumnException e) {
+						return e;
 					}
-					return null;
 				}
+				return null;
 			});
 
 		// try to assign the contact to an existing case

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

@@ -94,6 +94,10 @@ public abstract class DataImporter {
 	 * Whether or not the current import has resulted in at least one error.
 	 */
 	private boolean hasImportError;
+	/**
+	 * CSV separator used in the file
+	 */
+	private char csvSeparator;
 
 	protected UserReferenceDto currentUser;
 	private CSVWriter errorReportCsvWriter;
@@ -108,6 +112,8 @@ public DataImporter(File inputFile, boolean hasEntityClassRow, UserReferenceDto
 			ImportExportUtils.TEMP_FILE_PREFIX + "_error_report_" + DataHelper.getShortUuid(currentUser.getUuid()) + "_"
 				+ DateHelper.formatDateForExport(new Date()) + ".csv");
 		this.errorReportFilePath = errorReportFilePath.toString();
+
+		this.csvSeparator = FacadeProvider.getConfigFacade().getCsvSeparator();
 	}
 
 	/**
@@ -202,9 +208,9 @@ public ImportResultStatus runImport() throws IOException, InvalidColumnException
 
 		try (CSVReader csvReader = CSVUtils.createCSVReader(
 				Files.newBufferedReader(inputFile.toPath(), UTF_8),
-				FacadeProvider.getConfigFacade().getCsvSeparator(),
+				this.csvSeparator,
 				new CSVCommentLineValidator())) {
-			errorReportCsvWriter = CSVUtils.createCSVWriter(createErrorReportWriter(), FacadeProvider.getConfigFacade().getCsvSeparator());
+			errorReportCsvWriter = CSVUtils.createCSVWriter(createErrorReportWriter(), this.csvSeparator);
 
 			// Build dictionary of entity headers
 			String[] entityClasses;
@@ -299,7 +305,7 @@ 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())) {
+			CSVUtils.createCSVReader(new FileReader(inputFile), this.csvSeparator, new CSVCommentLineValidator())) {
 
 			while (readNextValidLine(caseCountReader) != null) {
 				importFileLength++;
@@ -516,4 +522,8 @@ private String[] readNextValidLine(CSVReader csvReader) throws IOException, CsvV
 		while (isCommentLine);
 		return nextValidLine;
 	}
+
+	public void setCsvSeparator(char csvSeparator) {
+		this.csvSeparator = csvSeparator;
+	}
 }

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

@@ -7,7 +7,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import de.symeda.sormas.api.region.CountryDto;
 import org.apache.commons.lang3.StringUtils;
 
 import de.symeda.sormas.api.EntityDto;
@@ -46,7 +45,7 @@ protected ImportLineResult importDataFromCsvLine(
 		String[] entityProperties,
 		String[][] entityPropertyPaths,
 		boolean firstLine)
-		throws IOException, InvalidColumnException, InterruptedException {
+		throws IOException, InvalidColumnException {
 
 		// Check whether the new line has the same length as the header line
 		if (values.length > entityProperties.length) {