Merge pull request #1024 from eikek/enhance-search-mode

Enhance search mode to search in all items

modules/backend/src/main/scala/docspell/backend/ops/OSimpleSearch.scala

@@ -220,6 +220,7 @@ object OSimpleSearch {
         settings.searchMode match {
           case SearchMode.Trashed => q.withFix(_.andQuery(ItemQuery.Expr.Trashed))
           case SearchMode.Normal  => q.withFix(_.andQuery(ItemQuery.Expr.ValidItemStates))
+          case SearchMode.All => q.withFix(_.andQuery(ItemQuery.Expr.ValidItemsOrTrashed))
         }
       fulltextQuery match {
         case Some(ftq) if settings.useFTS =>
@@ -282,6 +283,7 @@ object OSimpleSearch {
         settings.searchMode match {
           case SearchMode.Trashed => q.withFix(_.andQuery(ItemQuery.Expr.Trashed))
           case SearchMode.Normal  => q.withFix(_.andQuery(ItemQuery.Expr.ValidItemStates))
+          case SearchMode.All => q.withFix(_.andQuery(ItemQuery.Expr.ValidItemsOrTrashed))
         }
       fulltextQuery match {
         case Some(ftq) if settings.useFTS =>

modules/common/src/main/scala/docspell/common/ItemState.scala

@@ -52,6 +52,9 @@ object ItemState {
   val invalidStates: NonEmptyList[ItemState] =
     NonEmptyList.of(Premature, Processing)
 
+  val validStatesAndDeleted: NonEmptyList[ItemState] =
+    validStates.append(deleted)
+
   def unsafe(str: String): ItemState =
     fromString(str).fold(sys.error, identity)
 

modules/common/src/main/scala/docspell/common/SearchMode.scala

@@ -22,11 +22,13 @@ object SearchMode {
 
   final case object Normal  extends SearchMode
   final case object Trashed extends SearchMode
+  final case object All     extends SearchMode
 
   def fromString(str: String): Either[String, SearchMode] =
     str.toLowerCase match {
       case "normal"  => Right(Normal)
       case "trashed" => Right(Trashed)
+      case "all"     => Right(All)
       case _         => Left(s"Invalid search mode: $str")
     }
 

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

@@ -123,8 +123,9 @@ object ItemQuery {
     final case class ChecksumMatch(checksum: String) extends Expr
     final case class AttachId(id: String)            extends Expr
 
-    final case object ValidItemStates extends Expr
-    final case object Trashed         extends Expr
+    final case object ValidItemStates     extends Expr
+    final case object Trashed             extends Expr
+    final case object ValidItemsOrTrashed extends Expr
 
     // things that can be expressed with terms above
     sealed trait MacroExpr extends Expr {

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

@@ -79,6 +79,8 @@ object ExprUtil {
         expr
       case Trashed =>
         expr
+      case ValidItemsOrTrashed =>
+        expr
     }
 
   private def spliceAnd(nodes: Nel[Expr]): Nel[Expr] =

modules/restapi/src/main/resources/docspell-openapi.yml

@@ -4228,6 +4228,7 @@ components:
           enum:
             - normal
             - trashed
+            - all
           default: normal
           description: |
             Specify whether the search query should apply to
@@ -5990,10 +5991,12 @@ components:
     searchMode:
       name: searchMode
       in: query
-      description: Whether to search in soft-deleted items only.
       schema:
         type: string
         format: searchmode
+      description: |
+        Specify whether the search query should apply to soft-deleted
+        items or not.
     name:
       name: name
       in: path

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

@@ -129,6 +129,9 @@ object ItemQueryGenerator {
       case Expr.Trashed =>
         tables.item.state === ItemState.Deleted
 
+      case Expr.ValidItemsOrTrashed =>
+        tables.item.state.in(ItemState.validStatesAndDeleted)
+
       case Expr.TagIdsMatch(op, tags) =>
         val ids = tags.toList.flatMap(s => Ident.fromString(s).toOption)
         Nel