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

Return custom field values with search results

Browse Source
This commit is contained in:
Eike Kettner 2020-11-23 10:23:25 +01:00
parent 44459aecd0
commit 7b7f1e4d6d
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5090,6 +5090,10 @@ components:
type: array type: array
items: items:
$ref: "#/components/schemas/Tag" $ref: "#/components/schemas/Tag"
customfields:
type: array
items:
$ref: "#/components/schemas/ItemFieldValue"
notes: notes:
description: | description: |
Some prefix of the item notes. Some prefix of the item notes.

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

@ -213,10 +213,11 @@ trait Conversions {
i.concEquip.map(mkIdName), i.concEquip.map(mkIdName),
i.folder.map(mkIdName), i.folder.map(mkIdName),
i.fileCount, i.fileCount,
Nil, Nil, //attachments
Nil, Nil, //tags
Nil, //customfields
i.notes, i.notes,
Nil Nil // highlight
) )
def mkItemLight(i: OFulltext.FtsItem): ItemLight = { def mkItemLight(i: OFulltext.FtsItem): ItemLight = {
@ -227,7 +228,11 @@ trait Conversions {
def mkItemLightWithTags(i: OItemSearch.ListItemWithTags): ItemLight = def mkItemLightWithTags(i: OItemSearch.ListItemWithTags): ItemLight =
mkItemLight(i.item) mkItemLight(i.item)
.copy(tags = i.tags.map(mkTag), attachments = i.attachments.map(mkAttachmentLight)) .copy(
tags = i.tags.map(mkTag),
attachments = i.attachments.map(mkAttachmentLight),
customfields = i.customfields.map(mkItemFieldValue)
)
private def mkAttachmentLight(qa: QItem.AttachmentLight): AttachmentLight = private def mkAttachmentLight(qa: QItem.AttachmentLight): AttachmentLight =
AttachmentLight(qa.id, qa.position, qa.name, qa.pageCount) AttachmentLight(qa.id, qa.position, qa.name, qa.pageCount)

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

@ -524,7 +524,8 @@ object QItem {
case class ListItemWithTags( case class ListItemWithTags(
item: ListItem, item: ListItem,
tags: List[RTag], tags: List[RTag],
attachments: List[AttachmentLight] attachments: List[AttachmentLight],
customfields: List[ItemFieldValue]
) )
/** Same as `findItems` but resolves the tags for each item. Note that /** Same as `findItems` but resolves the tags for each item. Note that
@ -560,10 +561,12 @@ object QItem {
tags <- Stream.eval(tagItems.traverse(ti => findTag(resolvedTags, ti))) tags <- Stream.eval(tagItems.traverse(ti => findTag(resolvedTags, ti)))
attachs <- Stream.eval(findAttachmentLight(item.id)) attachs <- Stream.eval(findAttachmentLight(item.id))
ftags = tags.flatten.filter(t => t.collective == collective) ftags = tags.flatten.filter(t => t.collective == collective)
cfields <- Stream.eval(findCustomFieldValuesForItem(item.id))
} yield ListItemWithTags( } yield ListItemWithTags(
item, item,
ftags.toList.sortBy(_.name), ftags.toList.sortBy(_.name),
attachs.sortBy(_.position) attachs.sortBy(_.position),
cfields.toList
) )
} }