[backend] feat: allow filter on assets from asset groups

OpenBAS-Platform · Feb 7, 2025 · 3e3b776 · 3e3b776
1 parent dd5a99c
commit 3e3b776
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 3 deletions.
diff --git a/openbas-api/src/main/java/io/openbas/utils/pagination/SearchUtilsJpa.java b/openbas-api/src/main/java/io/openbas/utils/pagination/SearchUtilsJpa.java
@@ -24,6 +24,7 @@ private SearchUtilsJpa() {}
 
   @SuppressWarnings("unchecked")
   public static <T> Specification<T> computeSearchJpa(@Nullable final String search) {
+
     if (!hasText(search)) {
       return (Specification<T>) EMPTY_SPECIFICATION;
     }

diff --git a/openbas-framework/src/main/java/io/openbas/utils/FilterUtilsJpa.java b/openbas-framework/src/main/java/io/openbas/utils/FilterUtilsJpa.java
@@ -91,6 +91,31 @@ private static <T, U> Specification<T> computeFilter(
       }
       List<PropertySchema> filterableProperties = getFilterableProperties(propertySchemas);
       PropertySchema filterableProperty = retrieveProperty(filterableProperties, filterKey);
+
+      // multiple paths case
+      if (filterableProperty.getPaths().length > 1) {
+        List<Predicate> predicates = new ArrayList<>();
+        for (String path : filterableProperty.getPaths()) {
+          PropertySchema singlePathPropertySchema =
+              PropertySchema.builder()
+                  .name(filterableProperty.getName())
+                  .type(filterableProperty.getType())
+                  .path(path)
+                  .build();
+          Expression<U> paths = toPath(singlePathPropertySchema, root, joinMap);
+          predicates.add(
+              toPredicate(
+                  paths,
+                  filter,
+                  cb,
+                  filterableProperty.getJoinTable() != null
+                      ? String.class
+                      : filterableProperty.getType()));
+        }
+        return cb.or(predicates.toArray(Predicate[]::new));
+      }
+
+      // Single path or no path case
       Expression<U> paths = toPath(filterableProperty, root, joinMap);
       // In case of join table, we will use ID so type is String
       return toPredicate(

diff --git a/openbas-framework/src/main/java/io/openbas/utils/schema/PropertySchema.java b/openbas-framework/src/main/java/io/openbas/utils/schema/PropertySchema.java
@@ -34,6 +34,7 @@ public class PropertySchema {
 
   private final JoinTable joinTable;
   private final String path;
+  private final String[] paths;
 
   @Singular("propertySchema")
   private final List<PropertySchema> propertiesSchema;

diff --git a/openbas-framework/src/main/java/io/openbas/utils/schema/SchemaUtils.java b/openbas-framework/src/main/java/io/openbas/utils/schema/SchemaUtils.java
@@ -171,10 +171,11 @@ private static void processAnnotations(
             .filterable(queryable.filterable())
             .dynamicValues(queryable.dynamicValues())
             .sortable(queryable.sortable())
-            .path(queryable.path());
+            .path(queryable.path())
+            .paths(queryable.paths());
         if (member instanceof Method) {
           builder.type(queryable.clazz()); // Override
-        } else if (member instanceof Field && hasText(queryable.path())) {
+        } else if (hasText(queryable.path()) || queryable.paths().length > 0) {
           builder.type(queryable.clazz()); // Override
         }
       }

diff --git a/openbas-model/src/main/java/io/openbas/annotation/Queryable.java b/openbas-model/src/main/java/io/openbas/annotation/Queryable.java
@@ -18,5 +18,7 @@
 
   String path() default "";
 
+  String[] paths() default {};
+
   Class clazz() default String.class;
 }
diff --git a/openbas-model/src/main/java/io/openbas/database/model/Inject.java b/openbas-model/src/main/java/io/openbas/database/model/Inject.java
@@ -198,7 +198,9 @@ public class Inject implements Base, Injection {
       inverseJoinColumns = @JoinColumn(name = "asset_id"))
   @JsonSerialize(using = MultiIdListDeserializer.class)
   @JsonProperty("inject_assets")
-  @Queryable(filterable = true, path = "assets.name")
+  @Queryable(
+      filterable = true,
+      paths = {"assets.name", "assetGroups.assets.name"})
   private List<Asset> assets = new ArrayList<>();
 
   @ArraySchema(schema = @Schema(type = "string"))