SORMAS-Foundation#2993 add country to import/export methods

Author: [email protected]

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

@@ -1683,6 +1683,8 @@ public interface Captions {
 	String View_configuration_areas_short = "View.configuration.areas.short";
 	String View_configuration_communities = "View.configuration.communities";
 	String View_configuration_communities_short = "View.configuration.communities.short";
+	String View_configuration_countries = "View.configuration.countries";
+	String View_configuration_countries_short = "View.configuration.countries.short";
 	String View_configuration_devMode = "View.configuration.devMode";
 	String View_configuration_devMode_short = "View.configuration.devMode.short";
 	String View_configuration_districts = "View.configuration.districts";

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

@@ -51,6 +51,7 @@ public interface Strings {
 	String confirmationArchiveCommunities = "confirmationArchiveCommunities";
 	String confirmationArchiveCommunity = "confirmationArchiveCommunity";
 	String confirmationArchiveCountries = "confirmationArchiveCountries";
+	String confirmationArchiveCountry = "confirmationArchiveCountry";
 	String confirmationArchiveDistrict = "confirmationArchiveDistrict";
 	String confirmationArchiveDistricts = "confirmationArchiveDistricts";
 	String confirmationArchiveEvent = "confirmationArchiveEvent";
@@ -74,6 +75,7 @@ public interface Strings {
 	String confirmationDearchiveCommunities = "confirmationDearchiveCommunities";
 	String confirmationDearchiveCommunity = "confirmationDearchiveCommunity";
 	String confirmationDearchiveCountries = "confirmationDearchiveCountries";
+	String confirmationDearchiveCountry = "confirmationDearchiveCountry";
 	String confirmationDearchiveDistrict = "confirmationDearchiveDistrict";
 	String confirmationDearchiveDistricts = "confirmationDearchiveDistricts";
 	String confirmationDearchiveEvent = "confirmationDearchiveEvent";
@@ -828,6 +830,8 @@ public interface Strings {
 	String messageConvertEventParticipantToCaseDifferentDiseases = "messageConvertEventParticipantToCaseDifferentDiseases";
 	String messageCopyPassword = "messageCopyPassword";
 	String messageCountEventsNotDeleted = "messageCountEventsNotDeleted";
+	String messageCountriesArchived = "messageCountriesArchived";
+	String messageCountriesDearchived = "messageCountriesDearchived";
 	String messageCountryArchived = "messageCountryArchived";
 	String messageCountryDearchived = "messageCountryDearchived";
 	String messageCreateCollectionTask = "messageCreateCollectionTask";

sormas-api/src/main/java/de/symeda/sormas/api/importexport/DatabaseTable.java

@@ -47,6 +47,7 @@ public enum DatabaseTable {
 	PERSONS(DatabaseTableType.SORMAS, null, "persons"),
 	LOCATIONS(DatabaseTableType.SORMAS, null, "locations"),
 	OUTBREAKS(DatabaseTableType.SORMAS, null, "outbreaks"),
+	COUNTRIES(DatabaseTableType.INFRASTRUCTURE, null, "countries"),
 	REGIONS(DatabaseTableType.INFRASTRUCTURE, null, "regions"),
 	DISTRICTS(DatabaseTableType.INFRASTRUCTURE, null, "districts"),
 	COMMUNITIES(DatabaseTableType.INFRASTRUCTURE, null, "communities"),

sormas-api/src/main/java/de/symeda/sormas/api/importexport/ImportFacade.java

@@ -67,6 +67,8 @@ public interface ImportFacade {
 
 	String getAreaImportTemplateFilePath();
 
+	String getCountryImportTemplateFilePath();
+
 	String getRegionImportTemplateFilePath();
 
 	String getDistrictImportTemplateFilePath();

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

@@ -5,18 +5,19 @@
 import javax.ejb.Remote;
 
 import de.symeda.sormas.api.utils.SortProperty;
-import de.symeda.sormas.api.utils.ValidationRuntimeException;
 
 @Remote
 public interface CountryFacade {
 
 	CountryDto getCountryByUuid(String uuid);
 
+	List<CountryReferenceDto> getByName(String name, boolean includeArchivedEntities);
+
 	List<CountryDto> getIndexList(CountryCriteria criteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
 	long count(CountryCriteria criteria);
 
-	void saveCountry(CountryDto dto) throws ValidationRuntimeException;
+	void saveCountry(CountryDto dto);
 
 	void archive(String countryUuid);
 

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

@@ -0,0 +1,40 @@
+package de.symeda.sormas.api.region;
+
+import de.symeda.sormas.api.ReferenceDto;
+import de.symeda.sormas.api.statistics.StatisticsGroupingKey;
+
+public class CountryReferenceDto extends ReferenceDto implements StatisticsGroupingKey {
+
+	private static final long serialVersionUID = -7477992903590074568L;
+
+	public CountryReferenceDto() {
+	}
+
+    public CountryReferenceDto(String uuid) {
+        setUuid(uuid);
+    }
+
+    public CountryReferenceDto(String uuid, String caption) {
+        setUuid(uuid);
+        setCaption(caption);
+    }
+
+	@Override
+	public int keyCompareTo(StatisticsGroupingKey o) {
+
+		if (o == null) {
+			throw new NullPointerException("Can't compare to null.");
+		}
+
+		if (this.equals(o)) {
+			return 0;
+		}
+
+		int captionComparison = this.getCaption().compareTo(((CountryReferenceDto) o).getCaption());
+		if (captionComparison != 0) {
+			return captionComparison;
+		} else {
+			return this.getUuid().compareTo(((CountryReferenceDto) o).getUuid());
+		}
+	}
+}

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

@@ -1825,6 +1825,8 @@ View.configuration.outbreaks=Outbreaks Configuration
 View.configuration.outbreaks.short=Outbreaks
 View.configuration.areas=Areas Configuration
 View.configuration.areas.short=Areas
+View.configuration.countries=Countries Configuration
+View.configuration.countries.short=Countries
 View.configuration.regions=Regions Configuration
 View.configuration.regions.short=Regions
 View.configuration.templates=Templates Configuration

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

@@ -138,6 +138,8 @@ confirmationDisableAllLineListingRegion = Are you sure you want to disable line
 confirmationDisableAllLineListingNational = Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts in all regions.
 confirmationArchiveArea = Are you sure you want to archive this area?
 confirmationDearchiveArea = Are you sure you want to de-archive this area?
+confirmationArchiveCountry = Are you sure you want to archive this country?
+confirmationDearchiveCountry = Are you sure you want to de-archive this country?
 confirmationArchiveRegion = Are you sure you want to archive this region?
 confirmationDearchiveRegion = Are you sure you want to de-archive this region?
 confirmationArchiveDistrict = Are you sure you want to archive this district?
@@ -723,6 +725,8 @@ messagePointsOfEntryDearchivingNotPossible = At least one of the selected points
 messageNoRowsSelected = You have not selected any rows
 messageAreasArchived = All selected areas have been archived
 messageAreasDearchived = All selected areas have been de-archived
+messageCountriesArchived = All selected countries have been archived
+messageCountriesDearchived = All selected regions have been de-archived
 messageRegionsArchived = All selected regions have been archived
 messageRegionsDearchived = All selected regions have been de-archived
 messageDistrictsArchived = All selected districts have been archived

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

@@ -91,6 +91,7 @@ public class DatabaseExportService {
 		EXPORT_CONFIGS.put(DatabaseTable.TASKS, new DatabaseExportConfiguration(Task.TABLE_NAME));
 		EXPORT_CONFIGS.put(DatabaseTable.PERSONS, new DatabaseExportConfiguration(Person.TABLE_NAME));
 		EXPORT_CONFIGS.put(DatabaseTable.LOCATIONS, new DatabaseExportConfiguration(Location.TABLE_NAME));
+		EXPORT_CONFIGS.put(DatabaseTable.COUNTRIES, new DatabaseExportConfiguration(Location.TABLE_NAME));
 		EXPORT_CONFIGS.put(DatabaseTable.REGIONS, new DatabaseExportConfiguration(Region.TABLE_NAME));
 		EXPORT_CONFIGS.put(DatabaseTable.DISTRICTS, new DatabaseExportConfiguration(District.TABLE_NAME));
 		EXPORT_CONFIGS.put(DatabaseTable.COMMUNITIES, new DatabaseExportConfiguration(Community.TABLE_NAME));

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

@@ -134,6 +134,7 @@ public class ImportFacadeEjb implements ImportFacade {
 	private static final String POINT_OF_ENTRY_IMPORT_TEMPLATE_FILE_NAME = ImportExportUtils.FILE_PREFIX + "_import_point_of_entry_template.csv";
 	private static final String POPULATION_DATA_IMPORT_TEMPLATE_FILE_NAME = ImportExportUtils.FILE_PREFIX + "_import_population_data_template.csv";
 	private static final String AREA_IMPORT_TEMPLATE_FILE_NAME = ImportExportUtils.FILE_PREFIX + "_import_area_template.csv";
+	private static final String COUNTRY_IMPORT_TEMPLATE_FILE_NAME = ImportExportUtils.FILE_PREFIX + "_import_country_template.csv";
 	private static final String REGION_IMPORT_TEMPLATE_FILE_NAME = ImportExportUtils.FILE_PREFIX + "_import_region_template.csv";
 	private static final String DISTRICT_IMPORT_TEMPLATE_FILE_NAME = ImportExportUtils.FILE_PREFIX + "_import_district_template.csv";
 	private static final String COMMUNITY_IMPORT_TEMPLATE_FILE_NAME = ImportExportUtils.FILE_PREFIX + "_import_community_template.csv";
@@ -386,6 +387,14 @@ public String getAreaImportTemplateFilePath() {
 		return filePath.toString();
 	}
 
+	@Override
+	public String getCountryImportTemplateFilePath() {
+
+		Path exportDirectory = Paths.get(configFacade.getGeneratedFilesPath());
+		Path filePath = exportDirectory.resolve(COUNTRY_IMPORT_TEMPLATE_FILE_NAME);
+		return filePath.toString();
+	}
+
 	@Override
 	public String getRegionImportTemplateFilePath() {