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

Fix search summary to restrict on valid items

Browse Source
This commit is contained in:
eikek
2021-08-14 14:09:07 +02:00
parent 1d90095707
commit 48d13a35fc
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/store/src/main/scala/docspell/store/queries/QCollective.scala
View File

@ -73,12 +73,16 @@ object QCollective {
val q0 = Select(
count(i.id).s,
from(i),
i.cid === coll && i.incoming === Direction.incoming
i.cid === coll && i.incoming === Direction.incoming && i.state.in(
ItemState.validStates
)
).build.query[Int].unique
val q1 = Select(
count(i.id).s,
from(i),
i.cid === coll && i.incoming === Direction.outgoing
i.cid === coll && i.incoming === Direction.outgoing && i.state.in(
ItemState.validStates
)
).build.query[Int].unique
val fileSize = sql"""
@ -113,8 +117,8 @@ object QCollective {
val sql =
Select(
select(t.all).append(count(ti.itemId).s),
from(ti).innerJoin(t, ti.tagId === t.tid),
t.cid === coll
from(ti).innerJoin(t, ti.tagId === t.tid).innerJoin(i, i.id === ti.itemId),
t.cid === coll && i.state.in(ItemState.validStates)
).groupBy(t.name, t.tid, t.category)
sql.build.query[TagCount].to[List]