TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-23 02:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix query for getting tag categoy summary

Browse Source
This commit is contained in:
Eike Kettner
2021-04-12 13:40:22 +02:00
parent b781461b4a
commit 994e3df597
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/store/src/main/scala/docspell/store/queries/CategoryCount.scala
View File

@ -1,3 +1,3 @@
package docspell.store.queries
final case class CategoryCount(category: String, count: Int)
final case class CategoryCount(category: Option[String], count: Int)

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

@ -203,7 +203,7 @@ object QItem {
.innerJoin(tag, tag.tid === ti.tagId)
.innerJoin(i, i.id === ti.itemId)
val tagCloud =
val catCloud =
findItemsBase(q.fix, today, 0).unwrap
.withSelect(select(tag.category).append(countDistinct(i.id).as("num")))
.changeFrom(_.prepend(tagFrom))
@ -213,14 +213,11 @@ object QItem {
.query[CategoryCount]
.to[List]
// the previous query starts from tags, so items with tag-count=0
// are not included they are fetched separately
for {
existing <- tagCloud
existing <- catCloud
allCats <- RTag.listCategories(q.fix.account.collective)
other = allCats.diff(existing.map(_.category))
} yield existing ++ other.map(CategoryCount(_, 0))
other = allCats.diff(existing.flatMap(_.category))
} yield existing ++ other.map(n => CategoryCount(n.some, 0))
}
def searchTagSummary(today: LocalDate)(q: Query): ConnectionIO[List[TagCount]] = {