From 506e9a0c36f261a52f33102911cebcecd36722c6 Mon Sep 17 00:00:00 2001 From: eikek Date: Wed, 8 Sep 2021 22:29:34 +0200 Subject: [PATCH] Move sent mails when merging items Fixes: 1055 --- .../main/scala/docspell/backend/item/Merge.scala | 14 ++++++++++---- .../docspell/store/records/RSentMailItem.scala | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/backend/src/main/scala/docspell/backend/item/Merge.scala b/modules/backend/src/main/scala/docspell/backend/item/Merge.scala index c66c7c0f..82067778 100644 --- a/modules/backend/src/main/scala/docspell/backend/item/Merge.scala +++ b/modules/backend/src/main/scala/docspell/backend/item/Merge.scala @@ -17,10 +17,7 @@ import docspell.common._ import docspell.store.Store import docspell.store.queries.QCustomField import docspell.store.queries.QCustomField.FieldValue -import docspell.store.records.RAttachment -import docspell.store.records.RCustomField -import docspell.store.records.RItem -import docspell.store.records.RTagItem +import docspell.store.records._ trait Merge[F[_]] { def merge(items: NonEmptyList[Ident], collective: Ident): F[Merge.Result[RItem]] @@ -52,6 +49,7 @@ object Merge { _ <- EitherT.right[Error](moveTags(ids)) _ <- EitherT.right[Error](moveCustomFields(ids)) _ <- EitherT.right[Error](moveAttachments(ids)) + _ <- EitherT.right[Error](moveSentMails(ids)) _ <- EitherT.right[Error]( createIndex .reIndexData(logger, collective.some, NonEmptyList.one(ids.head).some, 50) @@ -109,6 +107,14 @@ object Merge { store.transact(RCustomField.setValue(fv.field, items.head, fv.value)) ) } yield () + + def moveSentMails(items: NonEmptyList[Ident]): F[Int] = + NonEmptyList.fromList(items.tail) match { + case Some(others) => + store.transact(RSentMailItem.moveToItem(items.head, others)) + case None => + 0.pure[F] + } } private def mergeFields( diff --git a/modules/store/src/main/scala/docspell/store/records/RSentMailItem.scala b/modules/store/src/main/scala/docspell/store/records/RSentMailItem.scala index 128251de..b29e3307 100644 --- a/modules/store/src/main/scala/docspell/store/records/RSentMailItem.scala +++ b/modules/store/src/main/scala/docspell/store/records/RSentMailItem.scala @@ -71,4 +71,7 @@ object RSentMailItem { def deleteAllByItem(item: Ident): ConnectionIO[Int] = DML.delete(T, T.itemId === item) + + def moveToItem(target: Ident, others: NonEmptyList[Ident]): ConnectionIO[Int] = + DML.update(T, T.itemId.in(others), DML.set(T.itemId.setTo(target))) }