#1946 Add countImportedAlert and ignore canceled task in countTask

TheHive-Project · Apr 10, 2021 · 9b29358 · 9b29358
1 parent d34b083
commit 9b29358
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala
@@ -66,6 +66,13 @@ class AlertCtrl @Inject() (
       (graph, authContext) =>
         graph.indexCountQuery(s"""v."_label":Alert AND v.organisationId:${organisationSrv.currentId(graph, authContext).value} AND v.read:false""")
     ),
+    Query.init[Long](
+      "countImportedAlert",
+      (graph, authContext) =>
+        graph.indexCountQuery(
+          s"""v."_label":Alert AND v.organisationId:${organisationSrv.currentId(graph, authContext).value} AND NOT v.caseId:[* TO 'ZZZZZZZZ']"""
+        )
+    ),
     Query[Traversal.V[Alert], Traversal.V[Observable]]("observables", (alertSteps, _) => alertSteps.observables),
     Query[Traversal.V[Alert], Traversal.V[Case]]("case", (alertSteps, _) => alertSteps.`case`),
     Query.withParam[Option[InputQuery[Traversal.Unk, Traversal.Unk]], Traversal.V[Alert], Traversal[

diff --git a/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala
@@ -57,7 +57,10 @@ class TaskCtrl @Inject() (
       "countTask",
       (inCase, graph, authContext) =>
         graph.indexCountQuery(
-          s"""v."_label":Task AND relatedId:${inCase.caseId.value} AND organisationIds:${organisationSrv.currentId(graph, authContext).value}"""
+          s"""v."_label":Task AND """ +
+            "v.relatedId:${inCase.caseId.value} AND " +
+            "v.organisationIds:${organisationSrv.currentId(graph, authContext).value} AND " +
+            "NOT v.status:Cancel"
         )
     ),
     Query.init[Traversal.V[Task]](