TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix item merge when merging tags and text fields

Browse Source 
Also hard delete the remaining items. They are empty (have no
attachments), because data is moved if possible. Doesn't make much
sense to keep them, because restoring them isn't much useful.
This commit is contained in:
eikek
2021-08-16 13:18:47 +02:00
parent 8099b78b0e
commit a923351b09
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/backend/src/main/scala/docspell/backend/item/Merge.scala
View File

@ -58,7 +58,7 @@ object Merge {
) )
_ <- EitherT.right[Error]( _ <- EitherT.right[Error](
NonEmptyList.fromList(items.tail.map(_.id)) match { NonEmptyList.fromList(items.tail.map(_.id)) match {
case Some(nel) => itemOps.setDeletedState(nel, collective) case Some(nel) => itemOps.deleteItemMultiple(nel, collective)
case None => 0.pure[F] case None => 0.pure[F]
} }
) )
@ -146,7 +146,7 @@ object Merge {
case CustomFieldType.Text => case CustomFieldType.Text =>
val text = fields.toList val text = fields.toList
.map(fv => CustomFieldType.Text.parseValue(fv.value).toOption) .flatMap(fv => CustomFieldType.Text.parseValue(fv.value).toOption)
.mkString(", ") .mkString(", ")
fields.head.copy(value = CustomFieldType.Text.valueString(text)) fields.head.copy(value = CustomFieldType.Text.valueString(text))
} }

17
modules/store/src/main/scala/docspell/store/records/RTagItem.scala
View File

@ -34,8 +34,21 @@ object RTagItem {
def insert(v: RTagItem): ConnectionIO[Int] = def insert(v: RTagItem): ConnectionIO[Int] =
DML.insert(T, T.all, fr"${v.tagItemId},${v.itemId},${v.tagId}") DML.insert(T, T.all, fr"${v.tagItemId},${v.itemId},${v.tagId}")
def moveTags(from: Ident, to: Ident): ConnectionIO[Int] = def moveTags(fromItem: Ident, toItem: Ident): ConnectionIO[Int] =
DML.update(T, T.itemId === from, DML.set(T.itemId.setTo(to))) for {
both <- intersect(
Select(select(T.tagId), from(T), T.itemId === fromItem).distinct,
Select(select(T.tagId), from(T), T.itemId === toItem).distinct
).build
.query[Ident]
.to[List]
skipIds = NonEmptyList.fromList(both)
n <- DML.update(
T,
T.itemId === fromItem &&? skipIds.map(ids => T.tagId.notIn(ids)),
DML.set(T.itemId.setTo(toItem))
)
} yield n
def deleteItemTags(item: Ident): ConnectionIO[Int] = def deleteItemTags(item: Ident): ConnectionIO[Int] =
DML.delete(T, T.itemId === item) DML.delete(T, T.itemId === item)