ACP2E-2261: [Cloud] Product import fails with custom separator value

Author: pradeep1819

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

@@ -938,7 +938,7 @@ public function __construct(
         $this->_optionEntity = $data['option_entity'] ??
             $optionFactory->create(['data' => ['product_entity' => $this]]);
         $this->skuStorage = $skuStorage ?? ObjectManager::getInstance()
-            ->get(SkuStorage::class);
+                ->get(SkuStorage::class);
         $this->_initAttributeSets()
             ->_initTypeModels()
             ->_initSkus()
@@ -948,7 +948,7 @@ public function __construct(
         $this->productRepository = $productRepository ?? ObjectManager::getInstance()
                 ->get(ProductRepositoryInterface::class);
         $this->stockItemProcessor = $stockItemProcessor ?? ObjectManager::getInstance()
-            ->get(StockItemProcessorInterface::class);
+                ->get(StockItemProcessorInterface::class);
     }
 
     /**
@@ -2002,8 +2002,8 @@ private function saveProductMediaGalleryPhase(
     private function saveProductAttributesPhase(
         array $rowData,
         int $rowScope,
-        &$previousType,
-        &$prevAttributeSet,
+              &$previousType,
+              &$prevAttributeSet,
         array &$attributes
     ) : void {
         $rowSku = $rowData[self::COL_SKU];
@@ -2836,7 +2836,7 @@ private function prepareNewSkuData($sku)
      *
      * @return array
      */
-    private function _parseAdditionalAttributes($rowData)
+    private function _parseAdditionalAttributes(array $rowData): array
     {
         if (empty($rowData['additional_attributes'])) {
             return $rowData;
@@ -2846,7 +2846,7 @@ private function _parseAdditionalAttributes($rowData)
                 $rowData[mb_strtolower($key)] = $value;
             }
         } else {
-            $rowData = array_merge($rowData, $this->getAdditionalAttributes($rowData['additional_attributes']));
+            $rowData = array_merge($rowData, $this->getAdditionalAttributes($rowData));
         }
         return $rowData;
     }
@@ -2860,14 +2860,14 @@ private function _parseAdditionalAttributes($rowData)
      *      codeN => valueN
      * ]
      *
-     * @param string $additionalAttributes Attributes data that will be parsed
+     * @param array $rowData
      * @return array
      */
-    private function getAdditionalAttributes($additionalAttributes)
+    private function getAdditionalAttributes(array $rowData): array
     {
         return empty($this->_parameters[Import::FIELDS_ENCLOSURE])
-            ? $this->parseAttributesWithoutWrappedValues($additionalAttributes)
-            : $this->parseAttributesWithWrappedValues($additionalAttributes);
+            ? $this->parseAttributesWithoutWrappedValues($rowData['additional_attributes'], $rowData['product_type'])
+            : $this->parseAttributesWithWrappedValues($rowData['additional_attributes']);
     }
 
     /**
@@ -2881,9 +2881,10 @@ private function getAdditionalAttributes($additionalAttributes)
      *
      * @param string $attributesData Attributes data that will be parsed. It keeps data in format:
      *      code=value,code2=value2...,codeN=valueN
+     * @param string $productType
      * @return array
      */
-    private function parseAttributesWithoutWrappedValues($attributesData)
+    private function parseAttributesWithoutWrappedValues(string $attributesData, string $productType): array
     {
         $attributeNameValuePairs = explode($this->getMultipleValueSeparator(), $attributesData);
         $preparedAttributes = [];
@@ -2894,21 +2895,21 @@ private function parseAttributesWithoutWrappedValues($attributesData)
                 if (!$code) {
                     continue;
                 }
-                //concatenate attribute values with last used separator in case of array
-                if (is_array($preparedAttributes[$code])
-                    && str_contains($attributesData, self::PSEUDO_MULTI_LINE_SEPARATOR)) {
-                    $preparedAttributes[$code] = implode(
-                        self::PSEUDO_MULTI_LINE_SEPARATOR,
-                        $preparedAttributes[$code]
-                    );
-                }
                 $preparedAttributes[$code] .= $this->getMultipleValueSeparator() . $attributeData;
                 continue;
             }
             list($code, $value) = explode(self::PAIR_NAME_VALUE_SEPARATOR, $attributeData, 2);
             $code = mb_strtolower($code);
-            if (str_contains($value, self::PSEUDO_MULTI_LINE_SEPARATOR)) {
-                $value = $this->parseMultiselectValues($value, self::PSEUDO_MULTI_LINE_SEPARATOR);
+
+            $entityTypeModel = $this->retrieveProductTypeByName($productType);
+            if ($entityTypeModel) {
+                $attrParams = $entityTypeModel->retrieveAttributeFromCache($code);
+                if (!empty($attrParams) && $attrParams['type'] ==  'multiselect') {
+                    $parsedValue = $this->parseMultiselectValues($value, self::PSEUDO_MULTI_LINE_SEPARATOR);
+                    if (count($parsedValue) > 1) {
+                        $value = $parsedValue;
+                    }
+                }
             }
             $preparedAttributes[$code] = $value;
         }

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

@@ -25,6 +25,7 @@
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
+use Magento\ConfigurableImportExport\Model\Import\Product\Type\Configurable;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Set;
@@ -1471,19 +1472,32 @@ public function testGetImagesFromRow($rowData, $expectedResult): void
      */
     public function testParseAttributesWithoutWrappedValuesWillReturnsLowercasedAttributeCodes(): void
     {
+        $entityTypeModel = $this->createPartialMock(
+            Configurable::class,
+            ['retrieveAttributeFromCache']
+        );
+        $entityTypeModel->expects($this->exactly(2))->method('retrieveAttributeFromCache')->willReturn([
+            'type' => 'multiselect'
+        ]);
+        $importProduct = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['retrieveProductTypeByName'])
+            ->getMock();
+        $importProduct->expects($this->exactly(2))->method('retrieveProductTypeByName')->willReturn($entityTypeModel);
+
         $attributesData = 'PARAM1=value1,param2=value2|value3';
         $preparedAttributes = $this->invokeMethod(
-            $this->importProduct,
+            $importProduct,
             'parseAttributesWithoutWrappedValues',
-            [$attributesData]
+            [$attributesData, 'configurable']
         );
 
         $this->assertArrayHasKey('param1', $preparedAttributes);
         $this->assertEquals('value1', $preparedAttributes['param1']);
 
         $this->assertArrayHasKey('param2', $preparedAttributes);
-        $this->assertTrue(in_array('value2', $preparedAttributes['param2']));
-        $this->assertTrue(in_array('value3', $preparedAttributes['param2']));
+        $this->assertEquals('value2', $preparedAttributes['param2'][0]);
+        $this->assertEquals('value3', $preparedAttributes['param2'][1]);
 
         $this->assertArrayNotHasKey('PARAM1', $preparedAttributes);
     }
@@ -1685,7 +1699,7 @@ public function productCategoriesDataProvider()
                 ],
                 'catalog_category_product',
                 [
-                   [2, 5],
+                    [2, 5],
                     [
                         [
                             'product_id' => 2,