From 0ec1fffac299cc7d381a8a95ee4366b5f69a201a Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com>
Date: Mon, 31 Mar 2025 09:19:23 +0200
Subject: [PATCH 1/2] OZG-7573 OZG-7991 Enable asynchronous methods
---
common/src/main/java/de/ozgcloud/eingang/Application.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common/src/main/java/de/ozgcloud/eingang/Application.java b/common/src/main/java/de/ozgcloud/eingang/Application.java
index b485b16ec..781731d3b 100644
--- a/common/src/main/java/de/ozgcloud/eingang/Application.java
+++ b/common/src/main/java/de/ozgcloud/eingang/Application.java
@@ -27,10 +27,12 @@ import java.util.TimeZone;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication(scanBasePackages = { "de.ozgcloud" })
@EnableScheduling
+@EnableAsync
public class Application {
public static final String ZUFI_MANAGER_GRPC_CLIENT = "zufi-manager";
--
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