diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index b498649f5c7ca1b1bd36bca23d230f5f53526ca3..65b3f7d2055109abff0eea24180293bbc85c5c0e 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/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 }} diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml index 573afcbdd936a8c2721f1706297fa5fca68f5d16..4d71e36a71fcb5da19e5c6b55afd44ad528bcbd8 100644 --- a/src/test/helm/deployment_env_test.yaml +++ b/src/test/helm/deployment_env_test.yaml @@ -140,4 +140,16 @@ tests: path: spec.template.spec.containers[0].env content: name: ozgcloud_processors_1_forms_0_formEngineName - value: FormSolutions \ No newline at end of file + 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 diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml index 55cfafa018e951c86d8c55a40e265bf292556ece..28ce20c5b93257f14e18a47c0277ecaa66db2685 100644 --- a/vorgang-manager-server/pom.xml +++ b/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> diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java index df8836575b5e6d8d53e0eddefcf08665ccb57077..aab5f17c1c67ebe61d6122fb13a3da561628ed6b 100644 --- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java +++ b/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() { diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java index 7bf1b282a7708c1e16fab1f6f6a71873b5f245bf..831f430ef392061414267c8478689cbe90f1a712 100644 --- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java +++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java @@ -1,6 +1,6 @@ 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() { diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java index 384ca37218780385c58092d40024998380a4e4c2..a09030f20ec00b66f0edb7d1823874c5a0f41101 100644 --- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java +++ b/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";