Merge pull request #575 from eikek/category-search-fix

Category search fix

Author: mergify[bot]

modules/analysis/src/main/scala/docspell/analysis/nlp/StanfordNerClassifier.scala

@@ -1,10 +1,12 @@
 package docspell.analysis.nlp
 
-import cats.Applicative
-
 import scala.jdk.CollectionConverters._
+
+import cats.Applicative
 import cats.effect._
+
 import docspell.common._
+
 import edu.stanford.nlp.pipeline.{CoreDocument, StanfordCoreNLP}
 
 object StanfordNerClassifier {

modules/store/src/main/scala/docspell/store/qb/DSL.scala

@@ -164,6 +164,9 @@ trait DSL extends DoobieMeta {
     def ===(value: A)(implicit P: Put[A]): Condition =
       Condition.CompareVal(col, Operator.Eq, value)
 
+    def lowerEq(value: A)(implicit P: Put[A]): Condition =
+      Condition.CompareVal(col, Operator.LowerEq, value)
+
     def ====(value: String): Condition =
       Condition.CompareVal(col.asInstanceOf[Column[String]], Operator.Eq, value)
 

modules/store/src/main/scala/docspell/store/qb/Operator.scala

@@ -5,6 +5,7 @@ sealed trait Operator
 object Operator {
 
   case object Eq        extends Operator
+  case object LowerEq   extends Operator
   case object Neq       extends Operator
   case object Gt        extends Operator
   case object Lt        extends Operator

modules/store/src/main/scala/docspell/store/qb/impl/ConditionBuilder.scala

@@ -69,6 +69,8 @@ object ConditionBuilder {
         val colFrag = op match {
           case Operator.LowerLike =>
             lower(col)
+          case Operator.LowerEq =>
+            lower(col)
           case _ =>
             SelectExprBuilder.column(col)
         }
@@ -80,6 +82,8 @@ object ConditionBuilder {
         val dbfFrag = op match {
           case Operator.LowerLike =>
             lower(dbf)
+          case Operator.LowerEq =>
+            lower(dbf)
           case _ =>
             DBFunctionBuilder.build(dbf)
         }
@@ -89,6 +93,8 @@ object ConditionBuilder {
         val (c1Frag, c2Frag) = op match {
           case Operator.LowerLike =>
             (lower(c1), lower(c2))
+          case Operator.LowerEq =>
+            (lower(c1), lower(c2))
           case _ =>
             (SelectExprBuilder.column(c1), SelectExprBuilder.column(c2))
         }
@@ -131,6 +137,8 @@ object ConditionBuilder {
     op match {
       case Operator.Eq =>
         fr" ="
+      case Operator.LowerEq =>
+        fr" ="
       case Operator.Neq =>
         fr" <>"
       case Operator.Gt =>

modules/store/src/main/scala/docspell/store/records/TagItemName.scala

@@ -36,7 +36,7 @@ object TagItemName {
 
   def itemsInAllCategories(cats: NonEmptyList[String]): Select =
     intersect(
-      cats.map(cat => Select(ti.itemId.s, taggedItems, t.category === cat).distinct)
+      cats.map(cat => Select(ti.itemId.s, taggedItems, t.category.lowerEq(cat)).distinct)
     )
 
   def itemsWithEitherTag(tags: NonEmptyList[Ident]): Select =