Skip to content

Commit cca0d05

Browse files
committed
#14 Fix summary in duplicate cases (its value is optional)
1 parent 95c34e7 commit cca0d05

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

thehive-backend/app/services/CaseMergeSrv.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,13 @@ class CaseMergeSrv @Inject() (caseSrv: CaseSrv,
250250

251251
def markCaseAsDuplicated(cases: Seq[Case], mergeCase: Case)(implicit authContext: AuthContext): Future[Done] = {
252252
Future.traverse(cases) { caze
253+
val s = s"Merge into : ${mergeCase.title()} ([#${mergeCase.caseId()}](#/case/${mergeCase.id}/details))"
254+
val summary = caze.summary().fold(s)(_ + s"\n\n$s")
253255
caseSrv.update(caze.id, Fields.empty
254256
.set("mergeInto", mergeCase.id)
255257
.set("status", CaseStatus.Resolved.toString)
256258
.set("resolutionStatus", CaseResolutionStatus.Duplicated.toString)
257-
.set("summary", s"${caze.summary()}\n\nMerge into : ${mergeCase.title()} ([#${mergeCase.caseId()}](#/case/${mergeCase.id}/details))"))
259+
.set("summary", summary))
258260
}
259261
.map(_ Done)
260262
.recover {

0 commit comments

Comments
 (0)