Address code remarks

lambdaworks · Dec 23, 2022 · 3ecefd6 · 3ecefd6
1 parent 6e6489d
commit 3ecefd6
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/modules/example/src/main/scala/example/RepositoriesElasticsearch.scala b/modules/example/src/main/scala/example/RepositoriesElasticsearch.scala
@@ -1,39 +1,42 @@
 package example
 
+import zio._
 import zio.elasticsearch.ElasticError.DocumentRetrievingError.DocumentNotFound
 import zio.elasticsearch.{DocumentId, ElasticExecutor, ElasticRequest, Routing}
-import zio.{RIO, Task, URLayer, ZIO, ZLayer}
 
 final case class RepositoriesElasticsearch(executor: ElasticExecutor) {
 
   def findById(organization: String, id: String): Task[Option[GitHubRepo]] =
     for {
-      routing <- Routing.make(organization).toZIO.mapError(e => new IllegalArgumentException(e))
+      routing <- routingOf(organization)
       req      = ElasticRequest.getById[GitHubRepo](Index, DocumentId(id)).routing(routing)
       res     <- executor.execute(req)
     } yield res.toOption
 
   def create(repository: GitHubRepo): Task[Option[DocumentId]] =
     for {
-      routing <- Routing.make(repository.organization).toZIO.mapError(e => new IllegalArgumentException(e))
+      routing <- routingOf(repository.organization)
       req      = ElasticRequest.create(Index, repository).routing(routing)
       res     <- executor.execute(req)
     } yield res
 
   def upsert(id: String, repository: GitHubRepo): Task[Unit] =
     for {
-      routing <- Routing.make(repository.organization).toZIO.mapError(e => new IllegalArgumentException(e))
+      routing <- routingOf(repository.organization)
       req      = ElasticRequest.upsert(Index, DocumentId(id), repository).routing(routing)
       _       <- executor.execute(req)
     } yield ()
 
   def remove(organization: String, id: String): Task[Either[DocumentNotFound.type, Unit]] =
     for {
-      routing <- Routing.make(organization).toZIO.mapError(e => new IllegalArgumentException(e))
+      routing <- routingOf(organization)
       req      = ElasticRequest.deleteById(Index, DocumentId(id)).routing(routing)
       res     <- executor.execute(req)
     } yield res
 
+  private def routingOf(value: String): IO[IllegalArgumentException, Routing.Type] =
+    Routing.make(value).toZIO.mapError(e => new IllegalArgumentException(e))
+
 }
 
 object RepositoriesElasticsearch {