Skip to content

Commit

Permalink
ACP-4499: MessageBroker conditional channels handling (#9280)
Browse files Browse the repository at this point in the history 
ACP-4499 MessageBroker's publishing/consuming is idle by default.
  • Loading branch information
@pushokwhite
pushokwhite authored Jan 22, 2025
1 parent e9e78cd commit 3ea7896
Show file tree
Hide file tree
Showing 19 changed files with 74 additions and 45 deletions.
2 changes: 1 addition & 1 deletion acp-toolbox
Submodule acp-toolbox updated from 4e1466 to 5d3835
24 changes: 12 additions & 12 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion data/import/common/common/marketplace/product_stock.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions deploy.acp-dev.franken.dms.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
10 changes: 5 additions & 5 deletions deploy.acp-dev.franken.mb1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
10 changes: 5 additions & 5 deletions deploy.acp-dev.franken.mb2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
10 changes: 5 additions & 5 deletions deploy.acp-dev.standalone.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
15 changes: 15 additions & 0 deletions src/Pyz/Zed/MessageBroker/MessageBrokerConfig.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
*
Expand Down
11 changes: 11 additions & 0 deletions src/Pyz/Zed/MessageBroker/MessageBrokerDependencyProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(),
];
}
}
2 changes: 1 addition & 1 deletion tests/PyzTest/Zed/MessageBroker/Business/SendMessageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
6 changes: 3 additions & 3 deletions tests/PyzTest/Zed/MessageBroker/MessageHandlers/Asset/Communication/AssetMessageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function testAssetAddedMessageIsSuccessfullyHandled(): void

// Act
$this->tester->setupMessageBroker($assetAddedTransfer::class, $channelName);
$this->tester->setupMessageBrokerValidationPlugins();
$this->tester->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
$messageBrokerFacade->sendMessage($assetAddedTransfer);
$messageBrokerFacade->startWorker($this->tester->buildMessageBrokerWorkerConfigTransfer([$channelName], 1));
Expand All @@ -74,7 +74,7 @@ public function testAssetUpdatedMessageIsSuccessfullyHandled(): void
$slotName = 'header-top';

$this->tester->setupMessageBroker(AssetAddedTransfer::class, $channelName);
$this->tester->setupMessageBrokerValidationPlugins();
$this->tester->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
$messageBrokerWorkerConfigTransfer = $this->tester->buildMessageBrokerWorkerConfigTransfer([$channelName], 1);
$messageBrokerFacade->sendMessage(
Expand Down Expand Up @@ -112,7 +112,7 @@ public function testAssetDeletedMessageIsSuccessfullyHandled(): void
$assetUuid = Uuid::uuid4()->toString();

$this->tester->setupMessageBroker(AssetAddedTransfer::class, $channelName);
$this->tester->setupMessageBrokerValidationPlugins();
$this->tester->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
$messageBrokerWorkerConfigTransfer = $this->tester->buildMessageBrokerWorkerConfigTransfer([$channelName], 1);
$messageBrokerFacade->sendMessage(
Expand Down
2 changes: 2 additions & 0 deletions ...Zed/MessageBroker/MessageHandlers/PaymentMethod/Presentation/PaymentMethodMessageCest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public function testAddPaymentMethodMessageIsSuccessfullyHandled(PaymentMethodPr
$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(
[
Expand Down Expand Up @@ -100,6 +101,7 @@ 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(
[
Expand Down
2 changes: 1 addition & 1 deletion ...essageBroker/MessageHandlers/Product/Communication/InitializeProductExportMessageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function testInitializeProductExportMessageIsSuccessfullyHandled(): void

// Act
$this->tester->setupMessageBroker(InitializeProductExportTransfer::class, $channelName);
$this->tester->setupMessageBrokerValidationPlugins();
$this->tester->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
$messageBrokerFacade->sendMessage(
$this->tester->buildInitializeProductExportTransfer(),
Expand Down
2 changes: 1 addition & 1 deletion ...t/Zed/MessageBroker/MessageHandlers/ProductReview/Communication/AddReviewsMessageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function testAddReviewsMessageIsSuccessfullyHandled(): void

// Act
$this->tester->setupMessageBroker($addReviewsTransfer::class, $channelName);
$this->tester->setupMessageBrokerValidationPlugins();
$this->tester->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->tester->getLocator()->messageBroker()->facade();
$messageBrokerFacade->sendMessage($addReviewsTransfer);
$messageBrokerFacade->startWorker($this->tester->buildMessageBrokerWorkerConfigTransfer([$channelName], 1));
Expand Down
3 changes: 2 additions & 1 deletion tests/PyzTest/Zed/MessageBroker/_support/Helper/MessageBrokerHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ class MessageBrokerHelper extends Module
/**
* @return void
*/
public function setupMessageBrokerValidationPlugins(): void
public function setupMessageBrokerPlugins(): void
{
$this->getDependencyProviderHelper()->setDependency(MessageBrokerDependencyProvider::PLUGINS_EXTERNAL_VALIDATOR, []);
$this->getDependencyProviderHelper()->setDependency(MessageBrokerDependencyProvider::PLUGINS_FILTER_MESSAGE_CHANNEL, []);
}
}
2 changes: 1 addition & 1 deletion tests/PyzTest/Zed/MessageBroker/_support/PaymentPresentationTester.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function handlePaymentMessageTransfer(TransferInterface $paymentMessageTr
{
$channelName = 'payment-commands';
$this->setupMessageBroker($paymentMessageTransfer::class, $channelName);
$this->setupMessageBrokerValidationPlugins();
$this->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->getLocator()->messageBroker()->facade();
$messageBrokerFacade->sendMessage($paymentMessageTransfer);
$messageBrokerFacade->startWorker(
Expand Down
2 changes: 1 addition & 1 deletion tests/PyzTest/Zed/MessageBroker/_support/SearchHttpCommunicationTester.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function handleSearchMessage(TransferInterface $searchMessageTransfer): v
{
$channelName = 'search-commands';
$this->setupMessageBroker($searchMessageTransfer::class, $channelName);
$this->setupMessageBrokerValidationPlugins();
$this->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->getLocator()->messageBroker()->facade();
$messageBrokerFacade->sendMessage($searchMessageTransfer);
$messageBrokerFacade->startWorker(
Expand Down
2 changes: 1 addition & 1 deletion tests/PyzTest/Zed/MessageBroker/_support/TaxAppCommunicationTester.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function handleTaxAppMessage(TransferInterface $configureTaxAppMessage):
{
$channelName = 'tax-commands';
$this->setupMessageBroker($configureTaxAppMessage::class, $channelName);
$this->setupMessageBrokerValidationPlugins();
$this->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->getLocator()->messageBroker()->facade();
$messageBrokerFacade->sendMessage($configureTaxAppMessage);
$messageBrokerFacade->startWorker(
Expand Down
2 changes: 1 addition & 1 deletion tests/PyzTest/Zed/TaxApp/_support/TaxAppTester.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function handleTaxAppMessage(TransferInterface $configureTaxAppMessage):
{
$channelName = 'tax-commands';
$this->setupMessageBroker($configureTaxAppMessage::class, $channelName);
$this->setupMessageBrokerValidationPlugins();
$this->setupMessageBrokerPlugins();
$messageBrokerFacade = $this->getLocator()->messageBroker()->facade();
$messageBrokerFacade->sendMessage($configureTaxAppMessage);
$messageBrokerFacade->startWorker(
Expand Down

0 comments on commit 3ea7896

Please sign in to comment.