#1766 getCasePatterns returns patterns instead of ids

TheHive-Project · Feb 15, 2021 · 7f32df8 · 7f32df8
1 parent 189868c
commit 7f32df8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v1/PatternCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/PatternCtrl.scala
@@ -90,8 +90,8 @@ class PatternCtrl @Inject() (
     entrypoint("get case patterns")
       .authRoTransaction(db) { implicit request => implicit graph =>
         for {
-          patternIds <- patternSrv.getCasePatterns(caseId)
-        } yield Results.Ok(patternIds.toJson)
+          patterns <- patternSrv.getCasePatterns(caseId)
+        } yield Results.Ok(patterns.toJson)
       }
 
   def delete(patternId: String): Action[AnyContent] =

diff --git a/thehive/app/org/thp/thehive/services/PatternSrv.scala b/thehive/app/org/thp/thehive/services/PatternSrv.scala
@@ -37,11 +37,10 @@ class PatternSrv @Inject() (
   override def getByName(name: String)(implicit graph: Graph): Traversal.V[Pattern] =
     Try(startTraversal.getByPatternId(name)).getOrElse(startTraversal.limit(0))
 
-  def getCasePatterns(caseId: String)(implicit graph: Graph): Try[Seq[String]] =
+  def getCasePatterns(caseId: String)(implicit graph: Graph): Try[Seq[RichPattern]] =
     for {
       caze <- caseSrv.get(EntityIdOrName(caseId)).getOrFail("Case")
-      patterns = caseSrv.get(caze).procedure.pattern.richPattern.toSeq
-    } yield patterns.map(_.patternId)
+    } yield caseSrv.get(caze).procedure.pattern.richPattern.toSeq
 
   def update(
       pattern: Pattern with Entity,

diff --git a/thehive/test/org/thp/thehive/controllers/v1/PatternCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v1/PatternCtrlTest.scala
@@ -94,7 +94,7 @@ class PatternCtrlTest extends PlaySpecification with TestAppBuilder {
       val result = app[PatternCtrl].getCasePatterns("1")(request)
       status(result) must beEqualTo(200).updateMessage(s => s"$s\n${contentAsString(result)}")
 
-      contentAsJson(result).as[JsArray].value.size must beEqualTo(2)
+      contentAsJson(result).as[Seq[OutputPattern]].size must beEqualTo(2)
     }
 
     "import & update a pattern" in testApp { app =>