#1552 #1557 Removed duplicate customFields when importing alert with …

…a caseTemplate
TheHive-Project · Nov 6, 2020 · 440f013 · 440f013
1 parent 0cdc56d
commit 440f013
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/thehive/app/org/thp/thehive/services/CaseSrv.scala b/thehive/app/org/thp/thehive/services/CaseSrv.scala
@@ -80,7 +80,10 @@ class CaseSrv @Inject() (
         caseTemplate
           .fold[Seq[RichCustomField]](Nil)(_.customFields)
           .map(cf => (cf.name, cf.value, cf.order))
-      cfs <- (caseTemplateCustomFields ++ customFields).toTry {
+      uniqueFields = caseTemplateCustomFields.filter {
+        case (name, _, _) => !customFields.map(c => c._1).contains(name)
+      }
+      cfs <- (uniqueFields ++ customFields).toTry {
         case (name, value, order) => createCustomField(createdCase, EntityIdOrName(name), value, order)
       }
       caseTemplateTags = caseTemplate.fold[Seq[Tag with Entity]](Nil)(_.tags)