#331 Fix custom fields in merged cases

TheHive-Project · Oct 11, 2017 · 9472d0f · 9472d0f
1 parent c45d64c
commit 9472d0f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/thehive-backend/app/services/CaseMergeSrv.scala b/thehive-backend/app/services/CaseMergeSrv.scala
@@ -123,12 +123,12 @@ class CaseMergeSrv @Inject() (
       customFieldsObject ← caze.customFields().asOpt[JsObject]
     } yield customFieldsObject
 
-    val mergedCustomFieldsObject: Seq[(String, JsValue)] = customFields.flatMap(_.keys).distinct.map { key ⇒
+    val mergedCustomFieldsObject: Seq[(String, JsValue)] = customFields.flatMap(_.keys).distinct.flatMap { key ⇒
       val customFieldsValues = customFields.flatMap(cf ⇒ (cf \ key).asOpt[JsObject]).distinct
       if (customFieldsValues.size != 1)
-        key → JsNull
+        None
       else
-        key → customFieldsValues.head
+        Some(key → customFieldsValues.head)
     }
 
     JsObject(mergedCustomFieldsObject)