Merge branch 'ACP2E-2066' of https://github.com/magento-l3/magento2ce into PR-L3-08112023

Author: chittima

lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Converter/Publisher.php

@@ -27,7 +27,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function convert($source)
     {
@@ -40,10 +40,12 @@ public function convert($source)
                 if (isset($configuration['connections'])) {
                     $publisherData = [];
                     foreach ($configuration['connections'] as $connectionName => $config) {
-                        if (isset($this->connectionToExchangeMap[$connectionName])) {
-                            $publisherName = $connectionName . '-' . $this->connectionToExchangeMap[$connectionName];
+                        $exchange = $config['exchange'] ?? $this->connectionToExchangeMap[$connectionName] ?? null;
+                        if ($exchange) {
+                            $publisherName = $connectionName . '-' . $exchange;
                             $config['connection'] = $config['name'];
                             $config['name'] = $publisherName;
+                            $config['exchange'] = $exchange;
                             $publisherData[$publisherName] = $config;
                             $connections = array_replace_recursive($connections, $publisherData);
                         }

lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Env/Converter/PublisherTest.php

@@ -32,10 +32,41 @@ protected function setUp(): void
     public function testConvert()
     {
         $source = include __DIR__ . '/../../../../_files/env_2_2.php';
+        $expectedConfig = [
+            'amqp-magento-db' => [
+                'name' => 'amqp-magento-db',
+                'exchange' => 'magento-db',
+                'connection' =>'db'
+            ]
+        ];
+        $actualResult = $this->converter->convert($source['config']);
+        $this->assertEquals($expectedConfig, $actualResult[ReaderEnv::ENV_PUBLISHERS]);
+    }
+
+    public function testConvertUndefinedExchange()
+    {
+        $source = [
+            'config' => [
+                'publishers' => [
+                    'inventory.counter.updated' => [
+                        'connections' => [
+                            'amqp' => [
+                                'name' => 'db',
+                            ],
+                        ]
+                    ]
+                ],
+                'consumers' => [
+                    'inventoryQtyCounter' => [
+                        'connection' => 'db'
+                    ]
+                ]
+            ]
+        ];
         $expectedConfig = [
             'amqp-magento' => [
                 'name' => 'amqp-magento',
-                'exchange' => 'magento-db',
+                'exchange' => 'magento',
                 'connection' =>'db'
             ]
         ];