TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-07 07:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made multi id read logic sharable

Browse Source
This commit is contained in:
Stefan Scheidewig 2021-04-15 18:03:58 +02:00
parent 037d8e818d
commit 93f772351a
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/restserver/src/main/scala/docspell/restserver/conv/MultiIdSupport.scala Normal file
View File

@ -0,0 +1,31 @@
package docspell.restserver.conv
import cats.data.NonEmptyList
import cats.implicits._
import cats.{ApplicativeError, MonadError}
import docspell.common.Ident
import io.circe.DecodingFailure
trait MultiIdSupport {
protected def readId[F[_]](
id: String
)(implicit F: ApplicativeError[F, Throwable]): F[Ident] =
Ident
.fromString(id)
.fold(
err => F.raiseError(DecodingFailure(err, Nil)),
F.pure
)
protected def readIds[F[_]](ids: List[String])(implicit
F: MonadError[F, Throwable]
): F[NonEmptyList[Ident]] =
ids.traverse(readId[F]).map(NonEmptyList.fromList).flatMap {
case Some(nel) => nel.pure[F]
case None =>
F.raiseError(
DecodingFailure("Empty list found, at least one element required", Nil)
)
}
}

33
modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala
View File

@ -1,25 +1,19 @@
package docspell.restserver.routes package docspell.restserver.routes
import cats.ApplicativeError
import cats.MonadError
import cats.data.NonEmptyList
import cats.effect._ import cats.effect._
import cats.implicits._ import cats.implicits._
import docspell.backend.BackendApp import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import docspell.backend.ops.OCustomFields.{RemoveValue, SetValue} import docspell.backend.ops.OCustomFields.{RemoveValue, SetValue}
import docspell.common.{Ident, ItemState} import docspell.common.ItemState
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.conv.Conversions import docspell.restserver.conv.{Conversions, MultiIdSupport}
import io.circe.DecodingFailure
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.circe.CirceEntityDecoder._ import org.http4s.circe.CirceEntityDecoder._
import org.http4s.circe.CirceEntityEncoder._ import org.http4s.circe.CirceEntityEncoder._
import org.http4s.dsl.Http4sDsl import org.http4s.dsl.Http4sDsl
object ItemMultiRoutes { object ItemMultiRoutes extends MultiIdSupport {
def apply[F[_]: Effect]( def apply[F[_]: Effect](
backend: BackendApp[F], backend: BackendApp[F],
@ -215,25 +209,4 @@ object ItemMultiRoutes {
def notEmpty: Option[String] = def notEmpty: Option[String] =
Option(str).notEmpty Option(str).notEmpty
} }
private def readId[F[_]](
id: String
)(implicit F: ApplicativeError[F, Throwable]): F[Ident] =
Ident
.fromString(id)
.fold(
err => F.raiseError(DecodingFailure(err, Nil)),
F.pure
)
private def readIds[F[_]](ids: List[String])(implicit
F: MonadError[F, Throwable]
): F[NonEmptyList[Ident]] =
ids.traverse(readId[F]).map(NonEmptyList.fromList).flatMap {
case Some(nel) => nel.pure[F]
case None =>
F.raiseError(
DecodingFailure("Empty list found, at least one element required", Nil)
)
}
} }