separate event publishing command bus

src/DomainModel/CommandBus.php

@@ -29,7 +29,6 @@ interface CommandBus
      * @return mixed
      *
      * @Gateway(requestChannel=CommandBus::CHANNEL_NAME_BY_OBJECT)
-     * @LazyEventPublishing()
      */
     public function send($command);
 
@@ -48,7 +47,6 @@ public function send($command);
      *          @Headers(parameterName="metadata")
      *     }
      * )
-     * @LazyEventPublishing()
      */
     public function sendWithMetadata($command, array $metadata);
 
@@ -66,7 +64,6 @@ public function sendWithMetadata($command, array $metadata);
      *          @Payload(parameterName="commandData")
      *     }
      * )
-     * @LazyEventPublishing()
      */
     public function convertAndSend(string $name, string $dataMediaType, $commandData);
 
@@ -87,7 +84,6 @@ public function convertAndSend(string $name, string $dataMediaType, $commandData
      *          @Payload(parameterName="commandData")
      *     }
      * )
-     * @LazyEventPublishing()
      */
     public function convertAndSendWithMetadata(string $name, string $dataMediaType, $commandData, array $metadata);
 }

src/DomainModel/CommandBusWithEventPublishing.php

@@ -0,0 +1,91 @@
+<?php
+
+
+namespace SimplyCodedSoftware\DomainModel;
+
+use SimplyCodedSoftware\Messaging\Annotation\MessageEndpoint;
+use SimplyCodedSoftware\DomainModel\LazyEventBus\LazyEventPublishing;
+use SimplyCodedSoftware\Messaging\Annotation\Gateway;
+use SimplyCodedSoftware\Messaging\Annotation\Parameter\Header;
+use SimplyCodedSoftware\Messaging\Annotation\Parameter\Headers;
+use SimplyCodedSoftware\Messaging\Annotation\Parameter\Payload;
+use SimplyCodedSoftware\Messaging\MessageHeaders;
+
+/**
+ * Interface CommandBusWithEventPublishing
+ * @package SimplyCodedSoftware\DomainModel
+ * @author Dariusz Gafka <[email protected]>
+ * @MessageEndpoint()
+ */
+interface CommandBusWithEventPublishing extends CommandBus
+{
+    /**
+     * Entrypoint for commands, when you access to instance of the command
+     *
+     * @param object $command instance of command
+     *
+     * @return mixed
+     *
+     * @Gateway(requestChannel=CommandBus::CHANNEL_NAME_BY_OBJECT)
+     * @LazyEventPublishing()
+     */
+    public function send($command);
+
+    /**
+     * Entrypoint for commands, when you access to instance of the command
+     *
+     * @param object $command instance of command
+     * @param array  $metadata
+     *
+     * @return mixed
+     *
+     * @Gateway(
+     *     requestChannel=CommandBus::CHANNEL_NAME_BY_OBJECT,
+     *     parameterConverters={
+     *          @Payload(parameterName="command"),
+     *          @Headers(parameterName="metadata")
+     *     }
+     * )
+     * @LazyEventPublishing()
+     */
+    public function sendWithMetadata($command, array $metadata);
+
+    /**
+     * @param string $name
+     * @param string $dataMediaType
+     * @param mixed  $commandData
+     *
+     * @return mixed
+     * @Gateway(
+     *     requestChannel=CommandBus::CHANNEL_NAME_BY_NAME,
+     *     parameterConverters={
+     *          @Header(parameterName="name", headerName=CommandBus::CHANNEL_NAME_BY_NAME),
+     *          @Header(parameterName="dataMediaType", headerName=MessageHeaders::CONTENT_TYPE),
+     *          @Payload(parameterName="commandData")
+     *     }
+     * )
+     * @LazyEventPublishing()
+     */
+    public function convertAndSend(string $name, string $dataMediaType, $commandData);
+
+    /**
+     * @param string $name
+     * @param string $dataMediaType
+     * @param mixed  $commandData
+     * @param array  $metadata
+     *
+     * @return mixed
+     *
+     * @Gateway(
+     *     requestChannel=CommandBus::CHANNEL_NAME_BY_NAME,
+     *     parameterConverters={
+     *          @Headers(parameterName="metadata"),
+     *          @Header(parameterName="name", headerName=CommandBus::CHANNEL_NAME_BY_NAME),
+     *          @Header(parameterName="dataMediaType", headerName=MessageHeaders::CONTENT_TYPE),
+     *          @Payload(parameterName="commandData")
+     *     }
+     * )
+     * @LazyEventPublishing()
+     */
+    public function convertAndSendWithMetadata(string $name, string $dataMediaType, $commandData, array $metadata);
+}

tests/DomainModel/Behat/features/modelling.feature

@@ -8,6 +8,7 @@ Feature: activating as aggregate order entity
     And shipping address should be "London 12th street" for order with id 1
     When I change order with id of 1 the shipping address to "London 13th street"
     Then shipping address should be "London 13th street" for order with id 1
+    And there should notification 2 awaiting notification
     Then there should be 20 products for order with id 1 retrieved from "get_order_amount_channel"
 
   Scenario: I reorder product, then the amount should be increased

tests/DomainModel/Fixture/CommandHandler/Aggregate/Order.php

@@ -92,6 +92,8 @@ public function changeShippingAddress(ChangeShippingAddressCommand $command) : v
     {
         $this->shippingAddress = $command->getShippingAddress();
         $this->increaseAggregateVersion();
+
+        $this->record(new Notification());
     }
 
 

tests/Messaging/Behat/Bootstrap/AnnotationBasedMessagingContext.php

@@ -9,6 +9,7 @@
 use Doctrine\Common\Annotations\AnnotationException;
 use PHPUnit\Framework\Assert;
 use SimplyCodedSoftware\DomainModel\CommandBus;
+use SimplyCodedSoftware\DomainModel\CommandBusWithEventPublishing;
 use SimplyCodedSoftware\DomainModel\EventBus;
 use SimplyCodedSoftware\DomainModel\LazyEventBus\LazyEventBus;
 use SimplyCodedSoftware\DomainModel\QueryBus;
@@ -176,7 +177,7 @@ public function calendarShouldContainEventWithAppointmentId(int $appointmentId)
      */
     public static function getCommandBus(): CommandBus
     {
-        return self::$messagingSystem->getGatewayByName(CommandBus::class);
+        return self::$messagingSystem->getGatewayByName(CommandBusWithEventPublishing::class);
     }
 
     /**