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

Make item queries depend on the account-id

Browse Source 
Now the user is required, too, to list items.
This commit is contained in:
Eike Kettner
2020-07-11 21:54:51 +02:00
parent e66c501056
commit 5b95fddf3d
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
View File

@ -110,9 +110,9 @@ trait Conversions {
// item list
def mkQuery(m: ItemSearch, coll: Ident): OItemSearch.Query =
def mkQuery(m: ItemSearch, account: AccountId): OItemSearch.Query =
OItemSearch.Query(
coll,
account,
m.name,
if (m.inbox) Seq(ItemState.Created)
else ItemState.validStates.toList,

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

@ -35,7 +35,7 @@ object ItemRoutes {
for {
mask <- req.as[ItemSearch]
_ <- logger.ftrace(s"Got search mask: $mask")
query = Conversions.mkQuery(mask, user.account.collective)
query = Conversions.mkQuery(mask, user.account)
_ <- logger.ftrace(s"Running query: $query")
resp <- mask.fullText match {
case Some(fq) if cfg.fullTextSearch.enabled =>
@ -62,7 +62,7 @@ object ItemRoutes {
for {
mask <- req.as[ItemSearch]
_ <- logger.ftrace(s"Got search mask: $mask")
query = Conversions.mkQuery(mask, user.account.collective)
query = Conversions.mkQuery(mask, user.account)
_ <- logger.ftrace(s"Running query: $query")
resp <- mask.fullText match {
case Some(fq) if cfg.fullTextSearch.enabled =>
@ -94,7 +94,7 @@ object ItemRoutes {
for {
items <- backend.fulltext.findIndexOnly(
ftsIn,
user.account.collective,
user.account,
Batch(mask.offset, mask.limit).restrictLimitTo(cfg.maxItemPageSize)
)
ok <- Ok(Conversions.mkItemListWithTagsFtsPlain(items))