From 5ceed08b9c7d136ec12ffaa28a84b2281cb505c1 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 6 Nov 2023 17:22:36 +0200
Subject: [PATCH] Add missing apply filter

---
 .../core/src/main/java/eu/eudat/query/EntityDoiQuery.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/EntityDoiQuery.java b/dmp-backend/core/src/main/java/eu/eudat/query/EntityDoiQuery.java
index 2dcdc8fb0..b03ca28cc 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/query/EntityDoiQuery.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/query/EntityDoiQuery.java
@@ -189,6 +189,14 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
                 notInClause.value(item);
             predicates.add(notInClause.not());
         }
+
+        if (this.entityIds != null) {
+            CriteriaBuilder.In<UUID> noInClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(EntityDoiEntity._entityId));
+            for (UUID item: this.entityIds) {
+                noInClause.value(item);
+                predicates.add(noInClause.not());
+            }
+        }
         if (!predicates.isEmpty()) {
             Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
             return queryContext.CriteriaBuilder.and(predicatesArray);