Merge pull request #1678 from spryker-shop/bugfix/acp-4499-message-br…

…oker-conditional-channels-handling Auto-merge based on green CI result.
spryker-shop · Jan 22, 2025 · 0e8a0e2 · 0e8a0e2
2 parents 5595b08 + 267bd7a
commit 0e8a0e2
Show file tree

Hide file tree

Showing 19 changed files with 109 additions and 79 deletions.
diff --git a/acp-toolbox b/acp-toolbox
diff --git a/composer.lock b/composer.lock
diff --git a/data/import/common/common/marketplace/product_stock.csv b/data/import/common/common/marketplace/product_stock.csv
@@ -278,7 +278,7 @@ concrete_sku,name,quantity,is_never_out_of_stock,is_bundle
 195_25904159,Video King MER000002 Warehouse 1,10,0,0
 196_23120327,Video King MER000002 Warehouse 1,10,0,0
 196_23120327,Spryker MER000001 Warehouse 1,10,0,0
-197_21421718,Video King MER000002 Warehouse 1,10,0,0
+197_21421718,Video King MER000002 Warehouse 1,10,1,0
 198_19692589,Video King MER000002 Warehouse 1,10,0,0
 199_7016823,Video King MER000002 Warehouse 1,10,0,0
 199_24788780,Video King MER000002 Warehouse 1,10,0,0

diff --git a/deploy.acp-dev.franken.dms.yml b/deploy.acp-dev.franken.dms.yml
@@ -32,11 +32,11 @@ image:
             "APP_DOMAINS": ["apps.spryker.local", "*.bazaarvoice.com"],
             "STORE_NAME_REFERENCE_MAP": {},
             "APP_CATALOG_SCRIPT_URL": "",
-            "PAYONE_APP_IDENTIFIER": "app-098aa300-2e3d-5a32-89c6-d79c45f15cd4",
-            "BAZAARVOICE_APP_IDENTIFIER": "app-b72fa702-7d8e-5d14-92b9-b8c9ad9c7066",
-            "USERCENTRICS_APP_IDENTIFIER": "app-804ebe5b-00f5-5121-9f90-29301d033dbb",
-            "ALGOLIA_APP_IDENTIFIER": "app-12470c65-13c1-4e1f-b48a-711196a22511",
-            "VERTEX_APP_IDENTIFIER": "app-7ff8d24e-4ea1-4440-b760-0aa92e60405b"
+            "PAYONE_APP_IDENTIFIER": "098aa300-2e3d-5a32-89c6-d79c45f15cd4",
+            "BAZAARVOICE_APP_IDENTIFIER": "b72fa702-7d8e-5d14-92b9-b8c9ad9c7066",
+            "USERCENTRICS_APP_IDENTIFIER": "804ebe5b-00f5-5121-9f90-29301d033dbb",
+            "ALGOLIA_APP_IDENTIFIER": "12470c65-13c1-4e1f-b48a-711196a22511",
+            "VERTEX_APP_IDENTIFIER": "7ff8d24e-4ea1-4440-b760-0aa92e60405b"
             }'
         SPRYKER_AOP_AUTHENTICATION: '{
             "AUTH0_CUSTOM_DOMAIN": "",

diff --git a/deploy.acp-dev.franken.mb1.yml b/deploy.acp-dev.franken.mb1.yml
@@ -25,11 +25,11 @@ image:
             "APP_DOMAINS": ["apps.spryker.local", "*.bazaarvoice.com"],
             "STORE_NAME_REFERENCE_MAP": {},
             "APP_CATALOG_SCRIPT_URL": "",
-            "PAYONE_APP_IDENTIFIER": "app-098aa300-2e3d-5a32-89c6-d79c45f15cd4",
-            "BAZAARVOICE_APP_IDENTIFIER": "app-b72fa702-7d8e-5d14-92b9-b8c9ad9c7066",
-            "USERCENTRICS_APP_IDENTIFIER": "app-804ebe5b-00f5-5121-9f90-29301d033dbb",
-            "ALGOLIA_APP_IDENTIFIER": "app-12470c65-13c1-4e1f-b48a-711196a22511",
-            "VERTEX_APP_IDENTIFIER": "app-7ff8d24e-4ea1-4440-b760-0aa92e60405b"
+            "PAYONE_APP_IDENTIFIER": "098aa300-2e3d-5a32-89c6-d79c45f15cd4",
+            "BAZAARVOICE_APP_IDENTIFIER": "b72fa702-7d8e-5d14-92b9-b8c9ad9c7066",
+            "USERCENTRICS_APP_IDENTIFIER": "804ebe5b-00f5-5121-9f90-29301d033dbb",
+            "ALGOLIA_APP_IDENTIFIER": "12470c65-13c1-4e1f-b48a-711196a22511",
+            "VERTEX_APP_IDENTIFIER": "7ff8d24e-4ea1-4440-b760-0aa92e60405b"
             }'
         SPRYKER_AOP_AUTHENTICATION: '{
             "AUTH0_CUSTOM_DOMAIN": "",

diff --git a/deploy.acp-dev.franken.mb2.yml b/deploy.acp-dev.franken.mb2.yml
@@ -23,11 +23,11 @@ image:
             "APP_DOMAINS": ["apps.spryker.local", "*.bazaarvoice.com"],
             "STORE_NAME_REFERENCE_MAP": {},
             "APP_CATALOG_SCRIPT_URL": "",
