TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1292 from eikek/fix/update-bookmark

Browse Source 
Fix personal/non-personal when updating bookmarks
This commit is contained in:
mergify[bot] 2022-01-15 23:49:05 +00:00 committed by GitHub
commit ace9105ed1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/backend/src/main/scala/docspell/backend/ops/OQueryBookmarks.scala
View File

@ -6,6 +6,7 @@
package docspell.backend.ops package docspell.backend.ops
import cats.data.OptionT
import cats.effect._ import cats.effect._
import cats.implicits._ import cats.implicits._
@ -14,7 +15,7 @@ import docspell.query.ItemQuery
import docspell.store.AddResult import docspell.store.AddResult
import docspell.store.Store import docspell.store.Store
import docspell.store.UpdateResult import docspell.store.UpdateResult
import docspell.store.records.RQueryBookmark import docspell.store.records._
trait OQueryBookmarks[F[_]] { trait OQueryBookmarks[F[_]] {
@ -73,7 +74,14 @@ object OQueryBookmarks {
def update(account: AccountId, id: Ident, b: NewBookmark): F[UpdateResult] = def update(account: AccountId, id: Ident, b: NewBookmark): F[UpdateResult] =
UpdateResult.fromUpdate( UpdateResult.fromUpdate(
store.transact(RQueryBookmark.update(convert.toRecord(account, id, b))) store.transact {
(for {
userId <- OptionT(RUser.findIdByAccount(account))
n <- OptionT.liftF(
RQueryBookmark.update(convert.toRecord(account, id, userId, b))
)
} yield n).getOrElse(0)
}
) )
def delete(account: AccountId, bookmark: Ident): F[Unit] = def delete(account: AccountId, bookmark: Ident): F[Unit] =
@ -85,12 +93,17 @@ object OQueryBookmarks {
def toModel(r: RQueryBookmark): Bookmark = def toModel(r: RQueryBookmark): Bookmark =
Bookmark(r.id, r.name, r.label, r.query, r.isPersonal, r.created) Bookmark(r.id, r.name, r.label, r.query, r.isPersonal, r.created)
def toRecord(account: AccountId, id: Ident, b: NewBookmark): RQueryBookmark = def toRecord(
account: AccountId,
id: Ident,
userId: Ident,
b: NewBookmark
): RQueryBookmark =
RQueryBookmark( RQueryBookmark(
id, id,
b.name, b.name,
b.label, b.label,
None, // userId and some other values are not used if (b.personal) userId.some else None,
account.collective, account.collective,
b.query, b.query,
Timestamp.Epoch Timestamp.Epoch

12
modules/store/src/main/scala/docspell/store/records/RQueryBookmark.scala
View File

@ -95,7 +95,8 @@ object RQueryBookmark {
DML.set( DML.set(
T.name.setTo(r.name), T.name.setTo(r.name),
T.label.setTo(r.label), T.label.setTo(r.label),
T.query.setTo(r.query) T.query.setTo(r.query),
T.userId.setTo(r.userId)
) )
) )
@ -119,9 +120,12 @@ object RQueryBookmark {
).build.query[Int].unique.map(_ > 0) ).build.query[Int].unique.map(_ > 0)
} }
// impl note: store.add doesn't work, because it checks for duplicate // impl note: store.add doesn't work, because it checks for
// after trying to insert the check is necessary because a name // duplicate after trying to insert. the check is necessary because
// should be unique across personal *and* collective bookmarks // a name should be unique across personal *and* collective
// bookmarks, which is not covered by db indexes. This is now
// checked before (and therefore subject to race conditions, but is
// neglected here)
def insertIfNotExists( def insertIfNotExists(
account: AccountId, account: AccountId,
r: ConnectionIO[RQueryBookmark] r: ConnectionIO[RQueryBookmark]