TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/backend/src/main/scala/docspell/backend/ops/OFulltext.scala
View File

@ -30,7 +30,7 @@ trait OFulltext[F[_]] {
def findIndexOnly( def findIndexOnly(
fts: OFulltext.FtsInput, fts: OFulltext.FtsInput,
collective: Ident, account: AccountId,
batch: Batch batch: Batch
): F[Vector[OFulltext.FtsItemWithTags]] ): F[Vector[OFulltext.FtsItemWithTags]]
@ -94,12 +94,12 @@ object OFulltext {
def findIndexOnly( def findIndexOnly(
ftsQ: OFulltext.FtsInput, ftsQ: OFulltext.FtsInput,
collective: Ident, account: AccountId,
batch: Batch batch: Batch
): F[Vector[OFulltext.FtsItemWithTags]] = { ): F[Vector[OFulltext.FtsItemWithTags]] = {
val fq = FtsQuery( val fq = FtsQuery(
ftsQ.query, ftsQ.query,
collective, account.collective,
Set.empty, Set.empty,
batch.limit, batch.limit,
batch.offset, batch.offset,
@ -113,8 +113,8 @@ object OFulltext {
store store
.transact( .transact(
QItem.findItemsWithTags( QItem.findItemsWithTags(
collective, account.collective,
QItem.findSelectedItems(QItem.Query.empty(collective), select) QItem.findSelectedItems(QItem.Query.empty(account), select)
) )
) )
.take(batch.limit.toLong) .take(batch.limit.toLong)
@ -182,7 +182,7 @@ object OFulltext {
val sqlResult = search(q, batch) val sqlResult = search(q, batch)
val fq = FtsQuery( val fq = FtsQuery(
ftsQ.query, ftsQ.query,
q.collective, q.account.collective,
Set.empty, Set.empty,
0, 0,
0, 0,

2
modules/backend/src/main/scala/docspell/backend/ops/OItemSearch.scala
View File

@ -107,7 +107,7 @@ object OItemSearch {
val search = QItem.findItems(q, batch) val search = QItem.findItems(q, batch)
store store
.transact( .transact(
QItem.findItemsWithTags(q.collective, search).take(batch.limit.toLong) QItem.findItemsWithTags(q.account.collective, search).take(batch.limit.toLong)
) )
.compile .compile
.toVector .toVector

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

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

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

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

20
modules/store/src/main/scala/docspell/store/queries/QItem.scala
View File

@ -160,7 +160,7 @@ object QItem {
) )
case class Query( case class Query(
collective: Ident, account: AccountId,
name: Option[String], name: Option[String],
states: Seq[ItemState], states: Seq[ItemState],
direction: Option[Direction], direction: Option[Direction],
@ -181,9 +181,9 @@ object QItem {
) )
object Query { object Query {
def empty(collective: Ident): Query = def empty(account: AccountId): Query =
Query( Query(
collective, account,
None, None,
Seq.empty, Seq.empty,
None, None,
@ -273,12 +273,12 @@ object QItem {
) ++ moreCols ) ++ moreCols
) )
val withItem = selectSimple(itemCols, RItem.table, IC.cid.is(q.collective)) val withItem = selectSimple(itemCols, RItem.table, IC.cid.is(q.account.collective))
val withPerson = selectSimple(personCols, RPerson.table, PC.cid.is(q.collective)) val withPerson = selectSimple(personCols, RPerson.table, PC.cid.is(q.account.collective))
val withOrgs = selectSimple(orgCols, ROrganization.table, OC.cid.is(q.collective)) val withOrgs = selectSimple(orgCols, ROrganization.table, OC.cid.is(q.account.collective))
val withEquips = selectSimple(equipCols, REquipment.table, EC.cid.is(q.collective)) val withEquips = selectSimple(equipCols, REquipment.table, EC.cid.is(q.account.collective))
val withFolder = val withFolder =
selectSimple(folderCols, RFolder.table, FC.collective.is(q.collective)) selectSimple(folderCols, RFolder.table, FC.collective.is(q.account.collective))
val withAttach = fr"SELECT COUNT(" ++ AC.id.f ++ fr") as num, " ++ AC.itemId.f ++ val withAttach = fr"SELECT COUNT(" ++ AC.id.f ++ fr") as num, " ++ AC.itemId.f ++
fr"from" ++ RAttachment.table ++ fr"GROUP BY (" ++ AC.itemId.f ++ fr")" fr"from" ++ RAttachment.table ++ fr"GROUP BY (" ++ AC.itemId.f ++ fr")"
@ -337,7 +337,7 @@ object QItem {
val name = q.name.map(_.toLowerCase).map(queryWildcard) val name = q.name.map(_.toLowerCase).map(queryWildcard)
val allNames = q.allNames.map(_.toLowerCase).map(queryWildcard) val allNames = q.allNames.map(_.toLowerCase).map(queryWildcard)
val cond = and( val cond = and(
IC.cid.prefix("i").is(q.collective), IC.cid.prefix("i").is(q.account.collective),
IC.state.prefix("i").isOneOf(q.states), IC.state.prefix("i").isOneOf(q.states),
IC.incoming.prefix("i").isOrDiscard(q.direction), IC.incoming.prefix("i").isOrDiscard(q.direction),
name name
@ -476,7 +476,7 @@ object QItem {
n <- store.transact(RItem.deleteByIdAndCollective(itemId, collective)) n <- store.transact(RItem.deleteByIdAndCollective(itemId, collective))
} yield tn + rn + n + mn } yield tn + rn + n + mn
private def findByFileIdsQuery(fileMetaIds: NonEmptyList[Ident], limit: Option[Int]) = { private def findByFileIdsQuery(fileMetaIds: NonEmptyList[Ident], limit: Option[Int]): Fragment = {
val IC = RItem.Columns.all.map(_.prefix("i")) val IC = RItem.Columns.all.map(_.prefix("i"))
val aItem = RAttachment.Columns.itemId.prefix("a") val aItem = RAttachment.Columns.itemId.prefix("a")
val aId = RAttachment.Columns.id.prefix("a") val aId = RAttachment.Columns.id.prefix("a")