Multiple message handlers

packages/Ecotone/src/Modelling/Config/AggregrateModule.php

@@ -196,29 +196,26 @@ private function initChannelsToBridge(): void
                         // All channels on this route are factory or action channels, continue normal processing
                         continue;
                     }
-                    if (count($staticChannels) > 1 || count($actionChannels) > 1) {
-                        throw ConfigurationException::create("Message Handlers on Aggregate and Saga can be used either for single factory method and single action method together, or for multiple actions methods in {$staticRegistration->getClassName()}");
-                    }
-                    // Exactly one factory and one action channel, register a bridge
+                    // register a bridge
                     if ($bridgeForThisFactoryMethod === null) {
                         $bridgeForThisFactoryMethod = [
                             'factoryChannel' => reset($staticChannels),
-                            'actionChannel' => reset($actionChannels),
+                            'actionChannels' => $actionChannels,
                             'routes' => [$routedKey],
                         ];
                     } else {
                         // If we already have a bridge for this factory method, add the route to it
                         $bridgeForThisFactoryMethod['routes'][] = $routedKey;
                         Assert::isTrue(
                             reset($staticChannels) === $bridgeForThisFactoryMethod['factoryChannel']
-                            && reset($actionChannels) === $bridgeForThisFactoryMethod['actionChannel'],
+                            && $actionChannels === $bridgeForThisFactoryMethod['actionChannels'],
                             "Trying to register multiple factory methods for {$staticRegistration->getClassName()} under same route {$routedKey}"
                         );
                     }
                 }
                 if ($bridgeForThisFactoryMethod !== null) {
                     $this->channelsToBridge[$bridgeForThisFactoryMethod['factoryChannel']] = $channelToRegistrations[$bridgeForThisFactoryMethod['actionChannel']];
-                    $this->channelsToCancel[] = $bridgeForThisFactoryMethod['actionChannel'];
+                    $this->channelsToCancel += $bridgeForThisFactoryMethod['actionChannels'];
                 }
             }
         }

packages/Ecotone/tests/Modelling/Fixture/MultipleMessageHandlers/InvoiceOrder.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Test\Ecotone\Modelling\Fixture\MultipleMessageHandlers;
+
+use Ecotone\Messaging\Attribute\Parameter\Payload;
+use Ecotone\Modelling\Attribute\EventHandler;
+use Ecotone\Modelling\Attribute\Identifier;
+use Ecotone\Modelling\Attribute\Saga;
+
+#[Saga]
+class InvoiceOrder
+{
+    private array $products;
+
+    public function __construct(
+        #[Identifier] private string $debtorId,
+    ) {
+        $this->products = [];
+    }
+
+    public function products(): array
+    {
+        return $this->products;
+    }
+
+    #[EventHandler(endpointId: 'createWhenProductBecameBillable', identifierMapping: ['debtorId' => 'payload.debtor'])]
+    public static function createWhenProductBecameBillable(
+        #[Payload] ProductBecameBillable $event
+    ): self {
+        $invoiceOrder = new self($event->debtor);
+        $invoiceOrder->products[] = $event->productId;
+
+        return $invoiceOrder;
+    }
+
+    #[EventHandler(endpointId: 'createWhenDebtorWasChanged', identifierMapping: ['debtorId' => 'payload.newDebtor'])]
+    public static function createWhenDebtorWasChanged(
+        #[Payload] ProductDebtorWasChanged $event
+    ): self {
+        $invoiceOrder = new self($event->newDebtor);
+        $invoiceOrder->products[] = $event->productId;
+
+        return $invoiceOrder;
+    }
+
+    #[EventHandler(endpointId: 'removeProductWhenDebtorWasChanged', identifierMapping: ['debtorId' => 'payload.oldDebtor'])]
+    public function removeProductWhenDebtorWasChanged(
+        #[Payload] ProductDebtorWasChanged $event
+    ): void {
+        unset($this->products[$event->productId]);
+    }
+
+    #[EventHandler(endpointId: 'addProductWhenDebtorWasChanged', identifierMapping: ['debtorId' => 'payload.newDebtor'])]
+    public function addProductWhenDebtorWasChanged(
+        #[Payload] ProductDebtorWasChanged $event
+    ): void {
+        if (!in_array($event->productId, $this->products, true)) {
+            $this->products[] = $event->productId;
+        }
+    }
+}

packages/Ecotone/tests/Modelling/Fixture/MultipleMessageHandlers/ProductBecameBillable.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Test\Ecotone\Modelling\Fixture\MultipleMessageHandlers;
+
+class ProductBecameBillable
+{
+    public function __construct(
+        public string $productId,
+        public string $debtor,
+    ) {
+    }
+}

packages/Ecotone/tests/Modelling/Fixture/MultipleMessageHandlers/ProductDebtorWasChanged.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Test\Ecotone\Modelling\Fixture\MultipleMessageHandlers;
+
+class ProductDebtorWasChanged
+{
+    public function __construct(
+        public string $productId,
+        public string $oldDebtor,
+        public string $newDebtor,
+    ) {
+    }
+}

packages/Ecotone/tests/Modelling/Unit/MultipleMessageHandlersTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Modelling\Unit;
+
+use Ecotone\Lite\EcotoneLite;
+use Ecotone\Messaging\Channel\SimpleMessageChannelBuilder;
+use Ecotone\Messaging\Config\ServiceConfiguration;
+use PHPUnit\Framework\TestCase;
+use Test\Ecotone\Modelling\Fixture\MultipleMessageHandlers\InvoiceOrder;
+use Test\Ecotone\Modelling\Fixture\MultipleMessageHandlers\ProductBecameBillable;
+use Test\Ecotone\Modelling\Fixture\MultipleMessageHandlers\ProductDebtorWasChanged;
+
+class MultipleMessageHandlersTest extends TestCase
+{
+    public function test_multiple_message_handlers(): void
+    {
+        $ecotone = EcotoneLite::bootstrapFlowTesting(
+            configuration: ServiceConfiguration::createWithDefaults()
+                ->withNamespaces(['Test\Ecotone\Modelling\Fixture\MultipleMessageHandlers'])
+                ->withExtensionObjects([
+                    SimpleMessageChannelBuilder::createQueueChannel('invoiceOrder')
+                ])
+            ,
+        );
+
+        $ecotone->publishEvent(new ProductBecameBillable(productId: 'product-1', debtor: 'debtor-1'));
+
+        self::assertEquals(['product-1'], $ecotone->getAggregate(InvoiceOrder::class, 'debtor-1')->products());
+
+        $ecotone->publishEvent(new ProductDebtorWasChanged(productId: 'product-1', oldDebtor: 'debtor-1', newDebtor: 'debtor-2'));
+
+        self::assertEquals([], $ecotone->getAggregate(InvoiceOrder::class, 'debtor-1')->products());
+        self::assertEquals(['product-1'], $ecotone->getAggregate(InvoiceOrder::class, 'debtor-1')->products());
+    }
+}