Merge pull request #1815 from eikek/fix/attach-count-query

Remove `attach.count` from query

modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala

@@ -8,7 +8,7 @@ package docspell.query
 
 import cats.data.{NonEmptyList => Nel}
 
-import docspell.query.ItemQuery.Attr.{DateAttr, IntAttr, StringAttr}
+import docspell.query.ItemQuery.Attr.{DateAttr, StringAttr}
 
 /** A query evaluates to `true` or `false` given enough details about an item.
   *
@@ -43,7 +43,7 @@ object ItemQuery {
   object Attr {
     sealed trait StringAttr extends Attr
     sealed trait DateAttr extends Attr
-    sealed trait IntAttr extends Attr
+    // sealed trait IntAttr extends Attr
 
     case object ItemName extends StringAttr
     case object ItemSource extends StringAttr
@@ -52,7 +52,6 @@ object ItemQuery {
     case object Date extends DateAttr
     case object DueDate extends DateAttr
     case object CreatedDate extends DateAttr
-    case object AttachCount extends IntAttr
 
     object Correspondent {
       case object OrgId extends StringAttr
@@ -78,7 +77,7 @@ object ItemQuery {
   object Property {
     final case class StringProperty(attr: StringAttr, value: String) extends Property
     final case class DateProperty(attr: DateAttr, value: Date) extends Property
-    final case class IntProperty(attr: IntAttr, value: Int) extends Property
+    // final case class IntProperty(attr: IntAttr, value: Int) extends Property
 
     def apply(sa: StringAttr, value: String): Property =
       StringProperty(sa, value)
@@ -86,8 +85,8 @@ object ItemQuery {
     def apply(da: DateAttr, value: Date): Property =
       DateProperty(da, value)
 
-    def apply(na: IntAttr, value: Int): Property =
-      IntProperty(na, value)
+    // def apply(na: IntAttr, value: Int): Property =
+    //  IntProperty(na, value)
   }
 
   sealed trait Expr {

modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala

@@ -72,14 +72,8 @@ object AttrParser {
   val folderName: P[Attr.StringAttr] =
     P.ignoreCase(C.folder).as(Attr.Folder.FolderName)
 
-  val attachCountAttr: P[Attr.IntAttr] =
-    P.ignoreCase(C.attachCount).as(Attr.AttachCount)
-
   // combining grouped by type
 
-  val intAttr: P[Attr.IntAttr] =
-    attachCountAttr
-
   val dateAttr: P[Attr.DateAttr] =
     P.oneOf(List(date, dueDate, created))
 
@@ -104,5 +98,5 @@ object AttrParser {
     )
 
   val anyAttr: P[Attr] =
-    P.oneOf(List(dateAttr, stringAttr, intAttr))
+    P.oneOf(List(dateAttr, stringAttr))
 }

modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala

@@ -8,7 +8,7 @@ package docspell.query.internal
 
 object Constants {
 
-  val attachCount = "attach.count"
+  // val attachCount = "attach.count"
   val attachId = "attach.id"
   val cat = "cat"
   val checksum = "checksum"

modules/query/shared/src/main/scala/docspell/query/internal/ExprString.scala

@@ -83,8 +83,8 @@ object ExprString {
             Right(s"${stringAttr(attr)}${opStr(op)}${quote(value)}")
           case Property.DateProperty(attr, value) =>
             Right(s"${dateAttr(attr)}${opStr(op)}${dateStr(value)}")
-          case Property.IntProperty(attr, value) =>
-            Right(s"${attrStr(attr)}${opStr(op)}$value")
+//          case Property.IntProperty(attr, value) =>
+//            Right(s"${attrStr(attr)}${opStr(op)}$value")
         }
 
       case TagCategoryMatch(op, values) =>
@@ -171,13 +171,6 @@ object ExprString {
     attr match {
       case a: StringAttr => stringAttr(a)
       case a: DateAttr   => dateAttr(a)
-      case a: IntAttr    => intAttr(a)
-    }
-
-  private[internal] def intAttr(attr: IntAttr): String =
-    attr match {
-      case AttachCount =>
-        Constants.attachCount
     }
 
   private[internal] def dateAttr(attr: DateAttr): String =

modules/query/shared/src/main/scala/docspell/query/internal/SimpleExprParser.scala

@@ -6,7 +6,6 @@
 
 package docspell.query.internal
 
-import cats.parse.Numbers
 import cats.parse.{Parser => P}
 
 import docspell.query.ItemQuery._
@@ -26,9 +25,6 @@ object SimpleExprParser {
   private[this] val inOrOpDate =
     P.eitherOr(op ~ DateParser.date, inOp *> DateParser.dateOrMore)
 
-  private[this] val opInt =
-    op ~ Numbers.digits.map(_.toInt)
-
   val stringExpr: P[Expr] =
     (AttrParser.stringAttr ~ inOrOpStr).map {
       case (attr, Right((op, value))) =>
@@ -45,11 +41,6 @@ object SimpleExprParser {
         Expr.InDateExpr(attr, values)
     }
 
-  val intExpr: P[Expr] =
-    (AttrParser.intAttr ~ opInt).map { case (attr, (op, value)) =>
-      Expr.SimpleExpr(op, Property(attr, value))
-    }
-
   val existsExpr: P[Expr.Exists] =
     (P.ignoreCase(C.exist) *> P.char(C.like) *> AttrParser.anyAttr).map(attr =>
       Expr.Exists(attr)
@@ -114,7 +105,6 @@ object SimpleExprParser {
       List(
         dateExpr,
         stringExpr,
-        intExpr,
         existsExpr,
         fulltextExpr,
         tagIdExpr,

modules/query/shared/src/test/scala/docspell/query/ItemQueryGen.scala

@@ -93,11 +93,8 @@ object ItemQueryGen {
   val dateAttrGen: Gen[Attr.DateAttr] =
     Gen.oneOf(Attr.Date, Attr.DueDate, Attr.CreatedDate)
 
-  val intAttrGen: Gen[Attr.IntAttr] =
-    Gen.const(Attr.AttachCount)
-
   val attrGen: Gen[Attr] =
-    Gen.oneOf(stringAttrGen, dateAttrGen, intAttrGen)
+    Gen.oneOf(stringAttrGen, dateAttrGen)
 
   private val valueChars =
     Gen.oneOf(Gen.alphaNumChar, Gen.oneOf(" /{}*?-:@#$~+%…_[]^!ß"))
@@ -105,9 +102,6 @@ object ItemQueryGen {
   private val stringValueGen: Gen[String] =
     Gen.choose(1, 20).flatMap(n => Gen.stringOfN(n, valueChars))
 
-  private val intValueGen: Gen[Int] =
-    Gen.choose(1900, 9999)
-
   private val identGen: Gen[String] =
     Gen
       .choose(3, 12)
@@ -167,12 +161,6 @@ object ItemQueryGen {
       sval <- stringValueGen
     } yield Property.StringProperty(attr, sval)
 
-  val intPropGen: Gen[Property.IntProperty] =
-    for {
-      attr <- intAttrGen
-      ival <- intValueGen
-    } yield Property.IntProperty(attr, ival)
-
   val datePropGen: Gen[Property.DateProperty] =
     for {
       attr <- dateAttrGen
@@ -180,7 +168,7 @@ object ItemQueryGen {
     } yield Property.DateProperty(attr, dv)
 
   val propertyGen: Gen[Property] =
-    Gen.oneOf(stringPropGen, datePropGen, intPropGen)
+    Gen.oneOf(stringPropGen, datePropGen)
 
   val simpleExprGen: Gen[Expr.SimpleExpr] =
     for {

modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala

@@ -100,10 +100,6 @@ object ItemQueryGenerator {
         val noLikeOp = if (op == Operator.Like) Operator.Eq else op
         Condition.CompareFVal(col, makeOp(noLikeOp), dt)
 
-      case Expr.SimpleExpr(op, Property.IntProperty(attr, value)) =>
-        val col = intColumn(tables)(attr)
-        Condition.CompareVal(col, makeOp(op), value)
-
       case Expr.InExpr(attr, values) =>
         val col = stringColumn(tables)(attr)
         if (values.tail.isEmpty) col === values.head
@@ -228,8 +224,6 @@ object ItemQueryGenerator {
         stringColumn(tables)(s).s
       case t: Attr.DateAttr =>
         timestampColumn(tables)(t)
-      case n: Attr.IntAttr =>
-        intColumn(tables)(n).s
     }
 
   private def timestampColumn(tables: Tables)(attr: Attr.DateAttr): SelectExpr =
@@ -260,11 +254,6 @@ object ItemQueryGenerator {
       case Attr.Folder.FolderName        => tables.folder.name
     }
 
-  private def intColumn(tables: Tables)(attr: Attr.IntAttr): Column[Int] =
-    attr match {
-      case Attr.AttachCount => tables.attachCount.num
-    }
-
   private def makeOp(operator: Operator): QOp =
     operator match {
       case Operator.Eq =>

modules/store/src/main/scala/docspell/store/qb/generator/Tables.scala

@@ -6,7 +6,6 @@
 
 package docspell.store.qb.generator
 
-import docspell.store.queries.AttachCountTable
 import docspell.store.records._
 
 final case class Tables(
@@ -17,6 +16,5 @@ final case class Tables(
     concEquip: REquipment.Table,
     folder: RFolder.Table,
     attach: RAttachment.Table,
-    meta: RAttachmentMeta.Table,
-    attachCount: AttachCountTable
+    meta: RAttachmentMeta.Table
 )

modules/store/src/main/scala/docspell/store/queries/AttachCountTable.scala

@@ -1,22 +0,0 @@
-/*
- * Copyright 2020 Eike K. & Contributors
- *
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-package docspell.store.queries
-
-import docspell.common.Ident
-import docspell.store.qb.Column
-import docspell.store.qb.TableDef
-
-final case class AttachCountTable(aliasName: String) extends TableDef {
-  val tableName = "attachs"
-  val alias: Option[String] = Some(aliasName)
-
-  val num = Column[Int]("num", this)
-  val itemId = Column[Ident]("item_id", this)
-
-  def as(alias: String): AttachCountTable =
-    copy(aliasName = alias)
-}

modules/store/src/main/scala/docspell/store/queries/QItem.scala

@@ -299,7 +299,7 @@ object QItem extends FtsSupport {
       coll: CollectiveId,
       q: ItemQuery.Expr
   ): Condition = {
-    val tables = Tables(i, org, pers0, pers1, equip, f, a, m, AttachCountTable("cta"))
+    val tables = Tables(i, org, pers0, pers1, equip, f, a, m)
     ItemQueryGenerator.fromExpr(today, tables, coll)(q)
   }
 

modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala

@@ -13,7 +13,6 @@ import docspell.query.ItemQueryParser
 import docspell.store.qb.DSL._
 import docspell.store.qb.Select
 import docspell.store.qb.generator.{ItemQueryGenerator, Tables}
-import docspell.store.queries.AttachCountTable
 import docspell.store.records._
 
 import munit._
@@ -29,8 +28,7 @@ class ItemQueryGeneratorTest extends FunSuite {
     REquipment.as("ne"),
     RFolder.as("f"),
     RAttachment.as("a"),
-    RAttachmentMeta.as("m"),
-    AttachCountTable("cta")
+    RAttachmentMeta.as("m")
   )
   val now: LocalDate = LocalDate.of(2021, 2, 25)
 

modules/webapp/package.json

@@ -2,7 +2,6 @@
   "name": "docspell-css",
   "version": "1.0.0",
   "private": true,
-  "dependencies": {},
   "devDependencies": {
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@tailwindcss/forms": "^0.5.0",

website/site/content/docs/query/_index.md

@@ -91,7 +91,6 @@ These fields map to at most one value:
 - `date` the item date
 - `due` the due date of the item
 - `created` the date when the item was created
-- `attach.count` the number of attachments of the item
 - `corr.org.id` the id of the correspondent organization
 - `corr.org.name` the name of the correspondent organization
 - `corr.pers.name` name of correspondent person
@@ -522,11 +521,6 @@ look into correspondent names and concerning names.
 
 # Examples
 
-Find items with 2 or more attachments:
-```
-attach.count>2
-```
-
 Find items with at least one tag invoice or todo that are due next:
 ```
 tag:invoice,todo due>today