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

Send no fts query if it is disabled

Browse Source
This commit is contained in:
eikek
2022-06-02 23:10:51 +02:00
parent 66aab0c952
commit b50f57f7fe
5 changed files with 58 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
View File

@ -74,6 +74,7 @@ object ItemRoutes {
case req @ POST -> Root / "search" =>
for {
timed <- Duration.stopTime[F]
userQuery <- req.as[ItemQuery]
batch = Batch(
userQuery.offset.getOrElse(0),
@ -92,6 +93,8 @@ object ItemRoutes {
)
fixQuery = Query.Fix(user.account, None, None)
resp <- searchItems(backend, dsl)(settings, fixQuery, itemQuery, limitCapped)
dur <- timed
_ <- logger.debug(s"Search request: ${dur.formatExact}")
} yield resp
case req @ POST -> Root / "searchStats" =>

41
modules/restserver/src/main/scala/docspell/restserver/routes/ItemSearchPart.scala
View File

@ -14,8 +14,8 @@ import cats.syntax.all._
import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken
import docspell.backend.ops.search.QueryParseResult
import docspell.common.{SearchMode, Timestamp}
import docspell.query.FulltextExtract
import docspell.common.{Duration, SearchMode, Timestamp}
import docspell.query.FulltextExtract.Result
import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions
@ -44,31 +44,36 @@ final class ItemSearchPart[F[_]: Async](
) :? QP.WithDetails(detailFlag) :? QP.SearchKind(searchMode) =>
val userQuery =
ItemQuery(offset, limit, detailFlag, searchMode, q.getOrElse(""))
Timestamp
.current[F]
.map(_.toUtcDate)
.flatMap(search(userQuery, _))
for {
today <- Timestamp.current[F].map(_.toUtcDate)
resp <- search(userQuery, today)
} yield resp
case req @ POST -> Root / "search" =>
for {
timed <- Duration.stopTime[F]
userQuery <- req.as[ItemQuery]
today <- Timestamp.current[F]
resp <- search(userQuery, today.toUtcDate)
today <- Timestamp.current[F].map(_.toUtcDate)
resp <- search(userQuery, today)
dur <- timed
_ <- logger.debug(s"Search request: ${dur.formatExact}")
} yield resp
case GET -> Root / "searchStats" :? QP.Query(q) :? QP.SearchKind(searchMode) =>
val userQuery = ItemQuery(None, None, None, searchMode, q.getOrElse(""))
Timestamp
.current[F]
.map(_.toUtcDate)
.flatMap(searchStats(userQuery, _))
for {
today <- Timestamp.current[F].map(_.toUtcDate)
resp <- searchStats(userQuery, today)
} yield resp
case req @ POST -> Root / "searchStats" =>
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
}
@ -105,7 +110,7 @@ final class ItemSearchPart[F[_]: Async](
)
// order is always by date unless q is empty and ftq is not
// TODO this is not obvious from the types and an impl detail.
// TODO this should be given explicitly by the result
ftsOrder = res.q.cond.isEmpty && res.ftq.isDefined
resp <- Ok(convert(items, batch, limitCapped, ftsOrder))
@ -119,20 +124,18 @@ final class ItemSearchPart[F[_]: Async](
): Either[F[Response[F]], QueryParseResult.Success] =
backend.search.parseQueryString(authToken.account, mode, userQuery.query) match {
case s: QueryParseResult.Success =>
Right(s)
Right(s.withFtsEnabled(cfg.fullTextSearch.enabled))
case QueryParseResult.ParseFailed(err) =>
Left(BadRequest(BasicResult(false, s"Invalid query: $err")))
case QueryParseResult.FulltextMismatch(FulltextExtract.Result.TooMany) =>
case QueryParseResult.FulltextMismatch(Result.TooMany) =>
Left(
BadRequest(
BasicResult(false, "Only one fulltext search expression is allowed.")
)
)
case QueryParseResult.FulltextMismatch(
FulltextExtract.Result.UnsupportedPosition
) =>
case QueryParseResult.FulltextMismatch(Result.UnsupportedPosition) =>
Left(
BadRequest(
BasicResult(