refactor: Remove UserResponder (DEV-3291) (#3217)

dasch-swiss · Apr 26, 2024 · f2f08b3 · f2f08b3
1 parent d75c9b5
commit f2f08b3
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 76 deletions.
diff --git a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala
@@ -139,7 +139,6 @@ object LayersTest {
       TriplestoreService &
       UserRestService &
       UserService &
-      UsersResponder &
       ValuesResponderV2
 
   private val commonLayersForAllIntegrationTests =
@@ -204,7 +203,6 @@ object LayersTest {
       TestClientService.layer,
       TriplestoreServiceLive.layer,
       UserService.layer,
-      UsersResponder.layer,
       ValuesResponderV2Live.layer,
     )
 

diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectRestServiceSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectRestServiceSpec.scala
@@ -3,10 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * To be able to test UsersResponder, we need to be able to start UsersResponder isolated. Now the UsersResponder
- * extend ResponderADM which messes up testing, as we cannot inject the TestActor system.
- */
 package org.knora.webapi.responders.admin
 
 import org.apache.pekko.testkit.ImplicitSender

diff --git a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala
@@ -124,7 +124,6 @@ object LayersLive {
       TriplestoreService &
       UserRestService &
       UserService &
-      UsersResponder &
       ValuesResponderV2
 
   /**
@@ -192,7 +191,6 @@ object LayersLive {
       TapirToPekkoInterpreter.layer,
       TriplestoreServiceLive.layer,
       UserService.layer,
-      UsersResponder.layer,
       ValuesResponderV2Live.layer,
       org.knora.webapi.core.ActorSystem.layer,
     )

diff --git a/...main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala b/...main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala
@@ -8,8 +8,6 @@ package org.knora.webapi.messages.admin.responder.usersmessages
 import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
 import spray.json._
 
-import org.knora.webapi.core.RelayedMessage
-import org.knora.webapi.messages.ResponderRequest.KnoraRequestADM
 import org.knora.webapi.messages.admin.responder.AdminKnoraResponseADM
 import org.knora.webapi.messages.admin.responder.groupsmessages.GroupsADMJsonProtocol
 import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsADMJsonProtocol
@@ -18,24 +16,6 @@ import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectsADMJso
 import org.knora.webapi.slice.admin.domain.model.Group
 import org.knora.webapi.slice.admin.domain.model._
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Messages
-
-/**
- * An abstract trait representing message that can be sent to `UsersResponderADM`.
- */
-sealed trait UsersResponderRequestADM extends KnoraRequestADM with RelayedMessage
-
-/**
- * A message that requests a user's profile by IRI. A successful response will be a [[User]].
- *
- * @param identifier             the IRI of the user to be queried.
- * @param userInformationTypeADM the extent of the information returned.
- * @param requestingUser         the user initiating the request.
- */
-case class UserGetByIriADM(identifier: UserIri, userInformationTypeADM: UserInformationType, requestingUser: User)
-    extends UsersResponderRequestADM
-
 // Responses
 
 /**

diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponder.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponder.scala
diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala
@@ -11,7 +11,6 @@ import org.knora.webapi.config.AppConfig
 import org.knora.webapi.responders.admin.AssetPermissionsResponder
 import org.knora.webapi.responders.admin.ListsResponder
 import org.knora.webapi.responders.admin.PermissionsResponder
-import org.knora.webapi.responders.admin.UsersResponder
 import org.knora.webapi.slice.admin.api.service.GroupRestService
 import org.knora.webapi.slice.admin.api.service.MaintenanceRestService
 import org.knora.webapi.slice.admin.api.service.PermissionRestService
@@ -61,8 +60,7 @@ object AdminApiModule {
       ProjectService &
       TapirToPekkoInterpreter &
       TriplestoreService &
-      UserService &
-      UsersResponder
+      UserService
 
   type Provided = AdminApiEndpoints &
     AdminApiRoutes &

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UserRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UserRestService.scala
@@ -16,7 +16,6 @@ import org.knora.webapi.messages.admin.responder.usersmessages.UserProjectAdminM
 import org.knora.webapi.messages.admin.responder.usersmessages.UserProjectMembershipsGetResponseADM
 import org.knora.webapi.messages.admin.responder.usersmessages.UserResponseADM
 import org.knora.webapi.messages.admin.responder.usersmessages.UsersGetResponseADM
-import org.knora.webapi.responders.admin.UsersResponder
 import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests
 import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.BasicUserInformationChangeRequest
 import org.knora.webapi.slice.admin.api.UsersEndpoints.Requests.PasswordChangeRequest
@@ -47,7 +46,6 @@ final case class UserRestService(
   knoraUserToUserConverter: KnoraUserToUserConverter,
   passwordService: PasswordService,
   projectService: ProjectService,
-  responder: UsersResponder,
   format: KnoraResponseRenderer,
 ) {