From af4ab4227aec96d44f18765a9e34278c5e353011 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Mon, 7 Feb 2022 10:15:35 +0100
Subject: [PATCH] #2324 Remove observables with empty data

---
 .../thehive/controllers/v0/ObservableCtrl.scala  | 16 ++++++++++++++--
 .../thehive/controllers/v1/ObservableCtrl.scala  | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
index 3fb6f18815..be48165643 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
@@ -81,7 +81,13 @@ class ObservableCtrl @Inject() (
                     .flatMap(obs => obs.attachment.map(createAttachmentObservableInCase(case0, obs, _)))
                 else
                   inputAttachObs
-                    .flatMap(obs => obs.data.map(createSimpleObservableInCase(case0, obs, _)))
+                    .flatMap(obs =>
+                      obs
+                        .data
+                        .filter(_.exists(_ != ' '))
+                        .filterNot(_.isEmpty)
+                        .map(createSimpleObservableInCase(case0, obs, _))
+                    )
               val (successes, failures) = successesAndFailures
                 .foldLeft[(Seq[JsValue], Seq[JsValue])]((Nil, Nil)) {
                   case ((s, f), Right(o)) => (s :+ o, f)
@@ -162,7 +168,13 @@ class ObservableCtrl @Inject() (
                     }
                 else
                   inputAttachObs
-                    .flatMap(obs => obs.data.map(createSimpleObservableInAlert(alert, obs, _)))
+                    .flatMap(obs =>
+                      obs
+                        .data
+                        .filter(_.exists(_ != ' '))
+                        .filterNot(_.isEmpty)
+                        .map(createSimpleObservableInAlert(alert, obs, _))
+                    )
               val (successes, failures) = successesAndFailures
                 .foldLeft[(Seq[JsValue], Seq[JsValue])]((Nil, Nil)) {
                   case ((s, f), Right(o)) => (s :+ o, f)
diff --git a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
index 1c9c6141b4..8afa023441 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
@@ -138,7 +138,13 @@ class ObservableCtrl @Inject() (
                     .flatMap(obs => obs.attachment.map(createAttachmentObservableInCase(case0, obs, _)))
                 else
                   inputAttachObs
-                    .flatMap(obs => obs.data.map(createSimpleObservableInCase(case0, obs, _)))
+                    .flatMap(obs =>
+                      obs
+                        .data
+                        .filter(_.exists(_ != ' '))
+                        .filterNot(_.isEmpty)
+                        .map(createSimpleObservableInCase(case0, obs, _))
+                    )
               val (successes, failures) = successesAndFailures
                 .foldLeft[(Seq[JsValue], Seq[JsValue])]((Nil, Nil)) {
                   case ((s, f), Right(o)) => (s :+ o, f)
@@ -219,7 +225,13 @@ class ObservableCtrl @Inject() (
                     }
                 else
                   inputAttachObs
-                    .flatMap(obs => obs.data.map(createSimpleObservableInAlert(alert, obs, _)))
+                    .flatMap(obs =>
+                      obs
+                        .data
+                        .filter(_.exists(_ != ' '))
+                        .filterNot(_.isEmpty)
+                        .map(createSimpleObservableInAlert(alert, obs, _))
+                    )
               val (successes, failures) = successesAndFailures
                 .foldLeft[(Seq[JsValue], Seq[JsValue])]((Nil, Nil)) {
                   case ((s, f), Right(o)) => (s :+ o, f)