-            "PAYONE_APP_IDENTIFIER": "app-098aa300-2e3d-5a32-89c6-d79c45f15cd4",
-            "BAZAARVOICE_APP_IDENTIFIER": "app-b72fa702-7d8e-5d14-92b9-b8c9ad9c7066",
-            "USERCENTRICS_APP_IDENTIFIER": "app-804ebe5b-00f5-5121-9f90-29301d033dbb",
-            "ALGOLIA_APP_IDENTIFIER": "app-12470c65-13c1-4e1f-b48a-711196a22511",
-            "VERTEX_APP_IDENTIFIER": "app-7ff8d24e-4ea1-4440-b760-0aa92e60405b"
+            "PAYONE_APP_IDENTIFIER": "098aa300-2e3d-5a32-89c6-d79c45f15cd4",
+            "BAZAARVOICE_APP_IDENTIFIER": "b72fa702-7d8e-5d14-92b9-b8c9ad9c7066",
+            "USERCENTRICS_APP_IDENTIFIER": "804ebe5b-00f5-5121-9f90-29301d033dbb",
+            "ALGOLIA_APP_IDENTIFIER": "12470c65-13c1-4e1f-b48a-711196a22511",
+            "VERTEX_APP_IDENTIFIER": "7ff8d24e-4ea1-4440-b760-0aa92e60405b"
             }'
         SPRYKER_AOP_AUTHENTICATION: '{
             "AUTH0_CUSTOM_DOMAIN": "",

diff --git a/deploy.acp-dev.standalone.yml b/deploy.acp-dev.standalone.yml
@@ -25,11 +25,11 @@ image:
             "APP_DOMAINS": ["apps.spryker.local", "*.bazaarvoice.com"],
             "STORE_NAME_REFERENCE_MAP": {},
             "APP_CATALOG_SCRIPT_URL": "",
-            "PAYONE_APP_IDENTIFIER": "app-098aa300-2e3d-5a32-89c6-d79c45f15cd4",
-            "BAZAARVOICE_APP_IDENTIFIER": "app-b72fa702-7d8e-5d14-92b9-b8c9ad9c7066",
-            "USERCENTRICS_APP_IDENTIFIER": "app-804ebe5b-00f5-5121-9f90-29301d033dbb",
-            "ALGOLIA_APP_IDENTIFIER": "app-12470c65-13c1-4e1f-b48a-711196a22511",
-            "VERTEX_APP_IDENTIFIER": "app-7ff8d24e-4ea1-4440-b760-0aa92e60405b"
+            "PAYONE_APP_IDENTIFIER": "098aa300-2e3d-5a32-89c6-d79c45f15cd4",
+            "BAZAARVOICE_APP_IDENTIFIER": "b72fa702-7d8e-5d14-92b9-b8c9ad9c7066",
+            "USERCENTRICS_APP_IDENTIFIER": "804ebe5b-00f5-5121-9f90-29301d033dbb",
+            "ALGOLIA_APP_IDENTIFIER": "12470c65-13c1-4e1f-b48a-711196a22511",
+            "VERTEX_APP_IDENTIFIER": "7ff8d24e-4ea1-4440-b760-0aa92e60405b"
             }'
         SPRYKER_AOP_AUTHENTICATION: '{
             "AUTH0_CUSTOM_DOMAIN": "",

diff --git a/src/Pyz/Zed/MessageBroker/MessageBrokerConfig.php b/src/Pyz/Zed/MessageBroker/MessageBrokerConfig.php
@@ -33,6 +33,21 @@ public function getDefaultWorkerChannels(): array
         ];
     }
 
+    /**
+     * {@inheritDoc}
+     * - The list below is used strictly recommended to leave as is.
+     *
+     * @api
+     *
+     * @return list<string>
+     */
+    public function getSystemWorkerChannels(): array
+    {
+        return [
+            'app-events',
+        ];
+    }
+
     /**
      * {@inheritDoc}
      *

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\KernelApp\Communication\Plugin\MessageBroker\AppConfigMessageHandlerPlugin;
 use Spryker\Zed\MerchantApp\Communication\Plugin\MessageBroker\MerchantAppOnboardingMessageHandlerPlugin;
 use Spryker\Zed\MessageBroker\Communication\Plugin\MessageBroker\CorrelationIdMessageAttributeProviderPlugin;
@@ -133,4 +134,14 @@ public function getExternalValidatorPlugins(): array
             new StoreReferenceMessageValidatorPlugin(),
         ];
     }
+
+    /**
+     * @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,7 +52,7 @@ public function testCheckAttributesBeforeSendingMessage(): void
         // Arrange
         $messageSenderPlugin = $this->createMock(MessageSenderPluginInterface::class);
 
-        $this->tester->setupMessageBrokerValidationPlugins();
+        $this->tester->setupMessageBrokerPlugins();
         $this->tester->setMessageToSenderChannelNameMap(MessageBrokerTestMessageTransfer::class, static::CHANNEL_NAME);
         $this->tester->setChannelToTransportMap(static::CHANNEL_NAME, $messageSenderPlugin->getTransportName());