Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-2902' into Tier4-Kings-PR-06-03-2024

Author: Sarmistha

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -1912,9 +1912,7 @@ protected function _saveTitles(array $titles)
             if (!isset($existingOptionIds[$optionId]) && count($storeInfo) > 0) {
                 $storeInfo = [Store::DEFAULT_STORE_ID => reset($storeInfo)] + $storeInfo;
             }
-            //for use default
-            $uniqStoreInfo = array_unique($storeInfo);
-            foreach ($uniqStoreInfo as $storeId => $title) {
+            foreach ($storeInfo as $storeId => $title) {
                 $titleRows[] = ['option_id' => $optionId, 'store_id' => $storeId, 'title' => $title];
             }
         }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductOptionsTest.php

@@ -13,13 +13,17 @@
 use Magento\Catalog\Helper\Data as CatalogConfig;
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\CatalogImportExport\Model\Import\ProductTestBase;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
 use Magento\ImportExport\Helper\Data as ImportExportConfig;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Test\Fixture\Store as StoreFixture;
 use Magento\TestFramework\Fixture\AppIsolation;
 use Magento\TestFramework\Fixture\Config;
 use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Integration test for \Magento\CatalogImportExport\Model\Import\Product class.
@@ -90,7 +94,7 @@ public function testSaveCustomOptions(string $importFile, string $sku, int $expe
         $importModel->importData();
 
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $productRepository = Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Api\ProductRepositoryInterface::class
         );
         $product = $productRepository->get($sku);
@@ -187,17 +191,17 @@ public function testSaveCustomOptionsWithMultipleStoreViews(
         array $expected
     ) {
         $expected = $this->getFullExpectedOptions($expected);
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
         /** @var StoreManagerInterface $storeManager */
         $storeManager = $objectManager->get(StoreManagerInterface::class);
         $pathToFile = __DIR__ . '/../_files/' . $importFile;
         $importModel = $this->createImportModel($pathToFile);
         $errors = $importModel->validateData();
         $this->assertTrue($errors->getErrorsCount() == 0, 'Import File Validation Failed');
         $importModel->importData();
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $objectManager->get(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
+            ProductRepositoryInterface::class
         );
         $actual = [];
         foreach ($expected as $sku => $storesData) {
@@ -982,9 +986,9 @@ public function testImportCustomOptions(string $importFile, string $sku1, string
         $this->assertTrue($errors->getErrorsCount() == 0);
         $importModel->importData();
 
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = Bootstrap::getObjectManager()->create(
+            ProductRepositoryInterface::class
         );
         $product1 = $productRepository->get($sku1);
 
@@ -1025,4 +1029,64 @@ public function getCustomOptionDataProvider(): array
             ],
         ];
     }
+
+    /**
+     * Tests import product custom options with multiple uploads.
+     *
+     * @dataProvider getProductCustomOptionDataProvider
+     * @param string $importFile
+     * @param string $sku
+     * @param int $uploadCount
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     * @throws StateException
+     */
+    public function testImportProductCustomOptionsOnMultipleUploads(
+        string $importFile,
+        string $sku,
+        int $uploadCount
+    ): void {
+        $pathToFile = __DIR__ . '/../_files/' . $importFile;
+
+        for ($count = 0; $count < $uploadCount; $count++) {
+            $productImportModel = $this->createImportModel($pathToFile);
+            $errors = $productImportModel->validateData();
+            $this->assertTrue($errors->getErrorsCount() == 0);
+            $productImportModel->importData();
+        }
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = Bootstrap::getObjectManager()->create(
+            ProductRepositoryInterface::class
+        );
+        $product = $productRepository->get($sku);
+
+        $this->assertInstanceOf(\Magento\Catalog\Model\Product::class, $product);
+        $options = $product->getOptionInstance()->getProductOptions($product);
+
+        $expectedData = $this->getExpectedOptionsData($pathToFile, 'default');
+        $expectedOptions = $expectedData['options'];
+
+        $this->assertCount(count($expectedOptions), $options);
+
+        // Cleanup imported products
+        try {
+            $this->productRepository->delete($product);
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getProductCustomOptionDataProvider(): array
+    {
+        return [
+            [
+                'importFile' => 'product_with_custom_options_and_multiple_uploads.csv',
+                'sku' => 'p1',
+                'uploadCount' => 2,
+            ],
+        ];
+    }
 }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_and_multiple_uploads.csv

@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,custom_options
+p1,default,Default,simple,"name=Option One,type=multiple,required=0,price=2.000000,sku=1,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=One|name=Option One,type=multiple,required=0,price=2.000000,sku=2,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Two|name=Option Two,type=multiple,required=0,price=3.000000,sku=3,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Three|name=Option Two,type=multiple,required=0,price=4.000000,sku=4,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Four"