From 9b293588f92a7ade66f6535dcb2dddcda31cfb4b Mon Sep 17 00:00:00 2001 From: To-om Date: Sat, 10 Apr 2021 18:30:56 +0200 Subject: [PATCH] #1946 Add countImportedAlert and ignore canceled task in countTask --- thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala | 7 +++++++ thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala index 90d7462dc3..eb1a15a69b 100644 --- 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 index c99aa1f038..08902e7c12 100644 --- 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]](