Merge pull request SORMAS-Foundation#3493 from hzi-braunschweig/3174-export-switzerland-fields

SORMAS-Foundation#3174 consider excluded countries when generating import templates

Author: vlad-ciucescu

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java

@@ -21,6 +21,7 @@
 import java.util.Date;
 import java.util.List;
 
+import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.ImportIgnore;
 import de.symeda.sormas.api.facility.FacilityReferenceDto;
@@ -262,15 +263,15 @@ public class PersonDto extends PseudonymizableDto {
 	private List<LocationDto> addresses = new ArrayList<>();
 
 	@Diseases(Disease.CORONAVIRUS)
-	@HideForCountriesExcept(countries = "ch")
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
 	private boolean hasCovidApp;
 	@Diseases(Disease.CORONAVIRUS)
-	@HideForCountriesExcept(countries = "ch")
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
 	private boolean covidCodeDelivered;
 
 	private SymptomJournalStatus symptomJournalStatus;
 	@SensitiveData
-	@HideForCountriesExcept(countries = "de")
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_GERMANY)
 	private String externalId;
 
 	public Integer getBirthdateDD() {

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

@@ -63,6 +63,10 @@
 import javax.ejb.Stateless;
 import javax.inject.Provider;
 
+import de.symeda.sormas.api.CountryHelper;
+import de.symeda.sormas.api.utils.HideForCountries;
+import de.symeda.sormas.api.utils.HideForCountriesExcept;
+import de.symeda.sormas.api.utils.fieldvisibility.checkers.CountryFieldVisibilityChecker;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -517,7 +521,13 @@ private void appendListOfFields(List<ImportColumn> importColumns, Class<?> clazz
 				continue;
 			}
 
-			Method readMethod = null;
+			String currentCountry = configFacade.getCountryCode();
+			CountryFieldVisibilityChecker visibilityChecker = new CountryFieldVisibilityChecker(currentCountry);
+			if (!visibilityChecker.isVisible(field)) {
+				continue;
+			}
+
+			Method readMethod;
 			try {
 				readMethod = clazz.getDeclaredMethod("get" + WordUtils.capitalize(field.getName()));
 			} catch (NoSuchMethodException e) {
@@ -529,7 +539,7 @@ private void appendListOfFields(List<ImportColumn> importColumns, Class<?> clazz
 			}
 
 			// Fields without a getter or whose getters are declared in a superclass are ignored
-			if (readMethod == null || readMethod.getDeclaringClass() != clazz) {
+			if (readMethod.getDeclaringClass() != clazz) {
 				continue;
 			}
 			// Fields with the @ImportIgnore annotation are ignored