From 74a037887def2f88b9188a2ccb8abd2915dad1a4 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 22 Feb 2020 00:49:03 +0100 Subject: [PATCH] Fix deleting items and attachments to also remove the binary files --- .../docspell/store/queries/QAttachment.scala | 16 ++++++++-------- .../store/records/RAttachmentSource.scala | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/store/src/main/scala/docspell/store/queries/QAttachment.scala b/modules/store/src/main/scala/docspell/store/queries/QAttachment.scala index 9a652df0..a738c8b1 100644 --- a/modules/store/src/main/scala/docspell/store/queries/QAttachment.scala +++ b/modules/store/src/main/scala/docspell/store/queries/QAttachment.scala @@ -8,22 +8,22 @@ import doobie.implicits._ import docspell.common.{Ident, MetaProposalList} import docspell.store.Store import docspell.store.impl.Implicits._ -import docspell.store.records.{RAttachment, RAttachmentMeta, RItem} +import docspell.store.records.{RAttachment, RAttachmentMeta, RAttachmentSource, RItem} object QAttachment { def deleteById[F[_]: Sync](store: Store[F])(attachId: Ident, coll: Ident): F[Int] = for { - raOpt <- store.transact(RAttachment.findByIdAndCollective(attachId, coll)) - n <- raOpt.traverse(_ => store.transact(RAttachment.delete(attachId))) - f <- Stream - .emit(raOpt) - .unNoneTerminate - .map(_.fileId.id) + raFile <- store.transact(RAttachment.findByIdAndCollective(attachId, coll)).map(_.map(_.fileId)) + rsFile <- store.transact(RAttachmentSource.findById(attachId)).map(_.map(_.fileId)) + n <- store.transact(RAttachment.delete(attachId)) + f <- Stream.emits(raFile.toSeq ++ rsFile.toSeq) + .map(_.id) .flatMap(store.bitpeace.delete) + .map(flag => if (flag) 1 else 0) .compile .last - } yield n.getOrElse(0) + f.map(_ => 1).getOrElse(0) + } yield n + f.getOrElse(0) def deleteAttachment[F[_]: Sync](store: Store[F])(ra: RAttachment): F[Int] = for { diff --git a/modules/store/src/main/scala/docspell/store/records/RAttachmentSource.scala b/modules/store/src/main/scala/docspell/store/records/RAttachmentSource.scala index 91d70e44..e15a7a2f 100644 --- a/modules/store/src/main/scala/docspell/store/records/RAttachmentSource.scala +++ b/modules/store/src/main/scala/docspell/store/records/RAttachmentSource.scala @@ -59,4 +59,6 @@ object RAttachmentSource { selectSimple(all.map(_.prefix("a")), from, where).query[RAttachmentSource].option } + + }