From 13f66ea535a3edefab826bd73c57062fa923d62f Mon Sep 17 00:00:00 2001
From: Tobias Bruns <kontakt@tobias-bruns.de>
Date: Tue, 11 Feb 2025 09:42:25 +0100
Subject: [PATCH] OZG-7689 move status changed event to command
---
.../command}/status/StatusChangedEvent.java | 6 ++--
vorgang-manager-server/pom.xml | 5 +---
.../common/search/SearchEventListener.java | 2 +-
.../vorgang/status/StatusService.java | 1 +
.../document/bescheid/BescheidITCase.java | 2 +-
.../document/bescheid/TestEventListener.java | 2 +-
.../ozgcloud/processor/ProcessorITCase.java | 16 +++++------
.../search/SearchEventListenerTest.java | 2 +-
.../vorgang/status/StatusServiceTest.java | 1 +
.../vorgang/VorgangEventListenerITCase.java | 28 ++++++++-----------
10 files changed, 30 insertions(+), 35 deletions(-)
rename {vorgang-manager-server/src/main/java/de/ozgcloud/vorgang => vorgang-manager-command/src/main/java/de/ozgcloud/command}/status/StatusChangedEvent.java (90%)
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusChangedEvent.java b/vorgang-manager-command/src/main/java/de/ozgcloud/command/status/StatusChangedEvent.java
similarity index 90%
rename from vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusChangedEvent.java
rename to vorgang-manager-command/src/main/java/de/ozgcloud/command/status/StatusChangedEvent.java
index bd7793d27..ae1c537bd 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusChangedEvent.java
+++ b/vorgang-manager-command/src/main/java/de/ozgcloud/command/status/StatusChangedEvent.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.vorgang.status;
+package de.ozgcloud.command.status;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandExecutedEvent;
@@ -30,11 +30,11 @@ public class StatusChangedEvent extends CommandExecutedEvent {
private static final long serialVersionUID = 1L;
- StatusChangedEvent(Command command) {
+ public StatusChangedEvent(Command command) {
this(command.getId());
}
- StatusChangedEvent(String commandId) {
+ public StatusChangedEvent(String commandId) {
super(commandId);
}
}
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index a8838cfd9..2422eb36b 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -53,7 +53,7 @@
<zufi-manager-interface.version>1.6.0</zufi-manager-interface.version>
<user-manager-interface.version>2.12.0</user-manager-interface.version>
- <processor-manager.version>0.5.0</processor-manager.version>
+ <processor-manager.version>0.6.0-SNAPSHOT</processor-manager.version>
<nachrichten-manager.version>2.17.0</nachrichten-manager.version>
<api-lib.version>0.16.0</api-lib.version>
<notification-manager.version>2.15.0</notification-manager.version>
@@ -393,8 +393,6 @@
<configuration>
<mainClass>de.ozgcloud.vorgang.VorgangManagerServerApplication</mainClass>
<image>
- <!-- cann be removed when common-lib > 2.3.2-->
- <builder>paketobuildpacks/builder-jammy-base</builder>
<env>
<BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS>-Dfile.encoding=UTF-8</BPE_APPEND_JAVA_TOOL_OPTIONS>
@@ -405,7 +403,6 @@
</image>
<profiles>
<profile>local</profile>
- <profile>bayernlocal</profile>
</profiles>
</configuration>
</plugin>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/search/SearchEventListener.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/search/SearchEventListener.java
index 66e4dea6c..608b1eb09 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/search/SearchEventListener.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/search/SearchEventListener.java
@@ -34,8 +34,8 @@ import org.springframework.stereotype.Component;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.VorgangAssignedEvent;
import de.ozgcloud.command.VorgangCreatedEvent;
+import de.ozgcloud.command.status.StatusChangedEvent;
import de.ozgcloud.vorgang.command.CommandService;
-import de.ozgcloud.vorgang.status.StatusChangedEvent;
import de.ozgcloud.vorgang.vorgang.SetAktenzeichenCompletedEvent;
import de.ozgcloud.vorgang.vorgang.VorgangDeletedEvent;
import de.ozgcloud.vorgang.vorgang.VorgangService;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusService.java
index f6452bce3..a87a9901c 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusService.java
@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandFailedEvent;
import de.ozgcloud.command.CommandRevokedEvent;
+import de.ozgcloud.command.status.StatusChangedEvent;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.command.PersistedCommand;
import de.ozgcloud.vorgang.vorgang.Vorgang;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
index 2ab3074d2..0d8646d96 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
@@ -55,6 +55,7 @@ import de.ozgcloud.apilib.user.OzgCloudUserProfile;
import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandStatus;
+import de.ozgcloud.command.status.StatusChangedEvent;
import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.document.BescheidDocumentCreatedEvent;
import de.ozgcloud.document.Document;
@@ -74,7 +75,6 @@ import de.ozgcloud.vorgang.command.CommandService;
import de.ozgcloud.vorgang.command.CreateCommandRequest;
import de.ozgcloud.vorgang.files.OzgCloudFile;
import de.ozgcloud.vorgang.servicekonto.ServiceKontoTestFactory;
-import de.ozgcloud.vorgang.status.StatusChangedEvent;
import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/TestEventListener.java b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/TestEventListener.java
index 9267814b3..83021d97f 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/TestEventListener.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/TestEventListener.java
@@ -26,8 +26,8 @@ package de.ozgcloud.document.bescheid;
import org.springframework.context.event.EventListener;
import de.ozgcloud.command.CommandFailedEvent;
+import de.ozgcloud.command.status.StatusChangedEvent;
import de.ozgcloud.document.BescheidDocumentCreatedEvent;
-import de.ozgcloud.vorgang.status.StatusChangedEvent;
class TestEventListener {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/processor/ProcessorITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/processor/ProcessorITCase.java
index d1744dcdc..f64cf705e 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/processor/ProcessorITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/processor/ProcessorITCase.java
@@ -39,9 +39,9 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
import de.ozgcloud.command.CommandStatus;
import de.ozgcloud.command.VorgangCreatedEvent;
@@ -75,19 +75,19 @@ class ProcessorITCase {
@Autowired
private ApplicationEventPublisher publisher;
- @MockBean
+ @MockitoBean
private VorgangService processorVorgangService;
- @MockBean
+ @MockitoBean
private PostfachService postfachService;
- @MockBean
+ @MockitoBean
private de.ozgcloud.notification.vorgang.VorgangService notificationService;
- @MockBean
+ @MockitoBean
private UserNotificationEventListener userNotificationEventListener;
- @MockBean
+ @MockitoBean
private CommandService commandService;
- @MockBean
+ @MockitoBean
private ProcessorService processorService;
@Captor
@@ -99,7 +99,7 @@ class ProcessorITCase {
when(notificationService.getVorgang(any())).thenReturn(de.ozgcloud.notification.vorgang.Vorgang.builder().build());
- when(processorService.processVorgang(any())).thenThrow(RuntimeException.class);
+ when(processorService.processVorgang(any(), anyString())).thenThrow(RuntimeException.class);
}
@BeforeEach
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchEventListenerTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchEventListenerTest.java
index ce2e2a048..441fbc3d7 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchEventListenerTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchEventListenerTest.java
@@ -39,9 +39,9 @@ import org.mockito.Mock;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.VorgangAssignedEvent;
import de.ozgcloud.command.VorgangCreatedEvent;
+import de.ozgcloud.command.status.StatusChangedEvent;
import de.ozgcloud.vorgang.command.CommandService;
import de.ozgcloud.vorgang.command.CommandTestFactory;
-import de.ozgcloud.vorgang.status.StatusChangedEvent;
import de.ozgcloud.vorgang.vorgang.SetAktenzeichenCompletedEvent;
import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.VorgangDeletedEvent;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusServiceTest.java
index 45f79924e..17e4694ec 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusServiceTest.java
@@ -42,6 +42,7 @@ import org.springframework.context.ApplicationEventPublisher;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandFailedEvent;
import de.ozgcloud.command.CommandRevokedEvent;
+import de.ozgcloud.command.status.StatusChangedEvent;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.command.CommandTestFactory;
import de.ozgcloud.vorgang.command.PersistedCommand;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
index 7cd7cdf68..fd8359db2 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
@@ -35,9 +35,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import de.ozgcloud.command.Command;
@@ -50,7 +49,6 @@ import de.ozgcloud.processor.ProcessorManagerConfiguration;
import de.ozgcloud.processor.processor.ProcessorService;
import de.ozgcloud.processor.vorgang.ProcessorVorgangMapper;
import de.ozgcloud.vorgang.command.CommandCreatedEventTestFactory;
-import de.ozgcloud.vorgang.command.CommandService;
import de.ozgcloud.vorgang.command.CommandTestFactory;
import de.ozgcloud.vorgang.command.Order;
import de.ozgcloud.vorgang.files.FileService;
@@ -67,28 +65,26 @@ class VorgangEventListenerITCase {
@Autowired
private ApplicationEventPublisher publisher;
- @SpyBean
+ @MockitoSpyBean
private VorgangEventListener listener;
- @SpyBean
+ @MockitoSpyBean
private AntragstellerNotificationEventListener antragstellerNotificationEventListener;
- @SpyBean
+ @MockitoSpyBean
private UserNotificationEventListener userNotificationEventListener;
- @MockBean
+ @MockitoSpyBean
private VorgangService service;
- @MockBean
+ @MockitoSpyBean
private VorgangHeaderService vorgangHeaderService;
- @MockBean
+ @MockitoSpyBean
private FileService fileService;
- @Autowired
- private CommandService commandService;
- @MockBean
- private ProcessorService vorgagnProcessorService;
- @MockBean
+ @MockitoSpyBean
+ private ProcessorService vorgangProcessorService;
+ @MockitoSpyBean
@Qualifier(ProcessorManagerConfiguration.OZGCLOUD_VORGANG_SERVICE_NAME)
private OzgCloudVorgangService ozgCloudVorgangService;
- @MockBean
+ @MockitoSpyBean
private ProcessorVorgangMapper processorVorgangMapper;
@Nested
@@ -122,7 +118,7 @@ class VorgangEventListenerITCase {
void shouldCallProcessorService() {
publisher.publishEvent(new VorgangCreatedEvent("id"));
- verify(vorgagnProcessorService, timeout(500)).processVorgang(any());
+ verify(vorgangProcessorService, timeout(500)).processVorgang(any(), anyString());
}
}
--
GitLab