Merge remote-tracking branch 'remotes/github/MAGETWO-91589-V2' into EPAM-PR-58

Author: VeronikaYarats

app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\CatalogUrlRewrite\Model\ResourceModel\Category;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
@@ -49,7 +52,7 @@ protected function _construct()
     public function saveMultiple(array $insertData)
     {
         $connection = $this->getConnection();
-        if (sizeof($insertData) <= self::CHUNK_SIZE) {
+        if (count($insertData) <= self::CHUNK_SIZE) {
             return $connection->insertMultiple($this->getTable(self::TABLE_NAME), $insertData);
         }
         $data = array_chunk($insertData, self::CHUNK_SIZE);
@@ -98,10 +101,13 @@ public function removeMultipleByProductCategory(array $filter)
     private function prepareSelect($data)
     {
         $select = $this->getConnection()->select();
-        $select->from($this->getTable(DbStorage::TABLE_NAME), 'url_rewrite_id');
-
+        $select->from(DbStorage::TABLE_NAME);
+        $select->join(
+            self::TABLE_NAME,
+            DbStorage::TABLE_NAME . '.url_rewrite_id = ' . self::TABLE_NAME . '.url_rewrite_id'
+        );
         foreach ($data as $column => $value) {
-            $select->where($this->getConnection()->quoteIdentifier($column) . ' IN (?)', $value);
+            $select->where(DbStorage::TABLE_NAME . '.' . $column . ' IN (?)', $value);
         }
         return $select;
     }

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php

@@ -8,7 +8,9 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ProductRepository;
+use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -318,6 +320,53 @@ public function testGenerateUrlRewritesWithoutGenerateProductRewrites()
         $this->assertResults($productExpectedResult, $actualResults);
     }
 
+    /**
+     * Check number of records after removing product
+     *
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testRemoveCatalogUrlRewrites()
+    {
+        /** @var CategoryRepository $categoryRepository */
+        $categoryRepository = $this->objectManager->create(CategoryRepository::class);
+        $category = $categoryRepository->get(5);
+        $categoryId = $category->getId();
+
+        /** @var ProductRepository $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepository::class);
+        $product = $productRepository->get('12345');
+        $productId = $product->getId();
+
+        $countBeforeRemoving = $this->getCountOfRewrites($productId, $categoryId);
+        $productRepository->delete($product);
+        $countAfterRemoving = $this->getCountOfRewrites($productId, $categoryId);
+        $this->assertEquals($countBeforeRemoving - 1, $countAfterRemoving);
+    }
+
+    /**
+     * Get count of records in table
+     *
+     * @param $productId
+     * @param $categoryId
+     * @return string
+     */
+    private function getCountOfRewrites($productId, $categoryId): string
+    {
+        /** @var Product $model */
+        $model = $this->objectManager->get(Product::class);
+        $connection = $model->getConnection();
+        $select = $connection->select();
+        $select->from(Product::TABLE_NAME, 'COUNT(*)');
+        $select->where('category_id = ?', $categoryId);
+        $select->where('product_id = ?', $productId);
+        return $connection->fetchOne($select);
+    }
+
     /**
      * @param array $expected
      * @param array $actual