MP2E-86: After product import, Category product manual sorting has been changed

Author: Anna Bukatar

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

@@ -1349,6 +1349,40 @@ protected function _saveProductAttributes(array $attributesData)
         return $this;
     }
 
+    /**
+     * Get data for updating product-category relations
+     *
+     * @param array $categoriesData
+     * @param string $tableName
+     * @return array
+     */
+    private function getProductCategoriesDataSave(array $categoriesData, string $tableName): array
+    {
+        $delProductId = [];
+        $categoriesIn = [];
+        $minCategoryPosition = [];
+        foreach ($categoriesData as $delSku => $categories) {
+            $productId = $this->skuProcessor->getNewSku($delSku)['entity_id'];
+            $delProductId[] = $productId;
+
+            foreach (array_keys($categories) as $categoryId) {
+                //position new products before existing ones
+                if (!isset($minCategoryPosition[$categoryId])) {
+                    $select = $this->_connection->select()
+                        ->from($tableName, ['position' => new \Zend_Db_Expr('MIN(position)')])
+                        ->where('category_id = ?', $categoryId);
+                    $minCategoryPosition[$categoryId] = (int)$this->_connection->fetchOne($select);
+                }
+                $categoriesIn[] = [
+                    'product_id' => $productId,
+                    'category_id' => $categoryId,
+                    'position' => --$minCategoryPosition[$categoryId]
+                ];
+            }
+        }
+        return [$delProductId, $categoriesIn];
+    }
+
     /**
      * Save product categories.
      *
@@ -1363,17 +1397,8 @@ protected function _saveProductCategories(array $categoriesData)
             $tableName = $this->_resourceFactory->create()->getProductCategoryTable();
         }
         if ($categoriesData) {
-            $categoriesIn = [];
-            $delProductId = [];
-
-            foreach ($categoriesData as $delSku => $categories) {
-                $productId = $this->skuProcessor->getNewSku($delSku)['entity_id'];
-                $delProductId[] = $productId;
+            list($delProductId, $categoriesIn) = $this->getProductCategoriesDataSave($categoriesData, $tableName);
 
-                foreach (array_keys($categories) as $categoryId) {
-                    $categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 0];
-                }
-            }
             if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
                 $this->_connection->delete(
                     $tableName,

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

@@ -33,6 +33,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\EntityMetadata;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Event\ManagerInterface;
@@ -211,6 +212,9 @@ class ProductTest extends AbstractImportTestCase
     /** @var DriverFile|MockObject */
     private $driverFile;
 
+    /** @var Select|MockObject */
+    protected $select;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -481,6 +485,13 @@ protected function _parentObjectConstructor()
         $this->config->expects($this->any())->method('getEntityType')->with(self::ENTITY_TYPE_CODE)->willReturn($type);
 
         $this->_connection = $this->getMockForAbstractClass(AdapterInterface::class);
+        $this->select = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['from', 'where'])
+            ->getMock();
+        $this->select->expects($this->any())->method('from')->willReturnSelf();
+        //$this->select->expects($this->any())->method('where')->willReturnSelf();
+        $this->_connection->expects($this->any())->method('select')->willReturn($this->select);
         $this->resource->expects($this->any())->method('getConnection')->willReturn($this->_connection);
         return $this;
     }
@@ -1421,6 +1432,62 @@ function ($name) use ($throwException, $exception) {
         );
     }
 
+    /**
+     * Check that getProductCategoriesDataSave method will return array with product-category-position relations
+     * where new products positioned before existing
+     *
+     * @param array $categoriesData
+     * @param string $tableName
+     * @param array $result
+     * @dataProvider productCategoriesDataProvider
+     */
+    public function testGetProductCategoriesDataSave(array $categoriesData, string $tableName, array $result)
+    {
+        $this->_connection->expects($this->at(1))->method('fetchOne')->willReturn('0');
+        $this->_connection->expects($this->at(3))->method('fetchOne')->willReturn('-2');
+        $this->skuProcessor->expects($this->at(0))->method('getNewSku')->willReturn(['entity_id' => 2]);
+        $this->skuProcessor->expects($this->at(1))->method('getNewSku')->willReturn(['entity_id' => 5]);
+        $actualResult = $this->invokeMethod(
+            $this->importProduct,
+            'getProductCategoriesDataSave',
+            [$categoriesData, $tableName]
+        );
+        $this->assertEquals($result, $actualResult);
+    }
+
+    /**
+     * Data provider for testGetProductCategoriesDataSave.
+     *
+     * @return array
+     */
+    public function productCategoriesDataProvider()
+    {
+        return [
+            [
+                [
+                    'simple_2' => [3 => true],
+                    'simple_5' => [5 => true]
+                ],
+                'catalog_category_product',
+                [
+                   [2, 5],
+                    [
+                        [
+                            'product_id' => 2,
+                            'category_id' => 3,
+                            'position' => -1
+                        ],
+                        [
+                            'product_id' => 5,
+                            'category_id' => 5,
+                            'position' => -3
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+
     /**
      * Data provider for testFillUploaderObject.
      *