From 458fa7edd9298e3bcdbded2d957427faac0d88bb Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sun, 25 Oct 2020 21:36:29 +0100 Subject: [PATCH] Allow to search in a defined item subset --- modules/restapi/src/main/resources/docspell-openapi.yml | 2 ++ .../src/main/scala/docspell/restserver/conv/Conversions.scala | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index 8fdfd848..dcc81815 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -4483,6 +4483,8 @@ components: dueDateUntil: type: integer format: date-time + itemSubset: + $ref: "#/components/schemas/IdList" ItemLight: description: | An item with only a few important properties. diff --git a/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala b/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala index 1def28d4..4e872606 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala @@ -134,7 +134,9 @@ trait Conversions { m.dueDateFrom, m.dueDateUntil, m.allNames, - None, + m.itemSubset + .map(_.ids.flatMap(i => Ident.fromString(i).toOption).toSet) + .filter(_.nonEmpty), None )