Merge pull request #13170 from SORMAS-Foundation/feature-13093_Data_protection_update

Feature 13093 data protection update

Author: leventegal-she

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java

@@ -350,6 +350,7 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@Valid
 	@EmbeddedPersonalData
 	@EmbeddedSensitiveData
+	@SensitiveData
 	private HealthConditionsDto healthConditions;
 
 	private YesNoUnknown pregnant;
@@ -513,7 +514,9 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 		COUNTRY_CODE_GERMANY,
 		COUNTRY_CODE_SWITZERLAND })
 	private Date quarantineOfficialOrderSentDate;
+	@SensitiveData
 	private YesNoUnknown postpartum;
+	@SensitiveData
 	private Trimester trimester;
 	private FollowUpStatus followUpStatus;
 	@SensitiveData

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java

@@ -263,6 +263,7 @@ public class CaseExportDto extends AbstractUuidDto implements IsCase {
 	private String vaccineBatchNumber;
 	private String vaccineUniiCode;
 	private String vaccineAtcCode;
+	@SensitiveData
 	private HealthConditionsDto healthConditions;
 	private int numberOfPrescriptions;
 	private int numberOfTreatments;

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java

@@ -312,6 +312,7 @@ public class ContactDto extends SormasToSormasShareableDto implements IsContact
 	@Valid
 	private EpiDataDto epiData;
 	@Valid
+	@SensitiveData
 	private HealthConditionsDto healthConditions;
 	private YesNoUnknown returningTraveler;
 

sormas-api/src/main/java/de/symeda/sormas/api/event/EventDto.java

@@ -167,12 +167,16 @@ public class EventDto extends SormasToSormasShareableDto {
 	private InstitutionalPartnerType srcInstitutionalPartnerType;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String srcInstitutionalPartnerTypeDetails;
+	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String srcFirstName;
+	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String srcLastName;
+	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String srcTelNo;
+	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String srcEmail;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)

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

@@ -1421,6 +1421,19 @@ public interface Captions {
 	String edit = "edit";
 	String endDateTime = "endDateTime";
 	String endOfProcessingDate = "endOfProcessingDate";
+	String EntityColumn_CAPTION = "EntityColumn.CAPTION";
+	String EntityColumn_DATA_PROTECTION = "EntityColumn.DATA_PROTECTION";
+	String EntityColumn_DESCRIPTION = "EntityColumn.DESCRIPTION";
+	String EntityColumn_DISEASES = "EntityColumn.DISEASES";
+	String EntityColumn_ENTITY = "EntityColumn.ENTITY";
+	String EntityColumn_EXCLUSIVE_COUNTRIES = "EntityColumn.EXCLUSIVE_COUNTRIES";
+	String EntityColumn_FIELD = "EntityColumn.FIELD";
+	String EntityColumn_FIELD_ID = "EntityColumn.FIELD_ID";
+	String EntityColumn_IGNORED_COUNTRIES = "EntityColumn.IGNORED_COUNTRIES";
+	String EntityColumn_NEW_DISEASE = "EntityColumn.NEW_DISEASE";
+	String EntityColumn_OUTBREAKS = "EntityColumn.OUTBREAKS";
+	String EntityColumn_REQUIRED = "EntityColumn.REQUIRED";
+	String EntityColumn_TYPE = "EntityColumn.TYPE";
 	String Environment = "Environment";
 	String Environment_description = "Environment.description";
 	String Environment_environmentMedia = "Environment.environmentMedia";

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

@@ -1288,6 +1288,7 @@ public interface Strings {
 	String messageCountImmunizationsNotRestored = "messageCountImmunizationsNotRestored";
 	String messageCountriesArchived = "messageCountriesArchived";
 	String messageCountriesDearchived = "messageCountriesDearchived";
+	String messageCountriesExcludedFromDataProtection = "messageCountriesExcludedFromDataProtection";
 	String messageCountryArchived = "messageCountryArchived";
 	String messageCountryDearchived = "messageCountryDearchived";
 	String messageCountryDearchivingNotPossible = "messageCountryDearchivingNotPossible";

sormas-api/src/main/java/de/symeda/sormas/api/location/LocationDto.java

@@ -101,8 +101,10 @@ public class LocationDto extends PseudonymizableDto {
 		CountryHelper.COUNTRY_CODE_GERMANY,
 		CountryHelper.COUNTRY_CODE_FRANCE })
 	private String details;
-	@PersonalData
-	@SensitiveData
+	@PersonalData(excludeForCountries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	@SensitiveData(excludeForCountries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String city;
 	@PersonalData

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

@@ -27,4 +27,6 @@
 public @interface PersonalData {
 
 	boolean mandatoryField() default false;
+
+	String[] excludeForCountries() default {};
 }

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

@@ -1,19 +1,16 @@
 /*
  * SORMAS® - Surveillance Outbreak Response Management & Analysis System
  * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package de.symeda.sormas.api.utils;
@@ -28,4 +25,6 @@
 public @interface SensitiveData {
 
 	boolean mandatoryField() default false;
+
+	String[] excludeForCountries() default {};
 }

sormas-api/src/main/java/de/symeda/sormas/api/utils/fieldaccess/UiFieldAccessCheckers.java

@@ -48,41 +48,44 @@ public static <T> UiFieldAccessCheckers<T> getNoop() {
 		return new UiFieldAccessCheckers<>();
 	}
 
-	public static <T> UiFieldAccessCheckers<T> getDefault(boolean isPseudonymized) {
+	public static <T> UiFieldAccessCheckers<T> getDefault(boolean isPseudonymized, String serverCountry) {
 		UiFieldAccessCheckers<T> fieldAccessCheckers = new UiFieldAccessCheckers<>();
 
-		fieldAccessCheckers.add(PseudonymizedFieldAccessChecker.forPersonalData(isPseudonymized))
-			.add(PseudonymizedFieldAccessChecker.forSensitiveData(isPseudonymized));
+		fieldAccessCheckers.add(PseudonymizedFieldAccessChecker.forPersonalData(isPseudonymized, serverCountry))
+			.add(PseudonymizedFieldAccessChecker.forSensitiveData(isPseudonymized, serverCountry));
 
 		return fieldAccessCheckers;
 	}
 
-	public static <T> UiFieldAccessCheckers<T> forPersonalData(boolean isPseudonymized) {
+	public static <T> UiFieldAccessCheckers<T> forPersonalData(boolean isPseudonymized, String serverCountry) {
 		UiFieldAccessCheckers<T> fieldAccessCheckers = new UiFieldAccessCheckers<>();
 
-		fieldAccessCheckers.add(PseudonymizedFieldAccessChecker.forPersonalData(isPseudonymized));
+		fieldAccessCheckers.add(PseudonymizedFieldAccessChecker.forPersonalData(isPseudonymized, serverCountry));
 
 		return fieldAccessCheckers;
 	}
 
-	public static <T> UiFieldAccessCheckers<T> forSensitiveData(boolean isPseudonymized) {
+	public static <T> UiFieldAccessCheckers<T> forSensitiveData(boolean isPseudonymized, String serverCountry) {
 		UiFieldAccessCheckers<T> fieldAccessCheckers = new UiFieldAccessCheckers<>();
 
-		fieldAccessCheckers.add(PseudonymizedFieldAccessChecker.forSensitiveData(isPseudonymized));
+		fieldAccessCheckers.add(PseudonymizedFieldAccessChecker.forSensitiveData(isPseudonymized, serverCountry));
 
 		return fieldAccessCheckers;
 	}
 
-	public static <T> UiFieldAccessCheckers<T> forDataAccessLevel(PseudonymizableDataAccessLevel accessLevel, boolean isPseudonymized) {
+	public static <T> UiFieldAccessCheckers<T> forDataAccessLevel(
+		PseudonymizableDataAccessLevel accessLevel,
+		boolean isPseudonymized,
+		String serverCountry) {
 
 		switch (accessLevel) {
 		case ALL:
 		case NONE:
-			return getDefault(isPseudonymized);
+			return getDefault(isPseudonymized, serverCountry);
 		case PERSONAL:
-			return forSensitiveData(isPseudonymized);
+			return forSensitiveData(isPseudonymized, serverCountry);
 		case SENSITIVE:
-			return forPersonalData(isPseudonymized);
+			return forPersonalData(isPseudonymized, serverCountry);
 		default:
 			throw new IllegalArgumentException(accessLevel.name());
 		}