From c11f6ac0ee825419a4a4a4119f4746e16849e360 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Wed, 26 Mar 2025 15:14:03 +0100
Subject: [PATCH 1/2] OZG-7878 servicekonto: Catch runtime-exception in
getPostfachAddressType
---
.../semantik/common/ServiceKontoFactory.java | 7 ++-
.../common/ServiceKontoFactoryTest.java | 59 ++++++++++++++++++-
2 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java
index f41a76e44..8f9aa3d8b 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java
@@ -102,7 +102,12 @@ public class ServiceKontoFactory {
}
int getPostfachAddressType(Map<String, Object> restResponseName) {
- return getMailboxType(restResponseName);
+ try {
+ return getMailboxType(restResponseName);
+ } catch (RuntimeException e) {
+ LOG.error("Error while getting mailbox type from rest response name", e);
+ return POSTFACH_ADDRESS_DEFAULT;
+ }
}
private Integer getMailboxType(Map<String, Object> restResponseName) {
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java
index 5f9fba08b..c62d3cd37 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java
@@ -23,6 +23,7 @@
*/
package de.ozgcloud.eingang.semantik.common;
+import static de.ozgcloud.eingang.semantik.common.ServiceKontoFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -34,6 +35,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.InjectMocks;
import org.mockito.Spy;
@@ -41,10 +44,10 @@ import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataUtils;
import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
import de.ozgcloud.eingang.common.formdata.ServiceKonto;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
import de.ozgcloud.eingang.common.formdata.ServiceKonto.TrustLevel;
import de.ozgcloud.eingang.common.formdata.ServiceKontoTestFactory;
import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
-import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
class ServiceKontoFactoryTest {
@@ -104,8 +107,9 @@ class ServiceKontoFactoryTest {
@Nested
class TestWithRestResponseName {
+ @DisplayName("should call buildOsiPostfachV1Address")
@Test
- void shouldCallBuildAddresses() {
+ void shouldCallBuildOsiPostfachV1Address() {
getPostfachAddresses();
verify(factory).buildOsiPostfachV1Address(any(), anyInt());
@@ -123,11 +127,62 @@ class ServiceKontoFactoryTest {
assertThat(addresses.get(0).getType()).isEqualTo(PostfachAddressTestFactory.POSTFACH_ADDRESS_TYPE);
}
+ @DisplayName("should return with postfach address type")
+ @ParameterizedTest
+ @ValueSource(ints = { 1, 2, 3 })
+ void shouldReturnWithPostfachAddressType(int postfachAddressType) {
+ var formDataWithPostfachAddressType = FormDataUtils.from(FORM_DATA)
+ .put(ServiceKontoFactory.REST_RESPONSE_NAME, List.of(Map.of(
+ ServiceKontoFactory.REST_RESPONSE_NAME_MEMBER_SCOPE,
+ List.of(Map.of(ServiceKontoFactory.REST_RESPONSE_NAME_MEMBER_SCOPE_MAILBOX_TYPE,
+ postfachAddressType))))
+ )
+ .build();
+
+ var addresses = buildServiceKonto(formDataWithPostfachAddressType);
+
+ var types = addresses.getPostfachAddresses()
+ .stream()
+ .map(PostfachAddress::getType)
+ .toList();
+ assertThat(types).containsExactly(postfachAddressType);
+ }
+
private List<PostfachAddress> getPostfachAddresses() {
return buildServiceKonto(FORM_DATA).getPostfachAddresses();
}
}
+ @DisplayName("with bad rest_response_name")
+ @Nested
+ class TestWithBadRestResponseName {
+
+ private final FormData formDataWithBadRestResponseName = FormDataUtils.from(FORM_DATA)
+ .put(ServiceKontoFactory.REST_RESPONSE_NAME, List.of(Map.of())).build();
+
+ @DisplayName("should call buildOsiPostfachV1Address")
+ @Test
+ void shouldCallBuildOsiPostfachV1Address() {
+ getPostfachAddresses();
+
+ verify(factory).buildOsiPostfachV1Address(any(), anyInt());
+ }
+
+ @DisplayName("should return postfach address with default type")
+ @Test
+ void shouldReturnPostfachAddressWithDefaultType() {
+ var addresses = getPostfachAddresses();
+
+ assertThat(addresses)
+ .extracting("type")
+ .containsExactly(POSTFACH_ADDRESS_DEFAULT);
+ }
+
+ private List<PostfachAddress> getPostfachAddresses() {
+ return buildServiceKonto(formDataWithBadRestResponseName).getPostfachAddresses();
+ }
+ }
+
@DisplayName("without rest_response_name")
@Nested
class TestWithoutRestResponseName {
--
GitLab
From fc0062d3a09341c3ec1a7a470ec0ca097c7116aa Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Wed, 9 Apr 2025 15:56:28 +0200
Subject: [PATCH 2/2] #1 KOP-3106 Filter out null orgIds
---
.../de/ozgcloud/eingang/router/VorgangService.java | 2 ++
.../ozgcloud/eingang/router/VorgangServiceTest.java | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
index 5a18d7ee7..8a1d7855a 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
@@ -102,6 +103,7 @@ public class VorgangService {
List<String> getOrganisationsEinheitIds(FormData formData) {
return formData.getZustaendigeStelles().stream()
.map(ZustaendigeStelle::getOrganisationseinheitenId)
+ .filter(Objects::nonNull)
.toList();
}
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
index bd5ff001a..d46aaa4db 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
@@ -306,6 +306,19 @@ class VorgangServiceTest {
class TestGetOrganisationseinheitIds {
private final FormData preservedFormData = FormDataTestFactory.create();
+ @DisplayName("should filter out empty")
+ @Test
+ void shouldFilterOutEmpty() {
+ var formDataWithNullOrgId = FormDataTestFactory.createBuilder()
+ .clearZustaendigeStelles()
+ .zustaendigeStelles(List.of(ZustaendigeStelleTestFactory.createBuilder().organisationseinheitenId(null).build()))
+ .build();
+
+ var organisationseinheitIds = service.getOrganisationsEinheitIds(formDataWithNullOrgId);
+
+ assertThat(organisationseinheitIds).isEmpty();
+ }
+
@DisplayName("should return")
@Test
void shouldReturn() {
--
GitLab