#14 Fix summary in duplicate cases (its value is optional)

TheHive-Project · Nov 20, 2016 · cca0d05 · cca0d05
1 parent 95c34e7
commit cca0d05
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/thehive-backend/app/services/CaseMergeSrv.scala b/thehive-backend/app/services/CaseMergeSrv.scala
@@ -250,11 +250,13 @@ class CaseMergeSrv @Inject() (caseSrv: CaseSrv,
 
   def markCaseAsDuplicated(cases: Seq[Case], mergeCase: Case)(implicit authContext: AuthContext): Future[Done] = {
     Future.traverse(cases) { caze ⇒
+      val s = s"Merge into : ${mergeCase.title()} ([#${mergeCase.caseId()}](#/case/${mergeCase.id}/details))"
+      val summary = caze.summary().fold(s)(_ + s"\n\n$s")
       caseSrv.update(caze.id, Fields.empty
         .set("mergeInto", mergeCase.id)
         .set("status", CaseStatus.Resolved.toString)
         .set("resolutionStatus", CaseResolutionStatus.Duplicated.toString)
-        .set("summary", s"${caze.summary()}\n\nMerge into : ${mergeCase.title()} ([#${mergeCase.caseId()}](#/case/${mergeCase.id}/details))"))
+        .set("summary", summary))
     }
       .map(_ ⇒ Done)
       .recover {