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

Merge pull request #1329 from eikek/fix/periodic-query-scope

Browse Source 
Fix query in periodic query task
This commit is contained in:
mergify[bot]
2022-01-29 18:04:10 +00:00
committed by GitHub
parent f23d19afb8 9a516d95c8
commit 151646bba2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/joex/src/main/scala/docspell/joex/notify/PeriodicQueryTask.scala
View File

@ -19,6 +19,7 @@ import docspell.notification.api.EventContext
import docspell.notification.api.NotificationChannel import docspell.notification.api.NotificationChannel
import docspell.notification.api.PeriodicQueryArgs import docspell.notification.api.PeriodicQueryArgs
import docspell.query.ItemQuery import docspell.query.ItemQuery
import docspell.query.ItemQuery.Expr
import docspell.query.ItemQuery.Expr.AndExpr import docspell.query.ItemQuery.Expr.AndExpr
import docspell.query.ItemQueryParser import docspell.query.ItemQueryParser
import docspell.store.qb.Batch import docspell.store.qb.Batch
@ -81,7 +82,11 @@ object PeriodicQueryTask {
ItemQueryParser.parse(str) match { ItemQueryParser.parse(str) match {
case Right(q) => case Right(q) =>
val expr = bm.map(b => AndExpr(Nel.of(b.expr, q.expr))).getOrElse(q.expr) val expr = bm.map(b => AndExpr(Nel.of(b.expr, q.expr))).getOrElse(q.expr)
val query = Query(Query.Fix(ctx.args.account, Some(expr), None)) val query = Query
.all(ctx.args.account)
.withFix(_.copy(query = Expr.ValidItemStates.some))
.withCond(_ => Query.QueryExpr(expr))
ctx.logger.debug(s"Running query: ${queryString(expr)}") *> cont(query) ctx.logger.debug(s"Running query: ${queryString(expr)}") *> cont(query)
case Left(err) => case Left(err) =>