OZG-7689 move status changed event to command

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusChangedEvent.java → 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);
 	}
 }

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>

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;

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;

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;
 

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 {
 

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

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;

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;

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());
 		}
 	}