Merge remote-tracking branch 'origin/MC-40305' into 2.4-develop-pr50

Author: Serhii Balko

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

@@ -220,7 +220,7 @@ private function deleteProductsLinks(
         if (!empty($linksToDelete) && Import::BEHAVIOR_APPEND === $importEntity->getBehavior()) {
             foreach ($linksToDelete as $linkTypeId => $productIds) {
                 if (!empty($productIds)) {
-                    $whereLinkId = $importEntity->getConnection()->quoteInto('link_type_id', $linkTypeId);
+                    $whereLinkId = $importEntity->getConnection()->quoteInto('link_type_id = ?', $linkTypeId);
                     $whereProductId =  $importEntity->getConnection()->quoteInto(
                         'product_id IN (?)',
                         array_unique($productIds)

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

@@ -1721,15 +1721,23 @@ public function testValidateUrlKeysMultipleStores()
     }
 
     /**
+     * Test import product with product links and empty value
+     *
+     * @param string $pathToFile
+     * @param bool $expectedResultCrossell
+     * @param bool $expectedResultUpsell
+     *
      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
      * @magentoAppArea adminhtml
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @dataProvider getEmptyLinkedData
      */
-    public function testProductLinksWithEmptyValue()
-    {
-        // import data from CSV file
-        $pathToFile = __DIR__ . '/_files/products_to_import_with_product_links_with_empty_value.csv';
+    public function testProductLinksWithEmptyValue(
+        string $pathToFile,
+        bool $expectedResultCrossell,
+        bool $expectedResultUpsell
+    ): void {
         $filesystem = BootstrapHelper::getObjectManager()->create(Filesystem::class);
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
@@ -1759,8 +1767,29 @@ public function testProductLinksWithEmptyValue()
         $product = BootstrapHelper::getObjectManager()->create(Product::class);
         $product->load($productId);
 
-        $this->assertEmpty($product->getCrossSellProducts());
-        $this->assertEmpty($product->getUpSellProducts());
+        $this->assertEquals(empty($product->getCrossSellProducts()), $expectedResultCrossell);
+        $this->assertEquals(empty($product->getUpSellProducts()), $expectedResultUpsell);
+    }
+
+    /**
+     * Get data for empty linked product
+     *
+     * @return array[]
+     */
+    public function getEmptyLinkedData(): array
+    {
+        return [
+            [
+                __DIR__ . '/_files/products_to_import_with_product_links_with_empty_value.csv',
+                true,
+                true,
+            ],
+            [
+                __DIR__ . '/_files/products_to_import_with_product_links_with_empty_data.csv',
+                false,
+                true,
+            ],
+        ];
     }
 
     /**

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

@@ -0,0 +1,2 @@
+sku,crosssell_skus,crosssell_position,upsell_skus,upsell_position
+simple,,,__EMPTY__VALUE__,__EMPTY__VALUE__

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php

@@ -18,7 +18,26 @@
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
-$product = $productRepository->get('simple_ms_1');
+/** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+$productCrosssellLink = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\Data\ProductLinkInterface::class);
+$productCrosssellLink->setSku('simple');
+$productCrosssellLink->setLinkedProductSku('simple_ms_1');
+$productCrosssellLink->setPosition(2);
+$productCrosssellLink->setLinkType('crosssell');
+$productUpsellLink = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\Data\ProductLinkInterface::class);
+$productUpsellLink->setSku('simple');
+$productUpsellLink->setLinkedProductSku('simple_ms_1');
+$productUpsellLink->setPosition(1);
+$productUpsellLink->setLinkType('upsell');
+$productRelatedLink = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\Data\ProductLinkInterface::class);
+$productRelatedLink->setSku('simple');
+$productRelatedLink->setLinkedProductSku('simple_ms_1');
+$productRelatedLink->setPosition(3);
+$productRelatedLink->setLinkType('related');
+
 $productModel = $objectManager->create(
     \Magento\Catalog\Model\Product::class
 );
@@ -51,10 +70,6 @@
     true
 )->setCategoryIds(
     [333]
-)->setUpSellLinkData(
-    [$product->getId() => ['position' => 1]]
-)->setCrossSellLinkData(
-    [$product->getId() => ['position' => 2]]
-)->setRelatedLinkData(
-    [$product->getId() => ['position' => 3]]
+)->setProductLinks(
+    [$productCrosssellLink, $productUpsellLink, $productRelatedLink]
 )->save();