#8676 remove event arhive filter

SORMAS-Foundation · Apr 8, 2022 · b566c93 · b566c93
1 parent b16f712
commit b566c93
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java
@@ -789,11 +789,6 @@ public <T extends AbstractDomainObject> Predicate createCriteriaFilter(CaseCrite
 
 			filter = CriteriaBuilderHelper
 				.and(cb, filter, cb.isFalse(event.get(Event.DELETED)), cb.isFalse(eventParticipant.get(EventParticipant.DELETED)));
-			if (EntityRelevanceStatus.ACTIVE.equals(caseCriteria.getRelevanceStatus())) {
-				filter = CriteriaBuilderHelper.and(cb, filter, cb.isFalse(event.get(Event.ARCHIVED)));
-			} else if (EntityRelevanceStatus.ARCHIVED.equals(caseCriteria.getRelevanceStatus())) {
-				filter = CriteriaBuilderHelper.and(cb, filter, cb.isTrue(event.get(Event.ARCHIVED)));
-			}
 
 			if (hasEventLikeCriteria) {
 				String[] textFilters = caseCriteria.getEventLike().trim().split("\\s+");

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java
@@ -1305,11 +1305,6 @@ public Predicate buildCriteriaFilter(ContactCriteria contactCriteria, ContactQue
 
 			filter = CriteriaBuilderHelper
 				.and(cb, filter, cb.isFalse(event.get(Event.DELETED)), cb.isFalse(eventParticipant.get(EventParticipant.DELETED)));
-			if (EntityRelevanceStatus.ACTIVE.equals(contactCriteria.getRelevanceStatus())) {
-				filter = CriteriaBuilderHelper.and(cb, filter, cb.isFalse(event.get(Event.ARCHIVED)));
-			} else if (EntityRelevanceStatus.ARCHIVED.equals(contactCriteria.getRelevanceStatus())) {
-				filter = CriteriaBuilderHelper.and(cb, filter, cb.isTrue(event.get(Event.ARCHIVED)));
-			}
 
 			if (hasEventLikeCriteria) {
 				String[] textFilters = contactCriteria.getEventLike().trim().split("\\s+");