Merge pull request SORMAS-Foundation#3721 from hzi-braunschweig/3608_fix-sormas-to-sormas-return-with-additional-case-data

SORMAS-Foundation#3608 fix pseudonomization issue on returning data from one sormas instance to another

Author: leventegal-she

sormas-api/src/main/java/de/symeda/sormas/api/user/UserRole.java

@@ -61,7 +61,7 @@ public enum UserRole
 	IMPORT_USER(false, false, false, false, JurisdictionLevel.NONE),
 	REST_EXTERNAL_VISITS_USER(false, false, false, false, JurisdictionLevel.NONE),
 	REST_USER(false, false, false, false, JurisdictionLevel.NONE),
-	SORMAS_TO_SORMAS_CLIENT(false, false, false, false, JurisdictionLevel.NONE);
+	SORMAS_TO_SORMAS_CLIENT(false, false, false, false, JurisdictionLevel.NATION);
 
 	/*
 	 * Hint for SonarQube issues:

sormas-api/src/main/java/de/symeda/sormas/api/utils/pseudonymization/DtoPseudonymizer.java

@@ -99,6 +99,10 @@ public <DTO> void pseudonymizeDto(Class<DTO> type, DTO dto, boolean isInJurisdic
 	}
 
 	public <DTO extends Pseudonymizable> void restorePseudonymizedValues(Class<DTO> type, DTO dto, DTO originalDto, boolean isInJurisdiction) {
+		if (originalDto == null) {
+			return;
+		}
+
 		List<Field> pseudonymizableFields = getPseudonymizableFields(type, isInJurisdiction);
 		List<Field> embeddedFields = getEmbeddedFields(type, isInJurisdiction);
 

sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonService.java

@@ -43,11 +43,11 @@
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
 
-import de.symeda.sormas.api.person.PersonDto;
 import org.apache.commons.lang3.StringUtils;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.caze.CaseClassification;
+import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.person.PersonNameDto;
 import de.symeda.sormas.api.person.PersonSimilarityCriteria;
 import de.symeda.sormas.api.utils.DateHelper;
@@ -244,13 +244,13 @@ public List<Long> getInJurisdictionIDs(final List<Person> selectedPersons) {
 		inJurisdictionQuery.select(personRoot.get(Person.ID));
 
 		final Predicate isFromSelectedPersons =
-			cb.in(personRoot.get(Person.ID)).value(selectedPersons.stream().map(p -> p.getId()).collect(Collectors.toList()));
-		inJurisdictionQuery.where(cb.and(isFromSelectedPersons, isInJurisdiction(cb, inJurisdictionQuery, personRoot)));
+			cb.in(personRoot.get(Person.ID)).value(selectedPersons.stream().map(Person::getId).collect(Collectors.toList()));
+		inJurisdictionQuery.where(cb.and(isFromSelectedPersons, getJurisdictionPredicate(cb, inJurisdictionQuery, personRoot)));
 
 		return em.createQuery(inJurisdictionQuery).getResultList();
 	}
 
-	private Predicate isInJurisdiction(CriteriaBuilder cb, CriteriaQuery<Long> cq, Root<Person> personRoot) {
+	private Predicate getJurisdictionPredicate(CriteriaBuilder cb, CriteriaQuery<Long> cq, Root<Person> personRoot) {
 
 		final Path<Object> personId = personRoot.get(Person.ID);