use unique key for grouped option

Author: virfaure

CatalogDataExporter/Model/Provider/Product/ProductOptions/GroupedProductOptions.php

@@ -73,15 +73,16 @@ public function get(array $values) : array
                 );
 
                 while ($row = $cursor->fetch()) {
-                    $optionValues[$row['parentId']][] = $this->formatOptionsValueRow($row);
+                    $key = $this->getOptionKey($row['parentId'], $storeViewCode);
+                    $optionValues[$key][] = $this->formatOptionsValueRow($row);
 
-                    $output[$row['parentId']] = [
+                    $output[$key] = [
                         'productId' => $row['parentId'],
                         'storeViewCode' => $storeViewCode,
                         'optionsV2' => [
                             'type' => Grouped::TYPE_CODE,
                             'id' => $row['parentId'],
-                            'values' => $optionValues[$row['parentId']],
+                            'values' => $optionValues[$key],
                         ]
                     ];
                 }
@@ -94,6 +95,19 @@ public function get(array $values) : array
         return $output;
     }
 
+    /**
+     * Generate option key by concatenating parentId, storeViewCode
+     *
+     * @param string $parentId
+     * @param string $storeViewCode
+     *
+     * @return string
+     */
+    private function getOptionKey(string $parentId, string $storeViewCode): string
+    {
+        return $parentId . $storeViewCode;
+    }
+
     /**
      * Format options value row data for grouped products.
      *

CatalogDataExporter/Test/Integration/GroupedProductsTest.php

@@ -57,6 +57,37 @@ public function testGroupedProductOptions(array $groupedProductOptionsDataProvid
         }
     }
 
+    /**
+     * Validate grouped product options data in multiple website
+     *
+     * @param array $groupedProductOptionsDataProvider
+     *
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped_in_multiple_websites.php
+     * @dataProvider getGroupedProductOptionsDataProvider
+     *
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testGroupedProductOptionsInMultipleWebsites(array $groupedProductOptionsDataProvider) : void
+    {
+        $storeViews = ['fixture_second_store','fixture_third_store'];
+
+        foreach ($storeViews as $store) {
+            $extractedProduct = $this->getExtractedProduct('grouped-product', $store);
+            $this->assertNotEmpty($extractedProduct, 'Feed data must not be empty');
+
+            // Assert values are equal for fixture_second_store
+            $groupedProductOptionsDataProvider['feedData']['storeViewCode'] = $store;
+            foreach ($groupedProductOptionsDataProvider as $key => $expectedData) {
+                $diff = $this->arrayUtils->recursiveDiff($expectedData, $extractedProduct[$key]);
+                self::assertEquals([], $diff, 'Actual feed data doesn\'t equal to expected data');
+            }
+        }
+    }
+
     /**
      * Get grouped product options data provider
      *