TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to search by source name

Browse Source
This commit is contained in:
Eike Kettner 2020-11-30 14:07:45 +01:00
parent 3ea2d20823
commit 0ee8ff66d5
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/restapi/src/main/resources/docspell-openapi.yml
View File

@ -5065,6 +5065,8 @@ components:
type: array type: array
items: items:
$ref: "#/components/schemas/CustomFieldValue" $ref: "#/components/schemas/CustomFieldValue"
source:
type: string
ItemLight: ItemLight:
description: | description: |
An item with only a few important properties. An item with only a few important properties.

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

@ -144,6 +144,7 @@ trait Conversions {
.map(_.ids.flatMap(i => Ident.fromString(i).toOption).toSet) .map(_.ids.flatMap(i => Ident.fromString(i).toOption).toSet)
.filter(_.nonEmpty), .filter(_.nonEmpty),
m.customValues.map(mkCustomValue), m.customValues.map(mkCustomValue),
m.source,
None None
) )

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

@ -216,6 +216,7 @@ object QItem {
allNames: Option[String], allNames: Option[String],
itemIds: Option[Set[Ident]], itemIds: Option[Set[Ident]],
customValues: Seq[CustomValue], customValues: Seq[CustomValue],
source: Option[String],
orderAsc: Option[RItem.Columns.type => Column] orderAsc: Option[RItem.Columns.type => Column]
) )
@ -242,6 +243,7 @@ object QItem {
None, None,
None, None,
Seq.empty, Seq.empty,
None,
None None
) )
} }
@ -413,9 +415,10 @@ object QItem {
val tagSelectsExcl = val tagSelectsExcl =
TagItemName.itemsWithTagOrCategory(q.tagsExclude, q.tagCategoryExcl) TagItemName.itemsWithTagOrCategory(q.tagsExclude, q.tagCategoryExcl)
val iFolder = IC.folder.prefix("i") val iFolder = IC.folder.prefix("i")
val name = q.name.map(_.toLowerCase).map(QueryWildcard.apply) val name = q.name.map(_.toLowerCase).map(QueryWildcard.apply)
val allNames = q.allNames.map(_.toLowerCase).map(QueryWildcard.apply) val allNames = q.allNames.map(_.toLowerCase).map(QueryWildcard.apply)
val sourceName = q.source.map(_.toLowerCase).map(QueryWildcard.apply)
val cond = and( val cond = and(
IC.cid.prefix("i").is(q.account.collective), IC.cid.prefix("i").is(q.account.collective),
IC.state.prefix("i").isOneOf(q.states), IC.state.prefix("i").isOneOf(q.states),
@ -458,6 +461,7 @@ object QItem {
.getOrElse(Fragment.empty), .getOrElse(Fragment.empty),
q.dueDateFrom.map(d => IC.dueDate.prefix("i").isGt(d)).getOrElse(Fragment.empty), q.dueDateFrom.map(d => IC.dueDate.prefix("i").isGt(d)).getOrElse(Fragment.empty),
q.dueDateTo.map(d => IC.dueDate.prefix("i").isLt(d)).getOrElse(Fragment.empty), q.dueDateTo.map(d => IC.dueDate.prefix("i").isLt(d)).getOrElse(Fragment.empty),
sourceName.map(s => IC.source.prefix("i").lowerLike(s)).getOrElse(Fragment.empty),
q.itemIds q.itemIds
.map(ids => .map(ids =>
NonEmptyList NonEmptyList