Merge branch 'master' into OZG-3034-Erweiterung-des-Mailtexts-fuer-Benachrichtigungen

src/main/helm/templates/deployment.yaml

@@ -236,6 +236,10 @@ spec:
           - name: ozgcloud_feature_bescheid_kielHackathonRoute
             value: {{ quote (((.Values.ozgcloud).feature).bescheid).kielHackathonRoute }}
           {{- end }}
+          {{- if (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
+          - name: ozgcloud_notification_eingangsbestaetigung_replyAllowed
+            value: {{ quote (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
+          {{- end }}
 
           {{- if (.Values.ozgcloud).processors}}
           {{- range $processor_index, $processor := (.Values.ozgcloud).processors }}

src/test/helm/deployment_env_test.yaml

@@ -141,3 +141,15 @@ tests:
           content:
             name: ozgcloud_processors_1_forms_0_formEngineName
             value: FormSolutions
+  - it: should have notification properties
+    set:
+      ozgcloud:
+        notification:
+          eingangsbestaetigung:
+            replyAllowed: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_notification_eingangsbestaetigung_replyAllowed
+            value: "true"
\ No newline at end of file

vorgang-manager-server/pom.xml

@@ -50,7 +50,7 @@
 		<spring-boot.build-image.imageName>docker.ozg-sh.de/vorgang-manager:build-latest</spring-boot.build-image.imageName>
 
 		<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
-		<zufi-manager-interface.version>1.0.0</zufi-manager-interface.version>
+		<zufi-manager-interface.version>1.4.0-SNAPSHOT</zufi-manager-interface.version>
 
 		<user-manager-interface.version>2.1.0</user-manager-interface.version>
 		<bescheid-manager.version>1.18.0-SNAPSHOT</bescheid-manager.version>

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java

@@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
 import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
-import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
-import de.ozgcloud.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
+import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcVorgangManagerRegistrationRequest;
+import de.ozgcloud.zufi.grpc.organisationseinheit.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
 import lombok.NonNull;
 import lombok.extern.log4j.Log4j2;
 import net.devh.boot.grpc.client.inject.GrpcClient;
@@ -21,8 +21,10 @@ class ZufiRemoteService {
 	private VorgangManagerRegistrationServiceBlockingStub serviceStub;
 
 	public void registerVorgangManager(@NonNull List<String> organistationsEinheitenIds, String vorgangManagerAddress) {
-		boolean success = getServiceStub().register(buildRequest(organistationsEinheitenIds, vorgangManagerAddress)).getSuccess();
-		LOG.info("Register success: {}", success);
+		var result = getServiceStub().register(buildRequest(organistationsEinheitenIds, vorgangManagerAddress));
+		if (!result.getSuccess()) {
+			LOG.warn("Registration failed: {}", result.getMessage());
+		}
 	}
 
 	private VorgangManagerRegistrationServiceBlockingStub getServiceStub() {

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java

 package de.ozgcloud.vorgang.registry;
 
-import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationResponse;
+import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcVorgangManagerRegistrationResponse;
 
 public class GrpcRegistrationResponseTestFactory {
 	public static GrpcVorgangManagerRegistrationResponse create() {

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java

@@ -14,8 +14,8 @@ import org.mockito.Mock;
 import org.mockito.Spy;
 
 import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
-import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
-import de.ozgcloud.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
+import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcVorgangManagerRegistrationRequest;
+import de.ozgcloud.zufi.grpc.organisationseinheit.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
 
 class ZufiRemoteServiceTest {
 	private static final String ORGANISATIONS_EINHEITEN_ID = "123456";