From 93f772351a3f125416c7b18b3ceec5a064a36da5 Mon Sep 17 00:00:00 2001
From: Stefan Scheidewig <stefan.scheidewig@staffbase.com>
Date: Thu, 15 Apr 2021 18:03:58 +0200
Subject: [PATCH] Made multi id read logic sharable

---
 .../restserver/conv/MultiIdSupport.scala      | 31 +++++++++++++++++
 .../restserver/routes/ItemMultiRoutes.scala   | 33 ++-----------------
 2 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 modules/restserver/src/main/scala/docspell/restserver/conv/MultiIdSupport.scala

diff --git a/modules/restserver/src/main/scala/docspell/restserver/conv/MultiIdSupport.scala b/modules/restserver/src/main/scala/docspell/restserver/conv/MultiIdSupport.scala
new file mode 100644
index 00000000..4dbc895b
--- /dev/null
+++ b/modules/restserver/src/main/scala/docspell/restserver/conv/MultiIdSupport.scala
@@ -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)
+        )
+    }
+}
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala
index 4b15689c..270a44a9 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala
@@ -1,25 +1,19 @@
 package docspell.restserver.routes
 
-import cats.ApplicativeError
-import cats.MonadError
-import cats.data.NonEmptyList
 import cats.effect._
 import cats.implicits._
-
 import docspell.backend.BackendApp
 import docspell.backend.auth.AuthToken
 import docspell.backend.ops.OCustomFields.{RemoveValue, SetValue}
-import docspell.common.{Ident, ItemState}
+import docspell.common.ItemState
 import docspell.restapi.model._
-import docspell.restserver.conv.Conversions
-
-import io.circe.DecodingFailure
+import docspell.restserver.conv.{Conversions, MultiIdSupport}
 import org.http4s.HttpRoutes
 import org.http4s.circe.CirceEntityDecoder._
 import org.http4s.circe.CirceEntityEncoder._
 import org.http4s.dsl.Http4sDsl
 
-object ItemMultiRoutes {
+object ItemMultiRoutes extends MultiIdSupport {
 
   def apply[F[_]: Effect](
       backend: BackendApp[F],
@@ -215,25 +209,4 @@ object ItemMultiRoutes {
     def notEmpty: Option[String] =
       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)
-        )
-    }
 }