Fixed SORMAS-Foundation#3687

Only take into account case jurisdiction when contact jurisdiction is empty, extended unit test

Author: MateStrysewske

sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java

@@ -1273,7 +1273,7 @@ private Predicate buildQuarantineDateFilter(CriteriaBuilder cb, Root<Contact> co
 				cb.greaterThanOrEqualTo(contact.get(Contact.QUARANTINE_TO), to)));
 	}
 
-	public Predicate isInJurisdictionOrOwned(CriteriaBuilder cb, CriteriaQuery<Long> cq, ContactJoins joins) {
+	public Predicate isInJurisdictionOrOwned(CriteriaBuilder cb, CriteriaQuery<Long> cq, Root<Contact> contactRoot, ContactJoins joins) {
 		final User currentUser = this.getCurrentUser();
 
 		final Subquery<Long> contactCaseJurisdictionSubQuery = cq.subquery(Long.class);
@@ -1310,7 +1310,7 @@ public Predicate isInJurisdictionOrOwned(CriteriaBuilder cb, CriteriaQuery<Long>
 		default:
 			jurisdictionPredicate = cb.disjunction();
 		}
-		return cb.or(reportedByCurrentUser, contactCaseInJurisdiction, jurisdictionPredicate);
+		return cb.or(reportedByCurrentUser, jurisdictionPredicate, cb.and(cb.isNull(contactRoot.get(Contact.REGION)), contactCaseInJurisdiction));
 	}
 
 	public boolean isContactEditAllowed(Contact contact) {

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

@@ -267,7 +267,7 @@ private Predicate getJurisdictionPredicate(CriteriaBuilder cb, CriteriaQuery<Lon
 		contactJurisdictionSubQuery.where(
 			cb.and(
 				cb.equal(contactRoot.get(Contact.PERSON).get(Person.ID), personId),
-				contactService.isInJurisdictionOrOwned(cb, cq, new ContactJoins(contactRoot))));
+				contactService.isInJurisdictionOrOwned(cb, cq, contactRoot, new ContactJoins(contactRoot))));
 		final Predicate isContactInJurisdiction = cb.exists(contactJurisdictionSubQuery);
 
 		final Subquery<Long> eventParticipantJurisdictionSubQuery = cq.subquery(Long.class);

sormas-backend/src/test/java/de/symeda/sormas/backend/person/PersonFacadeEjbPseudonymizationTest.java

@@ -37,6 +37,7 @@
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.caze.CaseDataDto;
+import de.symeda.sormas.api.contact.ContactDto;
 import de.symeda.sormas.api.event.EventDto;
 import de.symeda.sormas.api.location.AreaType;
 import de.symeda.sormas.api.location.LocationDto;
@@ -126,8 +127,24 @@ public void testGetContactPersonInSameJurisdiction() {
 	@Test
 	public void testGetContactPersonOutsideJurisdiction() {
 
-		creator.createContact(user1.toReference(), null, person.toReference(), null, new Date(), null, Disease.CORONAVIRUS, rdcf1);
+		ContactDto contact =
+			creator.createContact(user1.toReference(), null, person.toReference(), null, new Date(), null, Disease.CORONAVIRUS, rdcf1);
+		assertPseudonymised(getPersonFacade().getPersonByUuid(person.getUuid()));
+
+		CaseDataDto caze = creator.createCase(user1.toReference(), creator.createPerson().toReference(), rdcf2);
+		contact.setCaze(caze.toReference());
+		contact = getContactFacade().saveContact(contact);
 		assertPseudonymised(getPersonFacade().getPersonByUuid(person.getUuid()));
+
+		contact.setRegion(rdcf2.region);
+		contact.setDistrict(rdcf2.district);
+		contact = getContactFacade().saveContact(contact);
+		assertNotPseudonymized(getPersonFacade().getPersonByUuid(person.getUuid()));
+
+		contact.setRegion(null);
+		contact.setDistrict(null);
+		contact = getContactFacade().saveContact(contact);
+		assertNotPseudonymized(getPersonFacade().getPersonByUuid(person.getUuid()));
 	}
 
 	@Test