diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListener.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListener.java index 83e00d9f132b73ac497b360ea7f2f02624b88437..56b8691e800fe4912df2d232f379e504bb1b7594 100644 --- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListener.java +++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListener.java @@ -51,13 +51,13 @@ public class ForwardingEventListener { private static final String IS_REDIRECT_EVENT_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_REDIRECT_MAIL_REQ.test(event.getSource())}"; private static final String IS_SUCCESSFULL_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_SUCCESSFULL_ORDER.test(event.getSource())}"; private static final String IS_FAILED_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_FAILED_ORDER.test(event.getSource())}"; - private static final String IS_FORWARD_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_FORWARD_ORDER.test(event.getSource())}"; + private static final String IS_REDIRECT_VORGANG_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_REDIRECT_VORGANG_ORDER.test(event.getSource())}"; private static final String IS_FORWARD_VORGANG_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_FORWARD_VORGANG_ORDER.test(event.getSource())}"; public static final Predicate<MailSendRequest> IS_REDIRECT_MAIL_REQ = req -> req.getRequestReference() instanceof Forwarding; public static final Predicate<Command> IS_SUCCESSFULL_ORDER = command -> Order.FORWARD_SUCCESSFULL.isMeant(command.getOrder()); public static final Predicate<Command> IS_FAILED_ORDER = command -> Order.FORWARD_FAILED.isMeant(command.getOrder()); - public static final Predicate<Command> IS_FORWARD_ORDER = command -> Order.REDIRECT_VORGANG.isMeant(command.getOrder()); + public static final Predicate<Command> IS_REDIRECT_VORGANG_ORDER = command -> Order.REDIRECT_VORGANG.isMeant(command.getOrder()); public static final Predicate<Command> IS_FORWARD_VORGANG_ORDER = command -> Order.FORWARD_VORGANG.isMeant(command.getOrder()); private final ForwardingService service; @@ -66,8 +66,8 @@ public class ForwardingEventListener { private final VorgangService vorgangService; private final LockMapper lockMapper; - @EventListener(condition = IS_FORWARD_ORDER_CONDITION) - public void onForwardOrder(CommandCreatedEvent event) { + @EventListener(condition = IS_REDIRECT_VORGANG_ORDER_CONDITION) + public void onRedirectVorgangOrder(CommandCreatedEvent event) { handleException(() -> service.forwardByCommand(event.getSource()), event.getSource().getId()); } diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListenerTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListenerTest.java index 588060cef8cfa5609fe6c566224fd0591639fad9..acb4c3377432346db0142aaec527e680ca3e7527 100644 --- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListenerTest.java +++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListenerTest.java @@ -75,11 +75,11 @@ class ForwardingEventListenerTest { private LockMapper lockMapper; @Nested - class OnForwardOrderCommand { + class OnRedirectVorgangCommand { @Test void shouldCallService() { - listener.onForwardOrder(CommandCreatedEventTestFactory.create()); + listener.onRedirectVorgangOrder(CommandCreatedEventTestFactory.create()); verify(forwardingService).forwardByCommand(notNull()); } @@ -88,7 +88,7 @@ class ForwardingEventListenerTest { void shouldPublishFailedEventOnError() { when(forwardingService.forwardByCommand(any())).thenThrow(ConcurrentModificationException.class); - listener.onForwardOrder(CommandCreatedEventTestFactory.create()); + listener.onRedirectVorgangOrder(CommandCreatedEventTestFactory.create()); verify(publisher).publishEvent(any(CommandFailedEvent.class)); }