refactor: ziofy ProjectsResponderV1 (DEV-1746) (#2476)

Co-authored-by: irinaschubert <irina.schubert@dasch.swiss>
dasch-swiss · Feb 25, 2023 · 715c117 · 715c117
1 parent b5bd82b
commit 715c117
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 118 deletions.
diff --git a/webapi/src/it/scala/org/knora/webapi/core/LayersTest.scala b/webapi/src/it/scala/org/knora/webapi/core/LayersTest.scala
@@ -44,6 +44,8 @@ import org.knora.webapi.responders.admin.SipiResponderADM
 import org.knora.webapi.responders.admin.SipiResponderADMLive
 import org.knora.webapi.responders.admin.PermissionsResponderADM
 import org.knora.webapi.responders.admin.PermissionsResponderADMLive
+import org.knora.webapi.responders.v1.ProjectsResponderV1
+import org.knora.webapi.responders.v1.ProjectsResponderV1Live
 import org.knora.webapi.responders.v1.OntologyResponderV1
 import org.knora.webapi.responders.v1.OntologyResponderV1Live
 import org.knora.webapi.responders.v1.CkanResponderV1
@@ -79,6 +81,7 @@ object LayersTest {
     with OntologyResponderV1
     with PermissionsResponderADM
     with ProjectsResponderADM
+    with ProjectsResponderV1
     with RepositoryUpdater
     with ResourceInfoRepo
     with RestCardinalityService
@@ -115,6 +118,7 @@ object LayersTest {
       OntologyRepoLive.layer,
       PermissionsResponderADMLive.layer,
       ProjectsResponderADMLive.layer,
+      ProjectsResponderV1Live.layer,
       PredicateRepositoryLive.layer,
       RepositoryUpdater.layer,
       ResourceInfoRepo.layer,

diff --git a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala
@@ -34,6 +34,8 @@ import org.knora.webapi.responders.v1.CkanResponderV1
 import org.knora.webapi.responders.v1.CkanResponderV1Live
 import org.knora.webapi.responders.v1.OntologyResponderV1
 import org.knora.webapi.responders.v1.OntologyResponderV1Live
+import org.knora.webapi.responders.v1.ProjectsResponderV1
+import org.knora.webapi.responders.v1.ProjectsResponderV1Live
 import org.knora.webapi.routing.ApiRoutes
 import org.knora.webapi.routing.admin.AuthenticatorService
 import org.knora.webapi.routing.admin.ProjectsRouteZ
@@ -82,6 +84,7 @@ object LayersLive {
       with OntologyResponderV1
       with PermissionsResponderADM
       with ProjectsResponderADM
+      with ProjectsResponderV1
       with RepositoryUpdater
       with RestResourceInfoService
       with RestCardinalityService
@@ -127,6 +130,7 @@ object LayersLive {
       PredicateRepositoryLive.layer,
       ProjectsRouteZ.layer,
       ProjectsResponderADMLive.layer,
+      ProjectsResponderV1Live.layer,
       ProjectsServiceLive.layer,
       RepositoryUpdater.layer,
       ResourceInfoRepo.layer,

diff --git a/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala b/webapi/src/main/scala/org/knora/webapi/core/actors/RoutingActor.scala
@@ -19,7 +19,6 @@ import org.knora.webapi.messages.store.sipimessages.IIIFRequest
 import org.knora.webapi.messages.store.triplestoremessages.TriplestoreRequest
 import org.knora.webapi.messages.util.ResponderData
 import org.knora.webapi.messages.v1.responder.listmessages.ListsResponderRequestV1
-import org.knora.webapi.messages.v1.responder.projectmessages.ProjectsResponderRequestV1
 import org.knora.webapi.messages.v1.responder.resourcemessages.ResourcesResponderRequestV1
 import org.knora.webapi.messages.v1.responder.searchmessages.SearchResponderRequestV1
 import org.knora.webapi.messages.v1.responder.standoffmessages.StandoffResponderRequestV1
@@ -61,7 +60,6 @@ final case class RoutingActor(
   private val usersResponderV1: UsersResponderV1         = new UsersResponderV1(responderData)
   private val listsResponderV1: ListsResponderV1         = new ListsResponderV1(responderData)
   private val searchResponderV1: SearchResponderV1       = new SearchResponderV1(responderData)
-  private val projectsResponderV1: ProjectsResponderV1   = ProjectsResponderV1(actorDeps)
 
   // V2 responders
   private val ontologiesResponderV2: OntologyResponderV2 = OntologyResponderV2(responderData, runtime)
@@ -88,8 +86,6 @@ final case class RoutingActor(
       ActorUtil.future2Message(sender(), standoffResponderV1.receive(standoffResponderRequestV1), log)
     case usersResponderRequestV1: UsersResponderRequestV1 =>
       ActorUtil.future2Message(sender(), usersResponderV1.receive(usersResponderRequestV1), log)
-    case projectsResponderRequestV1: ProjectsResponderRequestV1 =>
-      ActorUtil.future2Message(sender(), projectsResponderV1.receive(projectsResponderRequestV1), log)
 
     // V2 request messages
     case ontologiesResponderRequestV2: OntologiesResponderRequestV2 =>

diff --git a/...main/scala/org/knora/webapi/messages/v1/responder/projectmessages/ProjectMessagesV1.scala b/...main/scala/org/knora/webapi/messages/v1/responder/projectmessages/ProjectMessagesV1.scala
@@ -13,6 +13,7 @@ import spray.json.NullOptions
 import spray.json.RootJsonFormat
 
 import org.knora.webapi.IRI
+import org.knora.webapi.core.RelayedMessage
 import org.knora.webapi.messages.ResponderRequest.KnoraRequestV1
 import org.knora.webapi.messages.v1.responder.KnoraResponseV1
 import org.knora.webapi.messages.v1.responder.usermessages.UserProfileV1
@@ -28,7 +29,7 @@ import org.knora.webapi.messages.v1.responder.usermessages.UserProfileV1
 /**
  * An abstract trait representing a request message that can be sent to [[org.knora.webapi.responders.v1.ProjectsResponderV1]].
  */
-sealed trait ProjectsResponderRequestV1 extends KnoraRequestV1
+sealed trait ProjectsResponderRequestV1 extends KnoraRequestV1 with RelayedMessage
 
 // Requests
 /**