#62 Remove deleted observable when searching related cases

TheHive-Project · Dec 13, 2016 · 85eaeb0 · 85eaeb0
1 parent e2cf4ad
commit 85eaeb0
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/thehive-backend/app/services/CaseSrv.scala b/thehive-backend/app/services/CaseSrv.scala
@@ -77,7 +77,14 @@ class CaseSrv @Inject() (
 
   def linkedCases(id: String): Source[(Case, Seq[Artifact]), NotUsed] = {
     import org.elastic4play.services.QueryDSL._
-    findSrv[ArtifactModel, Artifact](artifactModel, parent("case", and(withId(id), "status" ~!= CaseStatus.Deleted, "resolutionStatus" ~!= CaseResolutionStatus.Duplicated)), Some("all"), Nil)
+    findSrv[ArtifactModel, Artifact](
+      artifactModel,
+      and(
+        parent("case", and(
+          withId(id),
+          "status" ~!= CaseStatus.Deleted,
+          "resolutionStatus" ~!= CaseResolutionStatus.Duplicated)),
+        "status" ~= "Ok"), Some("all"), Nil)
       ._1
       .flatMapConcat { artifact ⇒ artifactSrv.findSimilar(artifact, Some("all"), Nil)._1 }
       .groupBy(20, _.parentId)