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

Don't allow shares with fulltext queries

Browse Source 
Currently the query implementation cannot combine multiple/nested
fulltext searches within a query. It doesn't seem useful to have
shares based on fulltext searches, so it is disabled for now.

Issue: #446
This commit is contained in:
eikek
2021-10-25 21:27:23 +02:00
parent 6ce72e8168
commit 8fd86f9ec1
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/backend/src/main/scala/docspell/backend/ops/OShare.scala
View File

@ -16,9 +16,9 @@ import docspell.backend.ops.OItemSearch._
import docspell.backend.ops.OShare._
import docspell.backend.ops.OSimpleSearch.StringSearchResult
import docspell.common._
import docspell.query.ItemQuery
import docspell.query.ItemQuery.Expr
import docspell.query.ItemQuery.Expr.AttachId
import docspell.query.{FulltextExtract, ItemQuery}
import docspell.store.Store
import docspell.store.queries.SearchSummary
import docspell.store.records._
@ -133,10 +133,12 @@ object OShare {
final case class Success(id: Ident) extends ChangeResult
case object PublishUntilInPast extends ChangeResult
case object NotFound extends ChangeResult
case object QueryWithFulltext extends ChangeResult
def success(id: Ident): ChangeResult = Success(id)
def publishUntilInPast: ChangeResult = PublishUntilInPast
def notFound: ChangeResult = NotFound
def queryWithFulltext: ChangeResult = QueryWithFulltext
}
final case class ShareData(share: RShare, user: RUser)
@ -182,12 +184,13 @@ object OShare {
)
res <-
if (share.publishUntil < curTime) ChangeResult.publishUntilInPast.pure[F]
else if (hasFulltext(share.query)) ChangeResult.queryWithFulltext.pure[F]
else store.transact(RShare.insert(record)).map(_ => ChangeResult.success(id))
} yield res
def update(
id: Ident,
share: OShare.NewShare,
share: NewShare,
removePassword: Boolean
): F[ChangeResult] =
for {
@ -207,12 +210,19 @@ object OShare {
)
res <-
if (share.publishUntil < curTime) ChangeResult.publishUntilInPast.pure[F]
else if (hasFulltext(share.query)) ChangeResult.queryWithFulltext.pure[F]
else
store
.transact(RShare.updateData(record, removePassword))
.map(n => if (n > 0) ChangeResult.success(id) else ChangeResult.notFound)
} yield res
private def hasFulltext(iq: ItemQuery): Boolean =
iq.findFulltext match {
case FulltextExtract.Result.SuccessNoFulltext(_) => false
case _ => true
}
def findOne(id: Ident, collective: Ident): OptionT[F, ShareData] =
RShare
.findOne(id, collective)