#1449 Add filter in aggregation

TheHive-Project · Jul 23, 2020 · b422527 · b422527
1 parent 52cb919
commit b422527
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala
@@ -95,7 +95,7 @@ class QueryCtrl(entrypoint: Entrypoint, @Named("with-thehive-schema") db: Databa
           .map(inputFilter => filterQuery.toQuery(inputFilter))
           .fold(ctrl.initialQuery)(ctrl.initialQuery.andThen)
         groupAggs <- aggregationParser.sequence(field.get("stats"))
-      } yield groupAggs.map(a => filteredQuery andThen new AggregationQuery(publicProperties).toQuery(a))
+      } yield groupAggs.map(a => filteredQuery andThen new AggregationQuery(db, publicProperties, queryExecutor.filterQuery).toQuery(a))
   }
 
   val searchParser: FieldsParser[Query] = FieldsParser[Query]("search") {
+89 −73		core/src/main/scala/org/thp/scalligraph/query/Aggregation.scala
+4 −2		core/src/main/scala/org/thp/scalligraph/query/Query.scala
+1 −1		core/src/main/scala/org/thp/scalligraph/query/QueryExecutor.scala