diff --git a/build.sbt b/build.sbt index 0daf796..6152097 100644 --- a/build.sbt +++ b/build.sbt @@ -95,6 +95,7 @@ ) // Revolver.enableDebugging(port = 5005, suspend = true) ) + .dependsOn(core.jvm) lazy val root = (project in file(".")) .settings(name := "mdr-personnel-db", publish / skip := true) diff --git a/build.sbt b/build.sbt index 0daf796..6152097 100644 --- a/build.sbt +++ b/build.sbt @@ -95,6 +95,7 @@ ) // Revolver.enableDebugging(port = 5005, suspend = true) ) + .dependsOn(core.jvm) lazy val root = (project in file(".")) .settings(name := "mdr-personnel-db", publish / skip := true) diff --git a/core/src/main/scala/mdr/pdb/api/CustomTapir.scala b/core/src/main/scala/mdr/pdb/api/CustomTapir.scala new file mode 100644 index 0000000..4889939 --- /dev/null +++ b/core/src/main/scala/mdr/pdb/api/CustomTapir.scala @@ -0,0 +1,10 @@ +package mdr.pdb.api + +import sttp.tapir.Tapir +import sttp.tapir.ztapir.ZTapir +import sttp.tapir.json.zio.TapirJsonZio +import sttp.tapir.TapirAliases + +trait CustomTapir extends Tapir with ZTapir with TapirJsonZio with TapirAliases + +object CustomTapir extends CustomTapir diff --git a/build.sbt b/build.sbt index 0daf796..6152097 100644 --- a/build.sbt +++ b/build.sbt @@ -95,6 +95,7 @@ ) // Revolver.enableDebugging(port = 5005, suspend = true) ) + .dependsOn(core.jvm) lazy val root = (project in file(".")) .settings(name := "mdr-personnel-db", publish / skip := true) diff --git a/core/src/main/scala/mdr/pdb/api/CustomTapir.scala b/core/src/main/scala/mdr/pdb/api/CustomTapir.scala new file mode 100644 index 0000000..4889939 --- /dev/null +++ b/core/src/main/scala/mdr/pdb/api/CustomTapir.scala @@ -0,0 +1,10 @@ +package mdr.pdb.api + +import sttp.tapir.Tapir +import sttp.tapir.ztapir.ZTapir +import sttp.tapir.json.zio.TapirJsonZio +import sttp.tapir.TapirAliases + +trait CustomTapir extends Tapir with ZTapir with TapirJsonZio with TapirAliases + +object CustomTapir extends CustomTapir diff --git a/core/src/main/scala/mdr/pdb/api/Endpoints.scala b/core/src/main/scala/mdr/pdb/api/Endpoints.scala new file mode 100644 index 0000000..bc1806d --- /dev/null +++ b/core/src/main/scala/mdr/pdb/api/Endpoints.scala @@ -0,0 +1,8 @@ +package mdr.pdb.api + +import sttp.tapir.Endpoint + +object Endpoints extends CustomTapir: + + val alive: Endpoint[Unit, Unit, Unit, String, Any] = + endpoint.in("alive").out(stringBody) diff --git a/build.sbt b/build.sbt index 0daf796..6152097 100644 --- a/build.sbt +++ b/build.sbt @@ -95,6 +95,7 @@ ) // Revolver.enableDebugging(port = 5005, suspend = true) ) + .dependsOn(core.jvm) lazy val root = (project in file(".")) .settings(name := "mdr-personnel-db", publish / skip := true) diff --git a/core/src/main/scala/mdr/pdb/api/CustomTapir.scala b/core/src/main/scala/mdr/pdb/api/CustomTapir.scala new file mode 100644 index 0000000..4889939 --- /dev/null +++ b/core/src/main/scala/mdr/pdb/api/CustomTapir.scala @@ -0,0 +1,10 @@ +package mdr.pdb.api + +import sttp.tapir.Tapir +import sttp.tapir.ztapir.ZTapir +import sttp.tapir.json.zio.TapirJsonZio +import sttp.tapir.TapirAliases + +trait CustomTapir extends Tapir with ZTapir with TapirJsonZio with TapirAliases + +object CustomTapir extends CustomTapir diff --git a/core/src/main/scala/mdr/pdb/api/Endpoints.scala b/core/src/main/scala/mdr/pdb/api/Endpoints.scala new file mode 100644 index 0000000..bc1806d --- /dev/null +++ b/core/src/main/scala/mdr/pdb/api/Endpoints.scala @@ -0,0 +1,8 @@ +package mdr.pdb.api + +import sttp.tapir.Endpoint + +object Endpoints extends CustomTapir: + + val alive: Endpoint[Unit, Unit, Unit, String, Any] = + endpoint.in("alive").out(stringBody) diff --git a/server/src/main/scala/mdr/pdb/server/CustomTapir.scala b/server/src/main/scala/mdr/pdb/server/CustomTapir.scala index bf8e8dd..680b178 100644 --- a/server/src/main/scala/mdr/pdb/server/CustomTapir.scala +++ b/server/src/main/scala/mdr/pdb/server/CustomTapir.scala @@ -7,9 +7,8 @@ import zio.* import sttp.tapir.ztapir.ZTapir -object CustomTapir - extends Tapir - with ZTapir +trait CustomTapir + extends mdr.pdb.api.CustomTapir with ZHttp4sServerInterpreter[AppEnv] - with TapirJsonZio - with TapirAliases + +object CustomTapir extends CustomTapir diff --git a/build.sbt b/build.sbt index 0daf796..6152097 100644 --- a/build.sbt +++ b/build.sbt @@ -95,6 +95,7 @@ ) // Revolver.enableDebugging(port = 5005, suspend = true) ) + .dependsOn(core.jvm) lazy val root = (project in file(".")) .settings(name := "mdr-personnel-db", publish / skip := true) diff --git a/core/src/main/scala/mdr/pdb/api/CustomTapir.scala b/core/src/main/scala/mdr/pdb/api/CustomTapir.scala new file mode 100644 index 0000000..4889939 --- /dev/null +++ b/core/src/main/scala/mdr/pdb/api/CustomTapir.scala @@ -0,0 +1,10 @@ +package mdr.pdb.api + +import sttp.tapir.Tapir +import sttp.tapir.ztapir.ZTapir +import sttp.tapir.json.zio.TapirJsonZio +import sttp.tapir.TapirAliases + +trait CustomTapir extends Tapir with ZTapir with TapirJsonZio with TapirAliases + +object CustomTapir extends CustomTapir diff --git a/core/src/main/scala/mdr/pdb/api/Endpoints.scala b/core/src/main/scala/mdr/pdb/api/Endpoints.scala new file mode 100644 index 0000000..bc1806d --- /dev/null +++ b/core/src/main/scala/mdr/pdb/api/Endpoints.scala @@ -0,0 +1,8 @@ +package mdr.pdb.api + +import sttp.tapir.Endpoint + +object Endpoints extends CustomTapir: + + val alive: Endpoint[Unit, Unit, Unit, String, Any] = + endpoint.in("alive").out(stringBody) diff --git a/server/src/main/scala/mdr/pdb/server/CustomTapir.scala b/server/src/main/scala/mdr/pdb/server/CustomTapir.scala index bf8e8dd..680b178 100644 --- a/server/src/main/scala/mdr/pdb/server/CustomTapir.scala +++ b/server/src/main/scala/mdr/pdb/server/CustomTapir.scala @@ -7,9 +7,8 @@ import zio.* import sttp.tapir.ztapir.ZTapir -object CustomTapir - extends Tapir - with ZTapir +trait CustomTapir + extends mdr.pdb.api.CustomTapir with ZHttp4sServerInterpreter[AppEnv] - with TapirJsonZio - with TapirAliases + +object CustomTapir extends CustomTapir diff --git a/server/src/main/scala/mdr/pdb/server/api/Routes.scala b/server/src/main/scala/mdr/pdb/server/api/Routes.scala index 8cb5617..4019e4f 100644 --- a/server/src/main/scala/mdr/pdb/server/api/Routes.scala +++ b/server/src/main/scala/mdr/pdb/server/api/Routes.scala @@ -1,12 +1,20 @@ package mdr.pdb.server package api +import zio.* +import zio.interop.catz.* +import zio.interop.catz.implicits.{*, given} import org.http4s.AuthedRoutes +import mdr.pdb.api.Endpoints +import org.http4s.server.Router class Routes(): import CustomTapir.* - val serverEndpoints: List[ZServerEndpoint[AppEnv, Any]] = Nil + val alive: ZServerEndpoint[AppEnv, Any] = + Endpoints.alive.zServerLogic(_ => ZIO.succeed("ok")) + + val serverEndpoints: List[ZServerEndpoint[AppEnv, Any]] = List(alive) val routes: AuthedRoutes[AppAuth, AppTask] = - CustomTapir.from(serverEndpoints).toRoutes.local(_.req) + Router("pdb/api" -> CustomTapir.from(serverEndpoints).toRoutes).local(_.req)