Auto-updating Spryker modules on 2025-01-27 12:11 for release group #…

…5704 / Jira ticket ACP-4499 (#635) * Applied release group `ACP-4499 MessageBroker's publishing/consuming is idle by default.`, RG link https://api.release.spryker.com/release-group/5704 * ACP-4499: Test fixes * ACP-4499: Test fixes --------- Co-authored-by: upgrader <[email protected]> Co-authored-by: Anton Zubariev <[email protected]>
spryker-shop · Jan 28, 2025 · 4ae1442 · 4ae1442
1 parent 4e21fd7
commit 4ae1442
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 45 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Pyz/Zed/MessageBroker/MessageBrokerConfig.php b/src/Pyz/Zed/MessageBroker/MessageBrokerConfig.php
@@ -28,4 +28,19 @@ public function getDefaultWorkerChannels(): array
             'tax-commands',
         ];
     }
+
+    /**
+     * Specification:
+     * - Returns system worker channels used to retrieve service messages.
+     *
+     * @api
+     *
+     * @return list<string>
+     */
+    public function getSystemWorkerChannels(): array
+    {
+        return [
+            'app-events',
+        ];
+    }
 }
diff --git a/src/Pyz/Zed/MessageBroker/MessageBrokerDependencyProvider.php b/src/Pyz/Zed/MessageBroker/MessageBrokerDependencyProvider.php
@@ -10,6 +10,7 @@
 namespace Pyz\Zed\MessageBroker;
 
 use Spryker\Zed\Asset\Communication\Plugin\MessageBroker\AssetMessageHandlerPlugin;
+use Spryker\Zed\KernelApp\Communication\Plugin\MessageBroker\ActiveAppFilterMessageChannelPlugin;
 use Spryker\Zed\MessageBroker\Communication\Plugin\MessageBroker\CorrelationIdMessageAttributeProviderPlugin;
 use Spryker\Zed\MessageBroker\Communication\Plugin\MessageBroker\TenantActorMessageAttributeProviderPlugin;
 use Spryker\Zed\MessageBroker\Communication\Plugin\MessageBroker\TimestampMessageAttributeProviderPlugin;
@@ -91,4 +92,14 @@ public function getMiddlewarePlugins(): array
             new ValidationMiddlewarePlugin(),
         ];
     }
+
+    /**
+     * @return array<\Spryker\Zed\MessageBrokerExtension\Dependency\Plugin\FilterMessageChannelPluginInterface>
+     */
+    public function getFilterMessageChannelPlugins(): array
+    {
+        return [
+            new ActiveAppFilterMessageChannelPlugin(),
+        ];
+    }
 }
diff --git a/tests/PyzTest/Zed/MessageBroker/Business/SendMessageTest.php b/tests/PyzTest/Zed/MessageBroker/Business/SendMessageTest.php
@@ -52,6 +52,7 @@ public function testCheckAttributesBeforeSendingMessage(): void
         // Arrange
         $messageSenderPlugin = $this->createMock(MessageSenderPluginInterface::class);
 
+        $this->tester->setupMessageBrokerPlugins();
         $this->tester->setMessageToSenderChannelNameMap(MessageBrokerTestMessageTransfer::class, static::CHANNEL_NAME);
         $this->tester->setChannelToTransportMap(static::CHANNEL_NAME, $messageSenderPlugin->getTransportName());
 

diff --git a/tests/PyzTest/Zed/MessageBroker/MessageHandlers/Asset/Communication/AssetMessageTest.php b/tests/PyzTest/Zed/MessageBroker/MessageHandlers/Asset/Communication/AssetMessageTest.php
@@ -52,6 +52,7 @@ public function testAssetAddedMessageIsSuccessfullyHandled(): void
 
         // Act
         $this->tester->setupMessageBroker($assetAddedTransfer::class, $channelName);
+        $this->tester->setupMessageBrokerPlugins();
         $messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
         $messageBrokerFacade->sendMessage($assetAddedTransfer);
         $messageBrokerFacade->startWorker($this->tester->buildMessageBrokerWorkerConfigTransfer([$channelName], 1));
