diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java index d79a4046cfb52ecd298b2cf8f23fa27ca390dccb..1a04366ac409d78315b1104107e46dcf01843437 100644 --- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java +++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java @@ -32,12 +32,16 @@ import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService; import de.ozgcloud.apilib.file.OzgCloudFileService; import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService; import de.ozgcloud.apilib.file.grpc.OzgCloudFileMapper; +import de.ozgcloud.apilib.user.GrpcOzgCloudUserProfileService; +import de.ozgcloud.apilib.user.OzgCloudUserProfileService; +import de.ozgcloud.apilib.user.UserProfileMapper; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService; import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService; import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper; import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangQueryMapper; import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper; import de.ozgcloud.collaboration.common.callcontext.CollaborationManagerCallContextProvider; +import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub; import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub; import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub; import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub; @@ -50,6 +54,7 @@ public class CollaborationManagerConfiguration { public static final String COMMAND_SERVICE_NAME = "collaboration_OzgCloudCommandService"; public static final String FILE_SERVICE_NAME = "collaboration_OzgCloudFileService"; public static final String CURRENT_USER_SERVICE_NAME = "collaboration_CurrentUserService"; + public static final String OZG_CLOUD_USER_PROFILE_SERVICE_NAME = "collaboration_OzgCloudUserProfileService"; public static final String USER_PROFILE_SERVICE_NAME = "collaboration_UserProfileService"; public static final String VORGANG_SERVICE_NAME = "collaboration_VorgangService"; public static final String VORGANG_REMOTE_SERVICE_NAME = "collaboration_VorgangRemoteService"; @@ -66,6 +71,7 @@ public class CollaborationManagerConfiguration { public static final String GRPC_VORGANG_MANAGER_NAME = "vorgang-manager"; public static final String GRPC_COMMAND_MANAGER_NAME = "command-manager"; public static final String GRPC_FILE_MANAGER_NAME = "file-manager"; + public static final String GRPC_USER_MANAGER_NAME = "user-manager"; public static final String GRPC_VORGANG_ATTACHED_ITEM_SERVICE_NAME = "vorgang-attached-item"; @GrpcClient(GRPC_COMMAND_MANAGER_NAME) @@ -79,6 +85,9 @@ public class CollaborationManagerConfiguration { @GrpcClient(GRPC_FILE_MANAGER_NAME) private BinaryFileServiceStub binaryFileServiceAsyncStub; + @GrpcClient(GRPC_USER_MANAGER_NAME) + private UserProfileServiceBlockingStub userProfileServiceStub; + @Bean(COMMAND_SERVICE_NAME) // NOSONAR OzgCloudCommandService grpcOzgCloudCommandService(CommandMapper commandMapper, CollaborationManagerCallContextProvider contextProvider) { return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider, @@ -95,4 +104,10 @@ public class CollaborationManagerConfiguration { OzgCloudVorgangQueryMapper vorgangQueryMapper, CollaborationManagerCallContextProvider contextProvider) { return new GrpcOzgCloudVorgangService(vorgangServiceStub, vorgangMapper, vorgangStubMapper, vorgangQueryMapper, contextProvider); } + + @Bean(OZG_CLOUD_USER_PROFILE_SERVICE_NAME) + OzgCloudUserProfileService grpcOzgCloudUserProfileService(UserProfileMapper userProfileMapper, + CollaborationManagerCallContextProvider contextProvider) { + return new GrpcOzgCloudUserProfileService(userProfileServiceStub, userProfileMapper, contextProvider); + } } \ No newline at end of file diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java index bc2d3eb7d30f86954cf98ef31c206083e61a978a..bed150f52e2ca8f78e7f916753aa5ae21be2501b 100644 --- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java +++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java @@ -41,6 +41,7 @@ public class UserProfileService { @Qualifier(CollaborationManagerConfiguration.CURRENT_USER_SERVICE_NAME) // NOSONAR private final CurrentUserService currentUserService; + @Qualifier(CollaborationManagerConfiguration.OZG_CLOUD_USER_PROFILE_SERVICE_NAME) private final Optional<OzgCloudUserProfileService> ozgCloudUserProfileService; private final CollaborationUserProfileMapper mapper; diff --git a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationTestApplication.java b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationTestApplication.java index 9392a463895639476757304f3d39fe4ceb9a4380..00fe9fc895a8d24b3c3983740930f9d5a53cebda 100644 --- a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationTestApplication.java +++ b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationTestApplication.java @@ -35,6 +35,7 @@ import org.springframework.security.authentication.AuthenticationTrustResolverIm import de.ozgcloud.apilib.common.command.grpc.CommandMapper; import de.ozgcloud.apilib.common.command.grpc.CommandMapperImpl; import de.ozgcloud.apilib.file.OzgCloudFileService; +import de.ozgcloud.apilib.user.UserProfileMapper; import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper; import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangQueryMapper; import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper; @@ -56,6 +57,8 @@ public class CollaborationTestApplication { private CollaborationManagerCallContextProvider contextProvider; @MockBean private OzgCloudFileService ozgCloudFileService; + @MockBean + private UserProfileMapper userProfileMapper; public static void main(String[] args) { TimeZone.setDefault(TimeZone.getTimeZone("UTC"));