cleanup

Author: mtumilowicz

customer/src/main/scala/app/CustomerAppConfig.scala

@@ -1,7 +1,6 @@
 package app
 
 import eu.timepit.refined.types.net.PortNumber
-import testcontainers.OrderContainer
 import zio.config.magnolia.descriptor
 import zio.config.refined._
 import zio.config.typesafe.TypesafeConfigSource
@@ -13,14 +12,6 @@ case class OrderServiceConfig(
     port: PortNumber,
 )
 
-object OrderServiceConfig {
-  def from(orderTestContainer: OrderContainer): OrderServiceConfig =
-    OrderServiceConfig(
-      "http://" + orderTestContainer.host,
-      PortNumber.unsafeFrom(orderTestContainer.externalPort),
-    )
-}
-
 case class CustomerAppConfig(
     port: PortNumber,
     orderServiceConfig: OrderServiceConfig,
@@ -31,7 +22,7 @@ object CustomerAppConfig {
   implicit val orderServiceConfig = descriptor[OrderServiceConfig]
   implicit val customerAppConfig  = descriptor[CustomerAppConfig]
 
-  val layer: Layer[ReadError[String], CustomerAppConfig] =
+  val live: Layer[ReadError[String], CustomerAppConfig] =
     ZLayer {
       zio.config.read {
         descriptor[CustomerAppConfig]

customer/src/main/scala/app/CustomerServer.scala

@@ -15,7 +15,7 @@ object CustomerServer extends ZIOAppDefault {
     _      <- Server.start(config.port, CustomerHttpFacade.endpoints)
   } yield ExitCode.success)
     .provideSome(
-      CustomerAppConfig.layer,
+      CustomerAppConfig.live,
       OrderService.layer,
       HttpClientZioBackend.layer(),
     )

customer/src/test/scala/app/CustomerHttp2Spec.scala

@@ -41,12 +41,6 @@ object CustomerHttp2Spec extends SharedOrderContainerSpec {
           apiOutput <- ZIO.fromEither(CustomerApiOutput.codec.decoder.decodeJson(body))
         } yield assert(apiOutput)(equalTo(expectedApiOutput))
       },
-    ).provideSome[Scope with OrderContainer](OrderService.layer, HttpClientZioBackend.layer(), testCustomerAppConfig)
-
-  val testCustomerAppConfig = ZLayer.fromZIO {
-    for {
-      orderTestContainer <- ZIO.service[OrderContainer]
-    } yield CustomerAppConfig(1, OrderServiceConfig.from(orderTestContainer))
-  }
+    ).provideSome[Scope with OrderContainer](OrderService.layer, HttpClientZioBackend.layer(), TestAppConfig.live)
 
 }

customer/src/test/scala/app/CustomerHttp3Spec.scala

@@ -41,12 +41,6 @@ object CustomerHttp3Spec extends SharedOrderContainerSpec {
           apiOutput <- ZIO.fromEither(CustomerApiOutput.codec.decoder.decodeJson(body))
         } yield assert(apiOutput)(equalTo(expectedApiOutput))
       },
-    ).provideSome[Scope with OrderContainer](OrderService.layer, HttpClientZioBackend.layer(), testCustomerAppConfig)
-
-  val testCustomerAppConfig = ZLayer.fromZIO {
-    for {
-      orderTestContainer <- ZIO.service[OrderContainer]
-    } yield CustomerAppConfig(1, OrderServiceConfig.from(orderTestContainer))
-  }
+    ).provideSome[Scope with OrderContainer](OrderService.layer, HttpClientZioBackend.layer(), TestAppConfig.live)
 
 }

customer/src/test/scala/app/CustomerHttpSpec.scala

@@ -42,12 +42,6 @@ object CustomerHttpSpec extends ZIOSpecDefault {
         } yield assert(apiOutput)(equalTo(expectedApiOutput))
       },
     ).provideSome[Scope with CustomerAppConfig](OrderService.layer, HttpClientZioBackend.layer())
-      .provideSomeShared(OrderContainer.live, testCustomerAppConfig)
-
-  val testCustomerAppConfig = ZLayer.fromZIO {
-    for {
-      orderTestContainer <- ZIO.service[OrderContainer]
-    } yield CustomerAppConfig(1, OrderServiceConfig.from(orderTestContainer))
-  }
+      .provideSomeShared(OrderContainer.live, TestAppConfig.live)
 
 }

customer/src/test/scala/app/TestAppConfig.scala

@@ -0,0 +1,22 @@
+package app
+
+import eu.timepit.refined.auto._
+import eu.timepit.refined.types.all.PortNumber
+import testcontainers.OrderContainer
+import zio.{ URLayer, ZIO, ZLayer }
+
+object TestAppConfig {
+
+  val live: URLayer[OrderContainer, CustomerAppConfig] = ZLayer.fromZIO {
+    for {
+      orderTestContainer <- ZIO.service[OrderContainer]
+      orderServiceConfig = createOrderServiceConfig(orderTestContainer)
+    } yield CustomerAppConfig(1, orderServiceConfig)
+  }
+  private def createOrderServiceConfig(orderTestContainer: OrderContainer): OrderServiceConfig =
+    OrderServiceConfig(
+      "http://" + orderTestContainer.host,
+      PortNumber.unsafeFrom(orderTestContainer.externalPort),
+    )
+
+}