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

Implement search by query in endpoints

Browse Source
This commit is contained in:
Eike Kettner
2021-03-01 12:37:25 +01:00
parent 698ff58aa3
commit dadab0d308
6 changed files with 249 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/backend/src/main/scala/docspell/backend/BackendApp.scala
View File

@ -37,6 +37,7 @@ trait BackendApp[F[_]] {
def userTask: OUserTask[F]
def folder: OFolder[F]
def customFields: OCustomFields[F]
def simpleSearch: OSimpleSearch[F]
}
object BackendApp {
@ -71,6 +72,7 @@ object BackendApp {
userTaskImpl <- OUserTask(utStore, queue, joexImpl)
folderImpl <- OFolder(store)
customFieldsImpl <- OCustomFields(store)
simpleSearchImpl = OSimpleSearch(fulltextImpl, itemSearchImpl)
} yield new BackendApp[F] {
val login = loginImpl
val signup = signupImpl
@ -90,6 +92,7 @@ object BackendApp {
val userTask = userTaskImpl
val folder = folderImpl
val customFields = customFieldsImpl
val simpleSearch = simpleSearchImpl
}
def apply[F[_]: ConcurrentEffect: ContextShift](

25
modules/backend/src/main/scala/docspell/backend/ops/OSimpleSearch.scala
View File

@ -1,29 +1,28 @@
package docspell.backend.ops
import cats.effect.Sync
import cats.implicits._
import docspell.backend.ops.OSimpleSearch._
import docspell.common._
import docspell.query.{ItemQueryParser, ParseFailure}
import docspell.store.qb.Batch
import docspell.store.queries.Query
import docspell.query.{ItemQueryParser, ParseFailure}
import OSimpleSearch._
import docspell.store.queries.SearchSummary
import cats.effect.Sync
/** A "porcelain" api on top of OFulltext and OItemSearch. */
trait OSimpleSearch[F[_]] {
def search(settings: Settings)(q: Query, fulltextQuery: Option[String]): F[Items]
def searchSummary(
settings: Settings
useFTS: Boolean
)(q: Query, fulltextQuery: Option[String]): F[SearchSummary]
def searchByString(
settings: Settings
)(fix: Query.Fix, q: ItemQueryString): Either[ParseFailure, F[Items]]
def searchSummaryByString(
settings: Settings
useFTS: Boolean
)(fix: Query.Fix, q: ItemQueryString): Either[ParseFailure, F[SearchSummary]]
}
@ -36,12 +35,6 @@ object OSimpleSearch {
resolveDetails: Boolean,
maxNoteLen: Int
)
object Settings {
def plain(batch: Batch, useFulltext: Boolean, maxNoteLen: Int): Settings =
Settings(batch, useFulltext, false, maxNoteLen)
def detailed(batch: Batch, useFulltext: Boolean, maxNoteLen: Int): Settings =
Settings(batch, useFulltext, true, maxNoteLen)
}
sealed trait Items {
def fold[A](
@ -118,18 +111,18 @@ object OSimpleSearch {
.map(search(settings)(_, None)) //TODO resolve content:xyz expressions
def searchSummaryByString(
settings: Settings
useFTS: Boolean
)(fix: Query.Fix, q: ItemQueryString): Either[ParseFailure, F[SearchSummary]] =
ItemQueryParser
.parse(q.query)
.map(iq => Query(fix, Query.QueryExpr(iq)))
.map(searchSummary(settings)(_, None)) //TODO resolve content:xyz expressions
.map(searchSummary(useFTS)(_, None)) //TODO resolve content:xyz expressions
def searchSummary(
settings: Settings
useFTS: Boolean
)(q: Query, fulltextQuery: Option[String]): F[SearchSummary] =
fulltextQuery match {
case Some(ftq) if settings.useFTS =>
case Some(ftq) if useFTS =>
if (q.isEmpty)
fts.findIndexOnlySummary(q.fix.account, OFulltext.FtsInput(ftq))
else