Merge pull request #532 from eikek/fk-on-delete-bug

Fk on delete bug

modules/backend/src/main/scala/docspell/backend/ops/OItemSearch.scala

@@ -258,12 +258,12 @@ object OItemSearch {
         store.transact(QAttachment.getAttachmentMeta(id, collective))
 
       def findByFileCollective(checksum: String, collective: Ident): F[Vector[RItem]] =
-        store.transact(QItem.findByChecksum(checksum, collective))
+        store.transact(QItem.findByChecksum(checksum, collective, Set.empty))
 
       def findByFileSource(checksum: String, sourceId: Ident): F[Vector[RItem]] =
         store.transact((for {
           coll  <- OptionT(RSource.findCollective(sourceId))
-          items <- OptionT.liftF(QItem.findByChecksum(checksum, coll))
+          items <- OptionT.liftF(QItem.findByChecksum(checksum, coll, Set.empty))
         } yield items).getOrElse(Vector.empty))
 
     })

modules/joex/src/main/scala/docspell/joex/process/DuplicateCheck.scala

@@ -63,10 +63,12 @@ object DuplicateCheck {
 
   private def checkDuplicate[F[_]](
       ctx: Context[F, Args]
-  )(fm: FileMeta): ConnectionIO[FileMetaDupes] =
+  )(fm: FileMeta): ConnectionIO[FileMetaDupes] = {
+    val excludes = ctx.args.files.map(_.fileMetaId).toSet
     QItem
-      .findByChecksum(fm.checksum, ctx.args.meta.collective)
+      .findByChecksum(fm.checksum, ctx.args.meta.collective, excludes)
       .map(v => FileMetaDupes(fm, v.nonEmpty))
+  }
 
   case class FileMetaDupes(fm: FileMeta, exists: Boolean)
 }

modules/joex/src/main/scala/docspell/joex/process/ItemHandler.scala

@@ -35,18 +35,20 @@ object ItemHandler {
       analyser: TextAnalyser[F],
       regexNer: RegexNerFile[F]
   ): Task[F, Args, Unit] =
-    DuplicateCheck[F]
-      .flatMap(args =>
-        if (args.files.isEmpty) logNoFiles
-        else {
-          val create: Task[F, Args, ItemData] =
-            CreateItem[F].contramap(_ => args.pure[F])
-          create
-            .flatMap(itemStateTask(ItemState.Processing))
-            .flatMap(safeProcess[F](cfg, itemOps, fts, analyser, regexNer))
-            .map(_ => ())
-        }
-      )
+    logBeginning.flatMap(_ =>
+      DuplicateCheck[F]
+        .flatMap(args =>
+          if (args.files.isEmpty) logNoFiles
+          else {
+            val create: Task[F, Args, ItemData] =
+              CreateItem[F].contramap(_ => args.pure[F])
+            create
+              .flatMap(itemStateTask(ItemState.Processing))
+              .flatMap(safeProcess[F](cfg, itemOps, fts, analyser, regexNer))
+              .map(_ => ())
+          }
+        )
+    )
 
   def itemStateTask[F[_]: Sync, A](
       state: ItemState
@@ -131,11 +133,16 @@ object ItemHandler {
     )
 
   private def logWarn[F[_]](msg: => String): Task[F, Args, Unit] =
-    Task(_.logger.warn(msg))
+    Task.log(_.warn(msg))
 
   private def logNoFiles[F[_]]: Task[F, Args, Unit] =
     logWarn(
       "No files to process! Either no files were given or duplicate check removed all."
     )
 
+  private def logBeginning[F[_]]: Task[F, Args, Unit] =
+    Task { ctx =>
+      val files = ctx.args.files.flatMap(_.name).mkString(", ")
+      ctx.logger.info(s"============ Start processing $files ============")
+    }
 }

modules/store/src/main/scala/docspell/store/queries/QItem.scala

@@ -454,7 +454,7 @@ object QItem {
       (a.fileId.in(fileMetaIds) ||
         s.fileId.in(fileMetaIds) ||
         r.fileId.in(fileMetaIds)) &&? states.map(nel => i.state.in(nel))
-    )
+    ).distinct
   }
 
   def findOneByFileIds(fileMetaIds: Seq[Ident]): ConnectionIO[Option[RItem]] =
@@ -476,7 +476,11 @@ object QItem {
         Vector.empty[RItem].pure[ConnectionIO]
     }
 
-  def findByChecksum(checksum: String, collective: Ident): ConnectionIO[Vector[RItem]] = {
+  def findByChecksum(
+      checksum: String,
+      collective: Ident,
+      excludeFileMeta: Set[Ident]
+  ): ConnectionIO[Vector[RItem]] = {
     val m1 = RFileMeta.as("m1")
     val m2 = RFileMeta.as("m2")
     val m3 = RFileMeta.as("m3")
@@ -496,9 +500,12 @@ object QItem {
         .leftJoin(m3, m3.id === r.fileId),
       where(
         i.cid === collective &&
-          (m1.checksum === checksum || m2.checksum === checksum || m3.checksum === checksum)
+          (m1.checksum === checksum || m2.checksum === checksum || m3.checksum === checksum) &&?
+          Nel
+            .fromList(excludeFileMeta.toList)
+            .map(excl => m1.id.notIn(excl) && m2.id.notIn(excl) && m3.id.notIn(excl))
       )
-    ).build.query[RItem].to[Vector]
+    ).distinct.build.query[RItem].to[Vector]
   }
 
   final case class NameAndNotes(