@@ -73,6 +74,7 @@ public function testAssetUpdatedMessageIsSuccessfullyHandled(): void
         $slotName = 'header-top';
 
         $this->tester->setupMessageBroker(AssetAddedTransfer::class, $channelName);
+        $this->tester->setupMessageBrokerPlugins();
         $messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
         $messageBrokerWorkerConfigTransfer = $this->tester->buildMessageBrokerWorkerConfigTransfer([$channelName], 1);
         $messageBrokerFacade->sendMessage(
@@ -110,6 +112,7 @@ public function testAssetDeletedMessageIsSuccessfullyHandled(): void
         $assetUuid = Uuid::uuid4()->toString();
 
         $this->tester->setupMessageBroker(AssetAddedTransfer::class, $channelName);
+        $this->tester->setupMessageBrokerPlugins();
         $messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
         $messageBrokerWorkerConfigTransfer = $this->tester->buildMessageBrokerWorkerConfigTransfer([$channelName], 1);
         $messageBrokerFacade->sendMessage(

diff --git a/...Zed/MessageBroker/MessageHandlers/PaymentMethod/Presentation/PaymentMethodMessageCest.php b/...Zed/MessageBroker/MessageHandlers/PaymentMethod/Presentation/PaymentMethodMessageCest.php
@@ -13,6 +13,7 @@
 use Generated\Shared\Transfer\DeletePaymentMethodTransfer;
 use PyzTest\Zed\MessageBroker\PageObject\PaymentMethodPage;
 use PyzTest\Zed\MessageBroker\PaymentMethodPresentationTester;
+use Spryker\Zed\MessageBroker\MessageBrokerDependencyProvider;
 
 /**
  * Auto-generated group annotations
@@ -56,6 +57,8 @@ public function testAddPaymentMethodMessageIsSuccessfullyHandled(PaymentMethodPr
         // Act
         $channelName = 'payment-method-commands';
         $I->setupMessageBroker(AddPaymentMethodTransfer::class, $channelName);
+        $I->setDependency(MessageBrokerDependencyProvider::PLUGINS_EXTERNAL_VALIDATOR, []);
+        $I->setDependency(MessageBrokerDependencyProvider::PLUGINS_FILTER_MESSAGE_CHANNEL, []);
         $messageBrokerFacade->sendMessage(
             $I->haveAddPaymentMethodTransfer(
                 [
@@ -97,6 +100,8 @@ public function testPaymentMethodRemovedMessageIsSuccessfullyHandled(PaymentMeth
 
         $channelName = 'payment-method-commands';
         $I->setupMessageBroker(AddPaymentMethodTransfer::class, $channelName);
+        $I->setDependency(MessageBrokerDependencyProvider::PLUGINS_EXTERNAL_VALIDATOR, []);
+        $I->setDependency(MessageBrokerDependencyProvider::PLUGINS_FILTER_MESSAGE_CHANNEL, []);
         $messageBrokerFacade->sendMessage(
             $I->haveAddPaymentMethodTransfer(
                 [

diff --git a/...essageBroker/MessageHandlers/Product/Communication/InitializeProductExportMessageTest.php b/...essageBroker/MessageHandlers/Product/Communication/InitializeProductExportMessageTest.php
@@ -66,6 +66,7 @@ public function testInitializeProductExportMessageIsSuccessfullyHandled(): void
 
         // Act
         $this->tester->setupMessageBroker(InitializeProductExportTransfer::class, $channelName);
+        $this->tester->setupMessageBrokerPlugins();
         $messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
         $messageBrokerFacade->sendMessage(
             $this->tester->buildInitializeProductExportTransfer(),

diff --git a/...t/Zed/MessageBroker/MessageHandlers/ProductReview/Communication/AddReviewsMessageTest.php b/...t/Zed/MessageBroker/MessageHandlers/ProductReview/Communication/AddReviewsMessageTest.php
@@ -44,6 +44,7 @@ public function testAddReviewsMessageIsSuccessfullyHandled(): void
 
         // Act
         $this->tester->setupMessageBroker($addReviewsTransfer::class, $channelName);
+        $this->tester->setupMessageBrokerPlugins();
         $messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
         $messageBrokerFacade->sendMessage($addReviewsTransfer);
         $messageBrokerFacade->startWorker($this->tester->buildMessageBrokerWorkerConfigTransfer([$channelName], 1));

diff --git a/.../Zed/MessageBroker/MessageHandlers/SearchHttp/Communication/SearchEndpointMessageTest.php b/.../Zed/MessageBroker/MessageHandlers/SearchHttp/Communication/SearchEndpointMessageTest.php
@@ -44,7 +44,7 @@ public function testSearchEndpointAvailableMessageIsSuccessfullyHandled(): void
         $this->tester->handleSearchMessage($searchEndpointAvailableTransfer);
 
         // Assert
-        $this->tester->assertSearchHttpConfigExists();
+        $this->tester->assertSearchHttpConfigExistsForStore();
     }
 
     /**

diff --git a/tests/PyzTest/Zed/MessageBroker/_support/Helper/MessageBrokerHelper.php b/tests/PyzTest/Zed/MessageBroker/_support/Helper/MessageBrokerHelper.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of the Spryker Commerce OS.
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types = 1);
+
+namespace PyzTest\Zed\MessageBroker\Helper;
+
+use Codeception\Module;
+use Spryker\Zed\MessageBroker\MessageBrokerDependencyProvider;
+use SprykerTest\Zed\Testify\Helper\Business\DependencyProviderHelperTrait;
+
+class MessageBrokerHelper extends Module
+{
+    use DependencyProviderHelperTrait;
+
+    /**
+     * @return void
+     */
+    public function setupMessageBrokerPlugins(): void
+    {
+        $this->getDependencyProviderHelper()->setDependency(MessageBrokerDependencyProvider::PLUGINS_EXTERNAL_VALIDATOR, []);
+        $this->getDependencyProviderHelper()->setDependency(MessageBrokerDependencyProvider::PLUGINS_FILTER_MESSAGE_CHANNEL, []);
+    }
+}
diff --git a/tests/PyzTest/Zed/MessageBroker/_support/PaymentPresentationTester.php b/tests/PyzTest/Zed/MessageBroker/_support/PaymentPresentationTester.php
@@ -94,6 +94,7 @@ public function handlePaymentMessageTransfer(TransferInterface $paymentMessageTr
     {
         $channelName = 'payment-commands';
         $this->setupMessageBroker($paymentMessageTransfer::class, $channelName);
+        $this->setupMessageBrokerPlugins();
         $messageBrokerFacade = $this->getLocator()->messageBroker()->facade();
         $messageBrokerFacade->sendMessage($paymentMessageTransfer);
         $messageBrokerFacade->startWorker(

diff --git a/tests/PyzTest/Zed/MessageBroker/_support/SearchHttpCommunicationTester.php b/tests/PyzTest/Zed/MessageBroker/_support/SearchHttpCommunicationTester.php
@@ -41,7 +41,7 @@ class SearchHttpCommunicationTester extends Actor
     /**
      * @return void
      */
-    public function assertSearchHttpConfigExists(): void
+    public function assertSearchHttpConfigExistsForStore(): void
     {
         $searchHttpConfigEntity = $this->getSearchHttpConfigEntity();
 
@@ -99,6 +99,7 @@ public function handleSearchMessage(TransferInterface $searchMessageTransfer): v
     {
         $channelName = 'search-commands';
         $this->setupMessageBroker($searchMessageTransfer::class, $channelName);
+        $this->setupMessageBrokerPlugins();
         $messageBrokerFacade = $this->getLocator()->messageBroker()->facade();
         $messageBrokerFacade->sendMessage($searchMessageTransfer);
         $messageBrokerFacade->startWorker(

diff --git a/tests/PyzTest/Zed/MessageBroker/_support/TaxAppCommunicationTester.php b/tests/PyzTest/Zed/MessageBroker/_support/TaxAppCommunicationTester.php
@@ -119,6 +119,7 @@ public function handleTaxAppMessage(TransferInterface $configureTaxAppMessage):
     {
         $channelName = 'tax-commands';
         $this->setupMessageBroker($configureTaxAppMessage::class, $channelName);
+        $this->setupMessageBrokerPlugins();
         $messageBrokerFacade = $this->getLocator()->messageBroker()->facade();
         $messageBrokerFacade->sendMessage($configureTaxAppMessage);
         $messageBrokerFacade->startWorker(