Fix spying channels + adjust quickstart naming (#328)

* Fix spying channels + adjust quickstart naming * fixes * fix flaky test
ecotoneframework · Jun 30, 2024 · 713d1ee · 713d1ee
1 parent ca6a315
commit 713d1ee
Show file tree

Hide file tree

Showing 41 changed files with 79 additions and 41 deletions.
diff --git a/packages/Ecotone/src/Lite/Test/Configuration/EcotoneTestSupportModule.php b/packages/Ecotone/src/Lite/Test/Configuration/EcotoneTestSupportModule.php
@@ -126,9 +126,14 @@ public function prepare(Configuration $messagingConfiguration, array $extensionO
         foreach ($this->spiedChannels as $spiedChannel) {
             $messagingConfiguration->registerDefaultChannelFor(SimpleMessageChannelBuilder::createPublishSubscribeChannel($spiedChannel));
         }
-        foreach (array_unique(array_merge($testConfiguration->getSpiedChannels(), $this->spiedChannels)) as $spiedChannel) {
+        $spiedChannels = array_unique(array_merge($testConfiguration->getSpiedChannels(), $this->spiedChannels));
+        foreach ($spiedChannels as $spiedChannel) {
+            $messagingConfiguration
+                ->registerChannelInterceptor(new SpiedChannelAdapterBuilder($spiedChannel));
+        }
+
+        if ($spiedChannels) {
             $messagingConfiguration
-                ->registerChannelInterceptor(new SpiedChannelAdapterBuilder($spiedChannel))
                 ->registerMessageHandler(ServiceActivatorBuilder::create(
                     MessageCollectorHandler::class,
                     self::GET_SPIED_CHANNEL_RECORDED_MESSAGE_PAYLOADS

diff --git a/packages/Ecotone/tests/Lite/EcotoneLiteTest.php b/packages/Ecotone/tests/Lite/EcotoneLiteTest.php
@@ -3,6 +3,8 @@
 namespace Test\Ecotone\Lite;
 
 use Ecotone\Lite\EcotoneLite;
+use Ecotone\Lite\Test\TestConfiguration;
+use Ecotone\Messaging\Channel\SimpleMessageChannelBuilder;
 use Ecotone\Messaging\Config\ModulePackageList;
 use Ecotone\Messaging\Config\ServiceConfiguration;
 use PHPUnit\Framework\TestCase;
@@ -27,4 +29,35 @@ public function test_it_can_run_console_command(): void
         $ecotone->runConsoleCommand('ecotone:list', []);
         $this->expectNotToPerformAssertions();
     }
+
+    public function test_with_spying_on_multiple_channels(): void
+    {
+        $ecotoneLite = EcotoneLite::bootstrapFlowTesting(
+            [],
+            [],
+            enableAsynchronousProcessing: [
+                SimpleMessageChannelBuilder::createQueueChannel('async1'),
+                SimpleMessageChannelBuilder::createQueueChannel('async2'),
+            ],
+            testConfiguration: TestConfiguration::createWithDefaults()
+                ->withSpyOnChannel('async1')
+                ->withSpyOnChannel('async2')
+        );
+
+        $ecotoneLite->sendDirectToChannel('async1', 'test1');
+        $ecotoneLite->sendDirectToChannel('async2', 'test2');
+
+        $this->assertEquals(
+            [
+                'test1'
+            ],
+            $ecotoneLite->getRecordedMessagePayloadsFrom('async1')
+        );
+        $this->assertEquals(
+            [
+                'test2'
+            ],
+            $ecotoneLite->getRecordedMessagePayloadsFrom('async2')
+        );
+    }
 }
diff --git a/quickstart-examples/Asynchronous/composer.json b/quickstart-examples/Asynchronous/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/BuildingBlocks/composer.json b/quickstart-examples/BuildingBlocks/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/BusinessInterface/Asynchronous/composer.json b/quickstart-examples/BusinessInterface/Asynchronous/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/BusinessInterface/Routing/composer.json b/quickstart-examples/BusinessInterface/Routing/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/BusinessInterface/ServiceActivator/composer.json b/quickstart-examples/BusinessInterface/ServiceActivator/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/CQRS/composer.json b/quickstart-examples/CQRS/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/ConsoleCommand/Laravel/composer.json b/quickstart-examples/ConsoleCommand/Laravel/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/ConsoleCommand/Symfony/composer.json b/quickstart-examples/ConsoleCommand/Symfony/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/Conversion/composer.json b/quickstart-examples/Conversion/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/EmittingEventsFromProjection/composer.json b/quickstart-examples/EmittingEventsFromProjection/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "lendable-playground",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/ErrorHandling/composer.json b/quickstart-examples/ErrorHandling/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "workshop",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "autoload": {
         "psr-4": {

diff --git a/quickstart-examples/EventHandling/composer.json b/quickstart-examples/EventHandling/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/EventSourcing/composer.json b/quickstart-examples/EventSourcing/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/Microservices/composer.json b/quickstart-examples/Microservices/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MicroservicesAdvanced/composer.json b/quickstart-examples/MicroservicesAdvanced/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/General/HookIntoTenantSwitch/composer.json b/quickstart-examples/MultiTenant/General/HookIntoTenantSwitch/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/General/MessageBusForMultipleTenants/composer.json b/quickstart-examples/MultiTenant/General/MessageBusForMultipleTenants/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/General/RoundRobinWithSingleConsumer/composer.json b/quickstart-examples/MultiTenant/General/RoundRobinWithSingleConsumer/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/Laravel/Aggregate/composer.json b/quickstart-examples/MultiTenant/Laravel/Aggregate/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/Laravel/AsynchronousEvents/composer.json b/quickstart-examples/MultiTenant/Laravel/AsynchronousEvents/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/...kstart-examples/MultiTenant/Laravel/EventSourcing/app/ReadModel/RegisteredProductList.php b/...kstart-examples/MultiTenant/Laravel/EventSourcing/app/ReadModel/RegisteredProductList.php
@@ -63,7 +63,7 @@ public function getRegisteredProducts(): array
     {
         return DB::connection()->getDoctrineConnection()->fetchFirstColumn(
             sprintf(<<<SQL
-    SELECT name FROM %s ORDER BY registered_at DESC
+    SELECT name FROM %s ORDER BY name ASC
 SQL, self::TABLE_NAME));
     }
 

diff --git a/quickstart-examples/MultiTenant/Laravel/EventSourcing/composer.json b/quickstart-examples/MultiTenant/Laravel/EventSourcing/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/Laravel/Events/composer.json b/quickstart-examples/MultiTenant/Laravel/Events/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/Laravel/MessageBus/composer.json b/quickstart-examples/MultiTenant/Laravel/MessageBus/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/Symfony/Aggregate/composer.json b/quickstart-examples/MultiTenant/Symfony/Aggregate/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/composer.json b/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/Symfony/EventSourcing/composer.json b/quickstart-examples/MultiTenant/Symfony/EventSourcing/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/...kstart-examples/MultiTenant/Symfony/EventSourcing/src/ReadModel/RegisteredProductList.php b/...kstart-examples/MultiTenant/Symfony/EventSourcing/src/ReadModel/RegisteredProductList.php
@@ -65,7 +65,7 @@ public function getRegisteredProducts(#[MultiTenantConnection] Connection $conne
     {
         return $connection->fetchFirstColumn(
             sprintf(<<<SQL
-    SELECT name FROM %s ORDER BY registered_at DESC
+    SELECT name FROM %s ORDER BY name ASC
 SQL, self::TABLE_NAME));
     }
 

diff --git a/quickstart-examples/MultiTenant/Symfony/Events/composer.json b/quickstart-examples/MultiTenant/Symfony/Events/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/MultiTenant/Symfony/MessageBus/composer.json b/quickstart-examples/MultiTenant/Symfony/MessageBus/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/OutboxPattern/composer.json b/quickstart-examples/OutboxPattern/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/RefactorToReactiveSystem/composer.json b/quickstart-examples/RefactorToReactiveSystem/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/Schedule/composer.json b/quickstart-examples/Schedule/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/StatefulProjection/composer.json b/quickstart-examples/StatefulProjection/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "lendable-playground",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/Testing/composer.json b/quickstart-examples/Testing/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/Workflows/AsynchronousStateless/composer.json b/quickstart-examples/Workflows/AsynchronousStateless/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/Workflows/Saga/composer.json b/quickstart-examples/Workflows/Saga/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/Workflows/SynchronousStateless/composer.json b/quickstart-examples/Workflows/SynchronousStateless/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {

diff --git a/quickstart-examples/WorkingWithAggregateDirectly/composer.json b/quickstart-examples/WorkingWithAggregateDirectly/composer.json
@@ -1,5 +1,5 @@
 {
-    "type": "ecotone-quickstart",
+    "name": "ecotone/quickstart",
     "license": "MIT",
     "authors": [
         {