fix: update jpa predicates to match filter query intent and avoid sub…

…query matching
DropSnorz · Aug 12, 2024 · 05c45c0 · 05c45c0
1 parent d2a14e7
commit 05c45c0
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 14 deletions.
diff --git a/owlplug-client/src/main/java/com/owlplug/explore/controllers/ExploreController.java b/owlplug-client/src/main/java/com/owlplug/explore/controllers/ExploreController.java
@@ -243,11 +243,15 @@ private void performPackageSearch() {
       }
     }
 
+    List<String> formats = new ArrayList<>();
     for (Entry<String, CheckBox> entry : formatsFilterCheckBoxes.entrySet()) {
       if (entry.getValue().isSelected()) {
-        criteriaList.add(new StoreFilterCriteria(entry.getKey(), ExploreFilterCriteriaType.FORMAT));
+        formats.add(entry.getKey());
       }
     }
+    if (formats.size() > 0) {
+      criteriaList.add(new StoreFilterCriteria(formats, ExploreFilterCriteriaType.FORMAT_LIST));
+    }
 
     Task<Iterable<RemotePackage>> task = new Task<Iterable<RemotePackage>>() {
       @Override

diff --git a/owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java b/owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java
@@ -19,7 +19,9 @@
 package com.owlplug.explore.dao;
 
 import com.owlplug.core.model.PluginType;
+import com.owlplug.explore.model.PackageBundle;
 import com.owlplug.explore.model.RemotePackage;
+import jakarta.persistence.criteria.Fetch;
 import jakarta.persistence.criteria.Join;
 import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.criteria.Predicate;
@@ -70,8 +72,24 @@ static Specification<RemotePackage> hasCreator(String creator) {
   @SuppressWarnings("unchecked")
   static Specification<RemotePackage> hasFormat(String format) {
     return (remotePackage, cq, cb) -> {
-      Join<Object, Object> bundles = (Join<Object, Object>) remotePackage.fetch("bundles");
-      return cb.isMember(format, bundles.get("formats"));
+      Join<Object, Object> bundles = (Join<Object, Object>) remotePackage.fetch("bundles", JoinType.INNER);
+      return bundles.join("formats").in(format);
+    };
+  }
+
+  /**
+   * Platform filtering JPA Specification Filter packages matching the given
+   * platformTag or packages without platform assignment.
+   *
+   * @param formatList - The compatible platformTagList to find
+   * @return The JPA Specification
+   */
+  @SuppressWarnings("unchecked")
+  static Specification<RemotePackage> hasFormat(List<String> formatList) {
+    return (remotePackage, cq, cb) -> {
+      Join<Object, Object> bundles = (Join<Object, Object>) remotePackage.fetch("bundles", JoinType.INNER);
+      return bundles.join("formats").in(formatList);
+
     };
   }
 
@@ -84,8 +102,8 @@ static Specification<RemotePackage> hasFormat(String format) {
   @SuppressWarnings("unchecked")
   static Specification<RemotePackage> hasPlatformTag(String platformTag) {
     return (remotePackage, cq, cb) -> {
-      Join<Object, Object> bundles = (Join<Object, Object>) remotePackage.fetch("bundles");
-      return cb.isMember(platformTag, bundles.get("targets"));
+      Join<Object, Object> bundles = (Join<Object, Object>) remotePackage.fetch("bundles", JoinType.INNER);
+      return bundles.join("targets").in(platformTag);
     };
   }
 
@@ -100,12 +118,8 @@ static Specification<RemotePackage> hasPlatformTag(String platformTag) {
   static Specification<RemotePackage> hasPlatformTag(List<String> platformTagList) {
     return (remotePackage, cq, cb) -> {
       Join<Object, Object> bundles = (Join<Object, Object>) remotePackage.fetch("bundles", JoinType.INNER);
-      List<Predicate> predicates = new ArrayList<>();
-      for (String platformTag : platformTagList) {
-        predicates.add(cb.or(cb.isMember(platformTag, bundles.get("targets"))));
-      }
-      cq.distinct(true);
-      return cb.or(predicates.toArray(new Predicate[predicates.size()]));
+      return bundles.join("targets").in(platformTagList);
+
     };
   }
 

diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/search/ExploreFilterCriteriaType.java b/owlplug-client/src/main/java/com/owlplug/explore/model/search/ExploreFilterCriteriaType.java
@@ -19,5 +19,5 @@
 package com.owlplug.explore.model.search;
 
 public enum ExploreFilterCriteriaType {
-  NAME, TAG, TYPE, PLATFORM, CREATOR, FORMAT
+  NAME, TAG, TYPE, PLATFORM, CREATOR, FORMAT, FORMAT_LIST
 }
diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/search/StoreCriteriaAdapter.java b/owlplug-client/src/main/java/com/owlplug/explore/model/search/StoreCriteriaAdapter.java
@@ -56,6 +56,9 @@ public static Specification<RemotePackage> toSpecification(StoreFilterCriteria c
     if (criteria.getFilterType().equals(ExploreFilterCriteriaType.FORMAT)) {
       return RemotePackageDAO.hasFormat(String.valueOf(criteria.getValue()));
     }
+    if (criteria.getFilterType().equals(ExploreFilterCriteriaType.FORMAT_LIST)) {
+      return RemotePackageDAO.hasFormat((List<String>) criteria.getValue());
+    }
     return Specification.where(null);
 
   }

diff --git a/owlplug-client/src/main/resources/application.properties b/owlplug-client/src/main/resources/application.properties
@@ -36,5 +36,5 @@ spring.main.web-environment=false
 
 # Logger
 # Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
-#logging.level.org.hibernate.SQL=DEBUG
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE