From 6dee5552e6c185430012bda2c970abf0be91916d Mon Sep 17 00:00:00 2001 From: To-om Date: Thu, 7 Jan 2021 08:43:46 +0100 Subject: [PATCH] #1732 Add alert import date in extraData --- .../controllers/v1/AlertRenderer.scala | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/thehive/app/org/thp/thehive/controllers/v1/AlertRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/AlertRenderer.scala index ac257b06e7..935796ad4e 100644 --- a/thehive/app/org/thp/thehive/controllers/v1/AlertRenderer.scala +++ b/thehive/app/org/thp/thehive/controllers/v1/AlertRenderer.scala @@ -1,7 +1,6 @@ package org.thp.thehive.controllers.v1 -import java.util.{List => JList, Map => JMap} - +import java.util.{Date, List => JList, Map => JMap} import org.thp.scalligraph.auth.AuthContext import org.thp.scalligraph.traversal.TraversalOps._ import org.thp.scalligraph.traversal.{Converter, Traversal} @@ -39,12 +38,20 @@ trait AlertRenderer extends BaseRenderer[Alert] { _.similarCases(None).fold.domainMap(sc => JsArray(sc.sorted.map(Json.toJson(_)))) } - def alertStatsRenderer(extraData: Set[String])( - implicit authContext: AuthContext + def importDate: Traversal.V[Alert] => Traversal[JsValue, JList[Date], Converter[JsValue, JList[Date]]] = + _.importDate.fold.domainMap(_.headOption.fold[JsValue](JsNull)(d => JsNumber(d.getTime))) + + def alertStatsRenderer(extraData: Set[String])(implicit + authContext: AuthContext ): Traversal.V[Alert] => JsTraversal = { implicit traversal => - baseRenderer(extraData, traversal, { - case (f, "similarCases") => addData("similarCases", f)(similarCasesStats) - case (f, _) => f - }) + baseRenderer( + extraData, + traversal, + { + case (f, "similarCases") => addData("similarCases", f)(similarCasesStats) + case (f, "importDate") => addData("importDate", f)(importDate) + case (f, _) => f + } + ) } }