Merge remote-tracking branch 'origin/MAGETWO-70663' into 2.2-develop-pr8

Author: RomaKis

app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php

@@ -110,19 +110,29 @@ public function generateProductUrlRewrites(\Magento\Catalog\Model\Category $cate
         $storeId = $category->getStoreId();
         if ($category->getAffectedProductIds()) {
             $this->isSkippedProduct[$category->getEntityId()] = $category->getAffectedProductIds();
+            /* @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
             $collection = $this->productCollectionFactory->create()
                 ->setStoreId($storeId)
                 ->addIdFilter($category->getAffectedProductIds())
                 ->addAttributeToSelect('visibility')
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('url_key')
                 ->addAttributeToSelect('url_path');
-            foreach ($collection as $product) {
-                $product->setStoreId($storeId);
-                $product->setData('save_rewrites_history', $saveRewriteHistory);
-                $mergeDataProvider->merge(
-                    $this->productUrlRewriteGenerator->generate($product, $category->getEntityId())
-                );
+
+            $collection->setPageSize(1000);
+            $pageCount = $collection->getLastPageNumber();
+            $currentPage = 1;
+            while ($currentPage <= $pageCount) {
+                $collection->setCurPage($currentPage);
+                foreach ($collection as $product) {
+                    $product->setStoreId($storeId);
+                    $product->setData('save_rewrites_history', $saveRewriteHistory);
+                    $mergeDataProvider->merge(
+                        $this->productUrlRewriteGenerator->generate($product, $category->getEntityId())
+                    );
+                }
+                $collection->clear();
+                $currentPage++;
             }
         } else {
             $mergeDataProvider->merge(

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php

@@ -5,8 +5,10 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
 
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
+use Magento\CatalogUrlRewrite\Model\CategoryBasedProductRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -16,6 +18,9 @@
 use Magento\UrlRewrite\Model\MergeDataProvider;
 use Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class UrlRewriteHandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -58,6 +63,11 @@ class UrlRewriteHandlerTest extends \PHPUnit\Framework\TestCase
      */
     private $mergeDataProviderFactoryMock;
 
+    /**
+     * @var MergeDataProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mergeDataProviderMock;
+
     /**
      * @var Json|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -85,16 +95,15 @@ protected function setUp()
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $mergeDataProviderMock = $this->getMockBuilder(MergeDataProvider::class)
+        $this->mergeDataProviderMock = $this->getMockBuilder(MergeDataProvider::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->categoryBasedProductRewriteGeneratorMock = $this->getMockBuilder(CategoryProductUrlPathGenerator::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->mergeDataProviderFactoryMock->expects($this->any())
             ->method('create')
-            ->willReturn($mergeDataProviderMock);
-
+            ->willReturn($this->mergeDataProviderMock);
         $this->serializerMock = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -111,6 +120,72 @@ protected function setUp()
         );
     }
 
+    /**
+     * @test
+     */
+    public function testGenerateProductUrlRewrites()
+    {
+        /* @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject $category */
+        $category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+            ->setMethods(['getEntityId', 'getStoreId', 'getData', 'getAffectedProductIds'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $category->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn(2);
+        $category->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn(1);
+        $category->expects($this->any())
+            ->method('getData')
+            ->with('save_rewrites_history')
+            ->willReturn(true);
+
+        /* @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject $childCategory1 */
+        $childCategory1 = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+            ->setMethods(['getEntityId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $childCategory1->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn(100);
+
+        /* @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject $childCategory1 */
+        $childCategory2 = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+            ->setMethods(['getEntityId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $childCategory1->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn(200);
+
+        $this->childrenCategoriesProviderMock->expects($this->once())
+            ->method('getChildren')
+            ->with($category, true)
+            ->willReturn([$childCategory1, $childCategory2]);
+
+        /** @var Collection|\PHPUnit_Framework_MockObject_MockObject $productCollection */
+        $productCollection = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productCollection->expects($this->any())
+            ->method('addCategoriesFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addIdFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())->method('setStoreId')->willReturnSelf();
+        $productCollection->expects($this->any())->method('addAttributeToSelect')->willReturnSelf();
+        $iterator = new \ArrayIterator([]);
+        $productCollection->expects($this->any())->method('getIterator')->will($this->returnValue($iterator));
+
+        $this->collectionFactoryMock->expects($this->any())->method('create')->willReturn($productCollection);
+
+        $this->mergeDataProviderMock->expects($this->any())->method('getData')->willReturn([1, 2]);
+
+        $this->urlRewriteHandler->generateProductUrlRewrites($category);
+    }
+
     public function testDeleteCategoryRewritesForChildren()
     {
         $category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)