refactor: Remove zio.accessible makro (Scala3 migration) (#3126)

dasch-swiss · Mar 18, 2024 · d753fcc · d753fcc
1 parent e2e57c1
commit d753fcc
Show file tree

Hide file tree

Showing 27 changed files with 530 additions and 416 deletions.
diff --git a/integration/src/test/scala/org/knora/sipi/SipiIT.scala b/integration/src/test/scala/org/knora/sipi/SipiIT.scala
@@ -42,10 +42,11 @@ object SipiIT extends ZIOSpecDefault {
       .map(Request.get)
       .flatMap(Client.request(_))
 
-  private val getToken = JwtService
-    .createJwt(SystemUser)
-    .map(_.jwtString)
-    .provide(JwtServiceLive.layer, AppConfig.layer)
+  private val getToken =
+    ZIO
+      .serviceWithZIO[JwtService](_.createJwt(SystemUser))
+      .map(_.jwtString)
+      .provide(JwtServiceLive.layer, AppConfig.layer)
 
   private val cookiesSuite =
     suite("Given a request is authorized using cookies")(

diff --git a/integration/src/test/scala/org/knora/webapi/CoreSpec.scala b/integration/src/test/scala/org/knora/webapi/CoreSpec.scala
@@ -13,6 +13,7 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import zio.*
+import zio.ZIO
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.FiniteDuration
@@ -24,7 +25,9 @@ import org.knora.webapi.core.AppServer
 import org.knora.webapi.core.LayersTest.DefaultTestEnvironmentWithoutSipi
 import org.knora.webapi.core.TestStartupUtils
 import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject
+import org.knora.webapi.routing.JwtService
 import org.knora.webapi.routing.UnsafeZioRun
+import org.knora.webapi.slice.admin.domain.model.User
 import org.knora.webapi.util.LogAspect
 
 abstract class CoreSpec
@@ -114,4 +117,5 @@ abstract class CoreSpec
       runtime.unsafe.shutdown()
     }
 
+  protected def createJwtTokenString(user: User) = ZIO.serviceWithZIO[JwtService](_.createJwt(user)).map(_.jwtString)
 }
diff --git a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala
@@ -37,6 +37,7 @@ import org.knora.webapi.slice.admin.api.service.ProjectsADMRestServiceLive
 import org.knora.webapi.slice.admin.api.service.StoreRestService
 import org.knora.webapi.slice.admin.api.service.UsersRestService
 import org.knora.webapi.slice.admin.domain.service.*
+import org.knora.webapi.slice.admin.domain.service.MaintenanceService
 import org.knora.webapi.slice.admin.repo.service.KnoraGroupRepoLive
 import org.knora.webapi.slice.admin.repo.service.KnoraProjectRepoLive
 import org.knora.webapi.slice.admin.repo.service.KnoraUserRepoLive
@@ -201,7 +202,7 @@ object LayersTest {
       MaintenanceEndpoints.layer,
       MaintenanceEndpointsHandlers.layer,
       MaintenanceRestService.layer,
-      MaintenanceServiceLive.layer,
+      MaintenanceService.layer,
       ManagementRoutes.layer,
       MessageRelayLive.layer,
       OntologyCacheLive.layer,

diff --git a/...nora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala b/...nora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala
@@ -5,6 +5,8 @@
 
 package org.knora.webapi.messages.admin.responder.permissionsmessages
 
+import zio.ZIO
+
 import java.util.UUID
 
 import dsp.errors.BadRequestException
@@ -481,7 +483,8 @@ class PermissionsMessagesADMSpec extends CoreSpec {
           permissionCode = Some(8),
         ),
       )
-      val exit = UnsafeZioRun.run(PermissionsResponderADM.verifyHasPermissionsDOAP(hasPermissions))
+      val exit =
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         "Invalid value for name parameter of hasPermissions: invalid, it should be one of " +
@@ -499,7 +502,8 @@ class PermissionsMessagesADMSpec extends CoreSpec {
         ),
       )
 
-      val exit = UnsafeZioRun.run(PermissionsResponderADM.verifyHasPermissionsDOAP(hasPermissions))
+      val exit =
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         s"Invalid value for permissionCode parameter of hasPermissions: $invalidCode, it should be one of " +
@@ -518,7 +522,8 @@ class PermissionsMessagesADMSpec extends CoreSpec {
         ),
       )
 
-      val exit = UnsafeZioRun.run(PermissionsResponderADM.verifyHasPermissionsDOAP(hasPermissions))
+      val exit =
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         s"Given permission code $code and permission name $name are not consistent.",
@@ -535,7 +540,8 @@ class PermissionsMessagesADMSpec extends CoreSpec {
         ),
       )
 
-      val exit = UnsafeZioRun.run(PermissionsResponderADM.verifyHasPermissionsDOAP(hasPermissions))
+      val exit =
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         s"One of permission code or permission name must be provided for a default object access permission.",
@@ -551,7 +557,8 @@ class PermissionsMessagesADMSpec extends CoreSpec {
           permissionCode = Some(8),
         ),
       )
-      val exit = UnsafeZioRun.run(PermissionsResponderADM.verifyHasPermissionsDOAP(hasPermissions))
+      val exit =
+        UnsafeZioRun.run(ZIO.serviceWithZIO[PermissionsResponderADM](_.verifyHasPermissionsDOAP(hasPermissions)))
       assertFailsWithA[BadRequestException](
         exit,
         s"additionalInformation of a default object access permission type cannot be empty.",