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

Return a 404 if a source was not found when checking a file

Browse Source
This commit is contained in:
eikek 2021-07-08 21:17:48 +02:00
parent b0cdb35375
commit f7eed33545
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/backend/src/main/scala/docspell/backend/ops/OItemSearch.scala
View File

@ -55,7 +55,7 @@ trait OItemSearch[F[_]] {
def findByFileCollective(checksum: String, collective: Ident): F[Vector[RItem]]
def findByFileSource(checksum: String, sourceId: Ident): F[Vector[RItem]]
def findByFileSource(checksum: String, sourceId: Ident): F[Option[Vector[RItem]]]
}
@ -280,11 +280,11 @@ object OItemSearch {
def findByFileCollective(checksum: String, collective: Ident): F[Vector[RItem]] =
store.transact(QItem.findByChecksum(checksum, collective, Set.empty))
def findByFileSource(checksum: String, sourceId: Ident): F[Vector[RItem]] =
def findByFileSource(checksum: String, sourceId: Ident): F[Option[Vector[RItem]]] =
store.transact((for {
coll <- OptionT(RSource.findCollective(sourceId))
items <- OptionT.liftF(QItem.findByChecksum(checksum, coll, Set.empty))
} yield items).getOrElse(Vector.empty))
} yield items).value)
})
}

2
modules/restserver/src/main/scala/docspell/restserver/routes/CheckFileRoutes.scala
View File

@ -43,7 +43,7 @@ object CheckFileRoutes {
HttpRoutes.of { case GET -> Root / Ident(id) / checksum =>
for {
items <- backend.itemSearch.findByFileSource(checksum, id)
resp <- Ok(convert(items))
resp <- items.map(convert).map(Ok(_)).getOrElse(NotFound())
} yield resp
}
}