Skip to content
Snippets Groups Projects
Commit 96579c29 authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

OZG-7037 fix package reference in ArchiveEventlistener

parent 3216ed72
Branches
Tags
1 merge request!1Ozg 7037 vorgang an dms
...@@ -46,10 +46,10 @@ import de.ozgcloud.command.VorgangLockedEvent; ...@@ -46,10 +46,10 @@ import de.ozgcloud.command.VorgangLockedEvent;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
@Component() @Component
@RequiredArgsConstructor @RequiredArgsConstructor
@Log4j2 @Log4j2
class ArchiveEventListener { public class ArchiveEventListener {
static final int MAXIMUM_CHECKS_FOR_PENDING_COMMANDS = 3; static final int MAXIMUM_CHECKS_FOR_PENDING_COMMANDS = 3;
static final int WAIT_INTERVAL = 30 * 1000; static final int WAIT_INTERVAL = 30 * 1000;
...@@ -57,10 +57,10 @@ class ArchiveEventListener { ...@@ -57,10 +57,10 @@ class ArchiveEventListener {
private static final String ERROR_MESSAGE_TEMPLATE = "Error on executing %s Command (id: %s)."; private static final String ERROR_MESSAGE_TEMPLATE = "Error on executing %s Command (id: %s).";
static final String ARCHIVE_VORGANG_ORDER = "ARCHIVE_VORGANG"; static final String ARCHIVE_VORGANG_ORDER = "ARCHIVE_VORGANG";
private static final String IS_ARCHIVE_VORGANG_EVENT = "{T(de.ozgcloud.archive.vorgang.ArchiveEventListener).IS_ARCHIVE_VORGANG_COMMAND.test(event.getSource())}"; private static final String IS_ARCHIVE_VORGANG_EVENT = "{T(de.ozgcloud.archive.archivierung.ArchiveEventListener).IS_ARCHIVE_VORGANG_COMMAND.test(event.getSource())}";
public static final Predicate<Command> IS_ARCHIVE_VORGANG_COMMAND = command -> ARCHIVE_VORGANG_ORDER.equals(command.getOrder()); public static final Predicate<Command> IS_ARCHIVE_VORGANG_COMMAND = command -> ARCHIVE_VORGANG_ORDER.equals(command.getOrder());
private static final String IS_LOCKED_BY_ARCHIVE_MANAGER_EVENT = "{T(de.ozgcloud.archive.vorgang.ArchiveEventListener)." private static final String IS_LOCKED_BY_ARCHIVE_MANAGER_EVENT = "{T(de.ozgcloud.archive.archivierung.ArchiveEventListener)."
+ "IS_LOCK_BY_ARCHIVE_MANAGER_COMMAND.test(event.getCommand())}"; + "IS_LOCK_BY_ARCHIVE_MANAGER_COMMAND.test(event.getCommand())}";
public static final Predicate<Command> IS_LOCK_BY_ARCHIVE_MANAGER_COMMAND = command -> CallContextUser.ARCHIVE_MANAGER_CLIENT_NAME public static final Predicate<Command> IS_LOCK_BY_ARCHIVE_MANAGER_COMMAND = command -> CallContextUser.ARCHIVE_MANAGER_CLIENT_NAME
.equals(command.getCreatedByClientName()); .equals(command.getCreatedByClientName());
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
package de.ozgcloud.archive.archivierung; package de.ozgcloud.archive.archivierung;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
...@@ -31,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -31,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import de.ozgcloud.archive.common.callcontext.CallContextUser;
import de.ozgcloud.command.Command; import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEventTestFactory; import de.ozgcloud.command.CommandCreatedEventTestFactory;
import de.ozgcloud.command.CommandTestFactory; import de.ozgcloud.command.CommandTestFactory;
...@@ -68,4 +70,30 @@ class ArchiveEventListenerITCase { ...@@ -68,4 +70,30 @@ class ArchiveEventListenerITCase {
verifyNoInteractions(eventListener); verifyNoInteractions(eventListener);
} }
} }
@Nested
class TestOnVorgangLockedEvent {
private static final Command COMMAND = CommandTestFactory.createBuilder()
.createdByClientName(CallContextUser.ARCHIVE_MANAGER_CLIENT_NAME)
.build();
@Test
void shouldReactOnOrder() {
var event = VorgangLockedEventTestFactory.withCommand(COMMAND);
doNothing().when(eventListener).onVorgangLockedEvent(any());
publisher.publishEvent(event);
verify(eventListener).onVorgangLockedEvent(event);
}
@Test
void shouldNotReactOnOtherOrder() {
publisher
.publishEvent(VorgangLockedEventTestFactory.withCommand(CommandTestFactory.createBuilder().createdByClientName("OTHER").build()));
verifyNoInteractions(eventListener);
}
}
} }
\ No newline at end of file
package de.ozgcloud.archive.archivierung;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.VorgangLockedEvent;
public class VorgangLockedEventTestFactory {
public static VorgangLockedEvent withCommand(Command command) {
return new VorgangLockedEvent(command);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment