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

Allow to use the created timestamp in item queries

Browse Source 
Refs: 925
This commit is contained in:
eikek
2021-07-27 17:33:13 +02:00
parent ba3e2ae5fd
commit 15b15666bf
7 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala
View File

@ -53,6 +53,7 @@ object ItemQuery {
case object ItemId extends StringAttr
case object Date extends DateAttr
case object DueDate extends DateAttr
case object CreatedDate extends DateAttr
case object AttachCount extends IntAttr
object Correspondent {

5
modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala
View File

@ -31,6 +31,9 @@ object AttrParser {
val dueDate: P[Attr.DateAttr] =
P.ignoreCase(C.due).as(Attr.DueDate)
val created: P[Attr.DateAttr] =
P.ignoreCase(C.created).as(Attr.CreatedDate)
val corrOrgId: P[Attr.StringAttr] =
P.ignoreCase(C.corrOrgId)
.as(Attr.Correspondent.OrgId)
@ -78,7 +81,7 @@ object AttrParser {
attachCountAttr
val dateAttr: P[Attr.DateAttr] =
P.oneOf(List(date, dueDate))
P.oneOf(List(date, dueDate, created))
val stringAttr: P[Attr.StringAttr] =
P.oneOf(

2
modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala
View File

@ -23,6 +23,8 @@ object Constants {
val corrOrgName = "corr.org.name"
val corrPersId = "corr.pers.id"
val corrPersName = "corr.pers.name"
val created = "created"
val createdIn = "createdIn"
val customField = "f"
val customFieldId = "f.id"
val date = "date"

4
modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala
View File

@ -35,6 +35,9 @@ object MacroParser {
val dueDateRangeMacro: P[Expr.DateRangeMacro] =
dateRangeMacroImpl(C.dueIn, Attr.DueDate)
val createdDateRangeMacro: P[Expr.DateRangeMacro] =
dateRangeMacroImpl(C.createdIn, Attr.CreatedDate)
val yearDateMacro: P[Expr.YearMacro] =
yearMacroImpl(C.year, Attr.Date)
@ -52,6 +55,7 @@ object MacroParser {
namesMacro,
dateRangeMacro,
dueDateRangeMacro,
createdDateRangeMacro,
yearDateMacro,
corrMacro,
concMacro

8
modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala
View File

@ -56,6 +56,14 @@ class SimpleExprParserTest extends FunSuite with ValueHelper {
p.parseAll("due<2021-03-14"),
Right(dateExpr(Operator.Lt, Attr.DueDate, ld(2021, 3, 14)))
)
assertEquals(
p.parseAll("created:2021-03-14"),
Right(dateExpr(Operator.Like, Attr.CreatedDate, ld(2021, 3, 14)))
)
assertEquals(
p.parseAll("created<2021-03-14"),
Right(dateExpr(Operator.Lt, Attr.CreatedDate, ld(2021, 3, 14)))
)
assertEquals(
p.parseAll("due~=2021-03-14,2021-03-13"),
Right(Expr.InDateExpr(Attr.DueDate, Nel.of(ld(2021, 3, 14), ld(2021, 3, 13))))