#1264 Fixed procedure rendering

TheHive-Project · Mar 3, 2021 · be9fc12 · be9fc12
1 parent 5ef6cdc
commit be9fc12
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v1/ProcedureRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/ProcedureRenderer.scala
@@ -1,20 +1,21 @@
 package org.thp.thehive.controllers.v1
 
+import org.thp.scalligraph.traversal.TraversalOps.TraversalOpsDefs
 import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models.Procedure
 import org.thp.thehive.services.PatternOps._
 import org.thp.thehive.services.ProcedureOps._
-import play.api.libs.json.JsValue
+import play.api.libs.json.{JsNull, JsValue}
 
-import java.util.{Map => JMap}
+import java.util.{List => JList, Map => JMap}
 
 trait ProcedureRenderer extends BaseRenderer[Procedure] {
   def patternStats: Traversal.V[Procedure] => Traversal[JsValue, JMap[String, Any], Converter[JsValue, JMap[String, Any]]] =
     _.pattern.richPattern.domainMap(_.toJson)
 
-  def patternParentStats: Traversal.V[Procedure] => Traversal[JsValue, JMap[String, Any], Converter[JsValue, JMap[String, Any]]] =
-    _.pattern.parent.richPattern.domainMap(_.toJson)
+  def patternParentStats: Traversal.V[Procedure] => Traversal[JsValue, JList[JMap[String, Any]], Converter[JsValue, JList[JMap[String, Any]]]] =
+    _.pattern.parent.richPattern.fold.domainMap(_.headOption.fold[JsValue](JsNull)(_.toJson))
 
   def procedureStatsRenderer(extraData: Set[String]): Traversal.V[Procedure] => JsTraversal = { implicit traversal =>
     baseRenderer(