MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories

Author: slopukhov

app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php

@@ -131,8 +131,12 @@ public function generate($storeId, Product $product, ObjectRegistry $productCate
      * @param int|null $rootCategoryId
      * @return UrlRewrite[]
      */
-    public function generateAnchor($storeId, Product $product, ObjectRegistry $productCategories, $rootCategoryId = null)
-    {
+    public function generateAnchor(
+        $storeId,
+        Product $product,
+        ObjectRegistry $productCategories,
+        $rootCategoryId = null
+    ) {
         $anchorCategoryIds = [];
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
 
@@ -154,8 +158,8 @@ public function generateAnchor($storeId, Product $product, ObjectRegistry $produ
                 if (in_array($category->getId(), $anchorCategoryIds)) {
                     $mergeDataProvider->merge(
                         $currentUrlRewrite->getIsAutogenerated()
-                            ? $this->generateForAutogenerated($currentUrlRewrite, $storeId, $category, $product)
-                            : $this->generateForCustom($currentUrlRewrite, $storeId, $category, $product)
+                        ? $this->generateForAutogenerated($currentUrlRewrite, $storeId, $category, $product)
+                        : $this->generateForCustom($currentUrlRewrite, $storeId, $category, $product)
                     );
                 }
             }

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

@@ -52,12 +52,11 @@ public function testGenerateUrlRewritesWithoutSaveHistory()
 
         $this->assertResults($categoryExpectedResult, $actualResults);
 
-        $productIds = [];
-        foreach ($category->getProductCollection() as $product) {
-            $productIds = $product->getId();
-        }
-        $this->assertTrue(isset($productIds[0]), 'Product for testing does not exist');
-        $productForTest = $productIds[0];
+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+        $product = $productRepository->get('12345');
+        $productForTest = $product->getId();
+
         $productFilter = [
             UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
             UrlRewrite::ENTITY_ID => [$productForTest]
@@ -134,12 +133,11 @@ public function testGenerateUrlRewritesWithSaveHistory()
 
         $this->assertResults($categoryExpectedResult, $actualResults);
 
-        $productIds = [];
-        foreach ($category->getProductCollection() as $product) {
-            $productIds = $product->getId();
-        }
-        $this->assertTrue(isset($productIds[0]), 'Product for testing does not exist');
-        $productForTest = $productIds[0];
+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+        $product = $productRepository->get('12345');
+        $productForTest = $product->getId();
+
         $productFilter = [
             UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
             UrlRewrite::ENTITY_ID => [$productForTest]