SORMAS-Foundation#2993 check for empty ISO code

Author: [email protected]

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

@@ -53,6 +53,7 @@ public interface Validations {
 	String importCommunityAlreadyExists = "importCommunityAlreadyExists";
 	String importCommunityNotUnique = "importCommunityNotUnique";
 	String importCountryAlreadyExists = "importCountryAlreadyExists";
+	String importCountryEmptyIso = "importCountryEmptyIso";
 	String importDistrictAlreadyExists = "importDistrictAlreadyExists";
 	String importDistrictNotUnique = "importDistrictNotUnique";
 	String importEntryCommunityNotInUsersJurisdiction = "importEntryCommunityNotInUsersJurisdiction";

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

@@ -1,7 +1,5 @@
 package de.symeda.sormas.api.region;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.EntityDto;
@@ -20,7 +18,6 @@ public class CountryDto extends EntityDto {
 	private String defaultName;
 	private String externalId;
 	@Size(min = 2, max = 3)
-	@NotBlank
 	private String isoCode;
 	@Size(min = 1, max = 3)
 	private String unoCode;

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

@@ -0,0 +1,12 @@
+package de.symeda.sormas.api.utils;
+
+/**
+ * Thrown when an entity that is supposed to be saved has an empty value which should not be empty
+ */
+@SuppressWarnings("serial")
+public class EmptyValueException extends ValidationRuntimeException {
+
+    public EmptyValueException(String message) {
+        super(message);
+    }
+}

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

@@ -46,6 +46,7 @@ importInvalidDate = Invalid date in column %s; Allowed date formats are dd/MM/yy
 importLineTooLong = This line is longer than the header line
 importAreaNotUnique = Invalid value %s in column %s; Area name is not unique, make sure there is only one area with this name in the database
 importRegionNotUnique = Invalid value %s in column %s; Region name is not unique, make sure there is only one region with this name in the database
+importCountryEmptyIso = The ISO code is empty.
 importCountryAlreadyExists = The database already contains a country with this ISO code or this UNO code.
 importRegionAlreadyExists = The database already contains a region with this name.
 importDistrictAlreadyExists = The database already contains a district with this name in the specified region.

sormas-backend/src/main/java/de/symeda/sormas/backend/region/CountryFacadeEjb.java

@@ -24,11 +24,13 @@
 import de.symeda.sormas.api.region.CountryFacade;
 import de.symeda.sormas.api.region.CountryIndexDto;
 import de.symeda.sormas.api.region.CountryReferenceDto;
+import de.symeda.sormas.api.utils.EmptyValueException;
 import de.symeda.sormas.api.utils.SortProperty;
 import de.symeda.sormas.api.utils.ValidationRuntimeException;
 import de.symeda.sormas.backend.util.DtoHelper;
 import de.symeda.sormas.backend.util.ModelConstants;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 
 @Stateless(name = "CountryFacade")
 public class CountryFacadeEjb implements CountryFacade {
@@ -115,6 +117,10 @@ public long count(CountryCriteria criteria) {
 
 	@Override
 	public String saveCountry(CountryDto dto) throws ValidationRuntimeException {
+		if (StringUtils.isBlank(dto.getIsoCode())) {
+			throw new EmptyValueException(I18nProperties.getValidationError(Validations.importCountryEmptyIso));
+		}
+
 		Country country = countryService.getByUuid(dto.getUuid());
 
 		if (country == null

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

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

sormas-backend/src/test/java/de/symeda/sormas/backend/region/CountryFacadeEjbTest.java

@@ -8,6 +8,7 @@
 import java.util.Objects;
 
 import de.symeda.sormas.api.region.CountryIndexDto;
+import de.symeda.sormas.api.utils.EmptyValueException;
 import org.junit.Test;
 
 import de.symeda.sormas.api.region.CountryCriteria;
@@ -70,6 +71,13 @@ public void testSaveCountrySuccessful() throws Exception {
 		assertTrue(entityIsEqualToDto(actual, expected));
 	}
 
+	@Test(expected = EmptyValueException.class)
+	public void testSaveCountryIsoCodeEmpty() {
+		CountryDto country = new CountryDto();
+		country.setDefaultName("Romania");
+		getCountryFacade().saveCountry(country);
+	}
+
 	@Test(expected = ValidationRuntimeException.class)
 	public void testSaveCountryIsoCodeExists() {
 		creator.createCountry("Romania", "ROU", "642");

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

@@ -11,6 +11,7 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
+import de.symeda.sormas.api.utils.EmptyValueException;
 import org.apache.commons.lang3.StringUtils;
 
 import com.opencsv.exceptions.CsvValidationException;
@@ -67,6 +68,9 @@ protected ImportLineResult importDataFromCsvLine(
 			try {
 				FacadeProvider.getCountryFacade().saveCountry(newEntityDto);
 				return ImportLineResult.SUCCESS;
+			} catch (EmptyValueException e) {
+				writeImportError(values, e.getMessage());
+				return ImportLineResult.ERROR;
 			} catch (ValidationRuntimeException e) {
 				writeImportError(values, e.getMessage());
 				return ImportLineResult.DUPLICATE;