SORMAS-Foundation#3591 - Temporarily disabled new contact directory filtering logic

Author: MateStrysewske

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

@@ -126,11 +126,11 @@
 import de.symeda.sormas.backend.epidata.EpiData;
 import de.symeda.sormas.backend.epidata.EpiDataFacadeEjb;
 import de.symeda.sormas.backend.epidata.EpiDataFacadeEjb.EpiDataFacadeEjbLocal;
-import de.symeda.sormas.backend.exposure.Exposure;
 import de.symeda.sormas.backend.event.ContactEventSummaryDetails;
 import de.symeda.sormas.backend.event.Event;
 import de.symeda.sormas.backend.event.EventParticipant;
 import de.symeda.sormas.backend.event.EventService;
+import de.symeda.sormas.backend.exposure.Exposure;
 import de.symeda.sormas.backend.externaljournal.ExternalJournalService;
 import de.symeda.sormas.backend.facility.Facility;
 import de.symeda.sormas.backend.location.Location;

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

@@ -893,11 +893,11 @@ public Predicate createUserFilterForJoin(CriteriaBuilder cb, CriteriaQuery cq, F
 	@SuppressWarnings("rawtypes")
 	public Predicate createUserFilterForJoin(CriteriaBuilder cb, CriteriaQuery cq, From<?, Contact> contactPath, ContactCriteria contactCriteria) {
 
-		Predicate userFilter = null;
+//		Predicate userFilter = null;
 
-		if (contactCriteria == null || contactCriteria.getIncludeContactsFromOtherJurisdictions()) {
-			userFilter = caseService.createUserFilter(cb, cq, contactPath.join(Contact.CAZE, JoinType.LEFT));
-		}
+//		if (contactCriteria == null || contactCriteria.getIncludeContactsFromOtherJurisdictions()) {
+		Predicate userFilter = caseService.createUserFilter(cb, cq, contactPath.join(Contact.CAZE, JoinType.LEFT));
+//		}
 		Predicate filter;
 		if (userFilter != null) {
 			filter = cb.or(createUserFilterWithoutCase(cb, cq, contactPath, contactCriteria), userFilter);
@@ -930,12 +930,12 @@ public Predicate createUserFilterWithoutCase(
 			}
 		}
 
-		Predicate filter = null;
+//		Predicate filter = null;
 		// whoever created it or is assigned to it is allowed to access it
-		if (contactCriteria == null || contactCriteria.getIncludeContactsFromOtherJurisdictions()) {
-			filter = cb.equal(contactPath.join(Contact.REPORTING_USER, JoinType.LEFT), currentUser);
-			filter = cb.or(filter, cb.equal(contactPath.join(Contact.CONTACT_OFFICER, JoinType.LEFT), currentUser));
-		}
+//		if (contactCriteria == null || contactCriteria.getIncludeContactsFromOtherJurisdictions()) {
+		Predicate filter = cb.equal(contactPath.join(Contact.REPORTING_USER, JoinType.LEFT), currentUser);
+		filter = cb.or(filter, cb.equal(contactPath.join(Contact.CONTACT_OFFICER, JoinType.LEFT), currentUser));
+//		}
 		switch (jurisdictionLevel) {
 		case REGION:
 			final Region region = currentUser.getRegion();
@@ -1189,8 +1189,10 @@ public Predicate buildCriteriaFilter(ContactCriteria contactCriteria, CriteriaBu
 				and(cb, filter, cb.equal(joins.getEventParticipants().get(EventParticipant.UUID), contactCriteria.getEventParticipant().getUuid()));
 		}
 		if (contactCriteria.getOnlyContactsWithSourceCaseInGivenEvent() != null) {
-			filter =
-				and(cb, filter, cb.equal(joins.getCaseEvent().get(Event.UUID), contactCriteria.getOnlyContactsWithSourceCaseInGivenEvent().getUuid()));
+			filter = and(
+				cb,
+				filter,
+				cb.equal(joins.getCaseEvent().get(Event.UUID), contactCriteria.getOnlyContactsWithSourceCaseInGivenEvent().getUuid()));
 		}
 
 		return filter;

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactsFilterForm.java

@@ -37,7 +37,6 @@
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
-import de.symeda.sormas.api.user.JurisdictionLevel;
 import de.symeda.sormas.api.user.UserDto;
 import de.symeda.sormas.api.user.UserRole;
 import de.symeda.sormas.api.utils.DateFilterOption;
@@ -294,17 +293,17 @@ public void addMoreFilters(CustomLayout moreFiltersContainer) {
 				null,
 				CHECKBOX_STYLE));
 
-		final JurisdictionLevel userJurisdictionLevel = UserRole.getJurisdictionLevel(UserProvider.getCurrent().getUserRoles());
-		if (userJurisdictionLevel != JurisdictionLevel.NATION && userJurisdictionLevel != JurisdictionLevel.NONE) {
-			addField(
-				moreFiltersContainer,
-				CheckBox.class,
-				FieldConfiguration.withCaptionAndStyle(
-					ContactCriteria.INCLUDE_CONTACTS_FROM_OTHER_JURISDICTIONS,
-					I18nProperties.getCaption(Captions.contactInludeContactsFromOtherJurisdictions),
-					I18nProperties.getDescription(Descriptions.descContactIncludeContactsFromOtherJurisdictions),
-					CHECKBOX_STYLE));
-		}
+//		final JurisdictionLevel userJurisdictionLevel = UserRole.getJurisdictionLevel(UserProvider.getCurrent().getUserRoles());
+//		if (userJurisdictionLevel != JurisdictionLevel.NATION && userJurisdictionLevel != JurisdictionLevel.NONE) {
+//			addField(
+//				moreFiltersContainer,
+//				CheckBox.class,
+//				FieldConfiguration.withCaptionAndStyle(
+//					ContactCriteria.INCLUDE_CONTACTS_FROM_OTHER_JURISDICTIONS,
+//					I18nProperties.getCaption(Captions.contactInludeContactsFromOtherJurisdictions),
+//					I18nProperties.getDescription(Descriptions.descContactIncludeContactsFromOtherJurisdictions),
+//					CHECKBOX_STYLE));
+//		}
 
 		moreFiltersContainer.addComponent(buildWeekAndDateFilter(), WEEK_AND_DATE_FILTER);
 	}