#1718 Fix duplication checks when creating an observable

TheHive-Project · Dec 21, 2020 · 5b1af82 · 5b1af82
1 parent 0505275
commit 5b1af82
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/thehive/app/org/thp/thehive/services/CaseSrv.scala b/thehive/app/org/thp/thehive/services/CaseSrv.scala
@@ -176,18 +176,8 @@ class CaseSrv @Inject() (
       authContext: AuthContext
   ): Try[Unit] = {
     val alreadyExistInThatCase = richObservable
-      .dataOrAttachment
-      .fold(
-        _ =>
-          observableSrv
-            .get(richObservable.observable)
-            .filteredSimilar
-            .visible
-            .`case`
-            .hasId(`case`._id)
-            .exists,
-        attachment => get(`case`).share.observables.attachments.has(_.attachmentId, attachment.attachmentId).exists
-      ) || get(`case`).observables.filter(_.hasId(richObservable.observable._id)).exists
+      .data
+      .fold(false)(data => get(`case`).observables.data.has(_.data, data.data).exists)
 
     if (alreadyExistInThatCase)
       Failure(CreateError("Observable already exists"))