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

Allow bookmarks in periodic query notification

Browse Source
This commit is contained in:
eikek
2022-01-10 14:25:20 +01:00
parent ccb4df5bd7
commit 699cf091e6
19 changed files with 497 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/restserver/src/main/scala/docspell/restserver/routes/PeriodicQueryRoutes.scala
View File

@ -117,11 +117,20 @@ object PeriodicQueryRoutes extends MailAddressCodec {
Sync[F]
.pure(for {
ch <- NotificationChannel.convert(settings.channel)
qstr <- ItemQueryParser
.asString(settings.query.expr)
.left
.map(err => new IllegalArgumentException(s"Query not renderable: $err"))
} yield (ch, ItemQueryString(qstr)))
qstr <- settings.query match {
case Some(q) =>
ItemQueryParser
.asString(q.expr)
.left
.map(err => new IllegalArgumentException(s"Query not renderable: $err"))
.map(Option.apply)
case None =>
Right(None)
}
_ <-
if (qstr.nonEmpty || settings.bookmark.nonEmpty) Right(())
else Left(new IllegalArgumentException("No query or bookmark provided"))
} yield (ch, qstr.map(ItemQueryString.apply)))
.rethrow
.map { case (channel, qstr) =>
UserTask(
@ -134,6 +143,7 @@ object PeriodicQueryRoutes extends MailAddressCodec {
user,
Right(channel),
qstr,
settings.bookmark,
Some(baseUrl / "app" / "item")
)
)
@ -155,7 +165,8 @@ object PeriodicQueryRoutes extends MailAddressCodec {
task.summary,
task.enabled,
ch,
ItemQueryParser.parseUnsafe(task.args.query.query),
task.args.query.map(_.query).map(ItemQueryParser.parseUnsafe),
task.args.bookmark,
task.timer
)
}