From 3d58cffadac3a79c20f525b5c140f5e83fbbf56a Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Sat, 11 Jun 2022 21:14:25 +0200
Subject: [PATCH] Remove search feature flag
---
.../scala/docspell/restserver/Config.scala | 1 -
.../restserver/routes/ItemSearchPart.scala | 74 +++++++++----------
2 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/modules/restserver/src/main/scala/docspell/restserver/Config.scala b/modules/restserver/src/main/scala/docspell/restserver/Config.scala
index 738cca03..2899357d 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/Config.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/Config.scala
@@ -34,7 +34,6 @@ case class Config(
integrationEndpoint: Config.IntegrationEndpoint,
maxItemPageSize: Int,
maxNoteLength: Int,
- featureSearch2: Boolean,
fullTextSearch: Config.FullTextSearch,
adminEndpoint: Config.AdminEndpoint,
openid: List[OpenIdConfig],
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemSearchPart.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemSearchPart.scala
index 12aec359..3b9e8d3a 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemSearchPart.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemSearchPart.scala
@@ -40,47 +40,45 @@ final class ItemSearchPart[F[_]: Async](
private[this] val logger = docspell.logging.getLogger[F]
def routes: HttpRoutes[F] =
- if (!cfg.featureSearch2) HttpRoutes.empty
- else
- HttpRoutes.of {
- case GET -> Root / `searchPath` :? QP.Query(q) :? QP.Limit(limit) :?
- QP.Offset(offset) :? QP.WithDetails(detailFlag) :?
- QP.SearchKind(searchMode) =>
- val userQuery =
- ItemQuery(offset, limit, detailFlag, searchMode, q.getOrElse(""))
- for {
- today <- Timestamp.current[F].map(_.toUtcDate)
- resp <- search(userQuery, today)
- } yield resp
+ HttpRoutes.of {
+ case GET -> Root / `searchPath` :? QP.Query(q) :? QP.Limit(limit) :?
+ QP.Offset(offset) :? QP.WithDetails(detailFlag) :?
+ QP.SearchKind(searchMode) =>
+ val userQuery =
+ ItemQuery(offset, limit, detailFlag, searchMode, q.getOrElse(""))
+ for {
+ today <- Timestamp.current[F].map(_.toUtcDate)
+ resp <- search(userQuery, today)
+ } yield resp
- case req @ POST -> Root / `searchPath` =>
- for {
- timed <- Duration.stopTime[F]
- userQuery <- req.as[ItemQuery]
- today <- Timestamp.current[F].map(_.toUtcDate)
- resp <- search(userQuery, today)
- dur <- timed
- _ <- logger.debug(s"Search request: ${dur.formatExact}")
- } yield resp
+ case req @ POST -> Root / `searchPath` =>
+ for {
+ timed <- Duration.stopTime[F]
+ userQuery <- req.as[ItemQuery]
+ today <- Timestamp.current[F].map(_.toUtcDate)
+ resp <- search(userQuery, today)
+ dur <- timed
+ _ <- logger.debug(s"Search request: ${dur.formatExact}")
+ } yield resp
- case GET -> Root / `searchStatsPath` :? QP.Query(q) :?
- QP.SearchKind(searchMode) =>
- val userQuery = ItemQuery(None, None, None, searchMode, q.getOrElse(""))
- for {
- today <- Timestamp.current[F].map(_.toUtcDate)
- resp <- searchStats(userQuery, today)
- } yield resp
+ case GET -> Root / `searchStatsPath` :? QP.Query(q) :?
+ QP.SearchKind(searchMode) =>
+ val userQuery = ItemQuery(None, None, None, searchMode, q.getOrElse(""))
+ for {
+ today <- Timestamp.current[F].map(_.toUtcDate)
+ resp <- searchStats(userQuery, today)
+ } yield resp
- case req @ POST -> Root / `searchStatsPath` =>
- for {
- timed <- Duration.stopTime[F]
- userQuery <- req.as[ItemQuery]
- today <- Timestamp.current[F].map(_.toUtcDate)
- resp <- searchStats(userQuery, today)
- dur <- timed
- _ <- logger.debug(s"Search stats request: ${dur.formatExact}")
- } yield resp
- }
+ case req @ POST -> Root / `searchStatsPath` =>
+ for {
+ timed <- Duration.stopTime[F]
+ userQuery <- req.as[ItemQuery]
+ today <- Timestamp.current[F].map(_.toUtcDate)
+ resp <- searchStats(userQuery, today)
+ dur <- timed
+ _ <- logger.debug(s"Search stats request: ${dur.formatExact}")
+ } yield resp
+ }
def searchStats(userQuery: ItemQuery, today: LocalDate): F[Response[F]] = {
val mode = userQuery.searchMode.getOrElse(SearchMode.Normal)