From 891dbe66903918fbca557350bde5fedbe15b79eb Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 8 Jul 2024 08:03:10 +0200
Subject: [PATCH] OZG-6099 update processor-manager; handle if context user
missing; don't creat bean for processor-manager
---
vorgang-manager-server/pom.xml | 2 +-
.../vorgang/VorgangManagerCallContextProvider.java | 7 ++++---
.../vorgang/VorgangProcessorConfiguration.java | 14 --------------
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index 4cf66bad1..1fb4eed1a 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -54,7 +54,7 @@
<user-manager-interface.version>2.1.0</user-manager-interface.version>
<bescheid-manager.version>1.13.0</bescheid-manager.version>
- <processor-manager.version>0.4.0</processor-manager.version>
+ <processor-manager.version>0.4.1-SNAPSHOT</processor-manager.version>
<nachrichten-manager.version>2.9.0</nachrichten-manager.version>
<ozgcloud-starter.version>0.10.0</ozgcloud-starter.version>
<notification-manager.version>2.8.0</notification-manager.version>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/VorgangManagerCallContextProvider.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/VorgangManagerCallContextProvider.java
index 628110979..3fe994644 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/VorgangManagerCallContextProvider.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/VorgangManagerCallContextProvider.java
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Component;
import de.ozgcloud.apilib.common.callcontext.CallContext;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.user.OzgCloudUserId;
+import de.ozgcloud.vorgang.callcontext.CallContextUser;
import de.ozgcloud.vorgang.callcontext.CurrentUserService;
import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
import lombok.RequiredArgsConstructor;
@@ -45,11 +46,11 @@ public class VorgangManagerCallContextProvider implements OzgCloudCallContextPro
@Override
public CallContext provideContext() {
var callContextBuilder = CallContext.builder().clientName(VorgangManagerClientCallContextAttachingInterceptor.VORGANG_MANAGER_CLIENT_NAME);
- getUserId().ifPresent(callContextBuilder::userId);
+ findUserId().ifPresent(callContextBuilder::userId);
return callContextBuilder.build();
}
- Optional<OzgCloudUserId> getUserId() {
- return currentUserService.getUser().getUserId().map(OzgCloudUserId::from);
+ Optional<OzgCloudUserId> findUserId() {
+ return currentUserService.findUser().flatMap(CallContextUser::getUserId).map(OzgCloudUserId::from);
}
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/VorgangProcessorConfiguration.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/VorgangProcessorConfiguration.java
index 56d602a31..9fdab580d 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/VorgangProcessorConfiguration.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/VorgangProcessorConfiguration.java
@@ -7,29 +7,15 @@ import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
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.OzgCloudVorgangStubMapper;
import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
-import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Configuration
class VorgangProcessorConfiguration {
- @GrpcClient("vorgang-manager")
- private VorgangServiceBlockingStub vorgangServiceStub;
-
@GrpcClient("user-manager")
private UserProfileServiceBlockingStub userProfileServiceGrpc;
- @Bean
- OzgCloudVorgangService ozgCloudVorgangService(OzgCloudVorgangMapper mapper, OzgCloudVorgangStubMapper stubMapper,
- OzgCloudCallContextProvider contextProvider) {
- return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, contextProvider);
- }
-
@Bean
OzgCloudUserProfileService ozgCloudUserProfileService(UserProfileMapper mapper, OzgCloudCallContextProvider contextProvider) {
return new GrpcOzgCloudUserProfileService(userProfileServiceGrpc, mapper, contextProvider);
--
GitLab