Updated logic of Url Rewrite regeneration via category entity. CLI options logic optimized (for category entity).

Author: olegkoval

CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.5.2] - 2020-03-18
+### Changed
+- updated logic of Url Rewrite regeneration via category entity
+- CLI options logic optimized (for category entity)
+
+## [1.5.1] - 2020-03-08
+### Changed
+- fixed issue of url_key and url rewrites regeneration based on product name value
+
+## [1.5.0] - 2020-02-26
+### Changed
+- revised and restructured code
+- modified functional-logic of extension
+- removed option "--check-use-category-in-product-url"
+
 ## [1.4.3] - 2019-05-12
 ### Added
 - new option "no-regen-url-key"

Console/Command/RegenerateUrlRewrites.php

@@ -236,6 +236,9 @@ public function getCommandOptions()
                 'category'
             );
             $distinctOptionsUsed++;
+
+            // if this option was used then for 100% user want to regenerate entity type "category"
+            $this->_commandOptions['entityType'] = self::INPUT_KEY_REGENERATE_ENTITY_TYPE_CATEGORY;
         }
 
         if (isset($options[self::INPUT_KEY_CATEGORY_ID])) {
@@ -246,6 +249,9 @@ public function getCommandOptions()
             } else {
                 $distinctOptionsUsed++;
             }
+
+            // if this option was used then for 100% user want to regenerate entity type "category"
+            $this->_commandOptions['entityType'] = self::INPUT_KEY_REGENERATE_ENTITY_TYPE_CATEGORY;
         }
 
         if (

Helper/Regenerate.php

@@ -50,7 +50,9 @@ public function getSupportMeText()
     {
         return [
             'Please, support me on:',
-            'https://www.patreon.com/olegkoval'
+            'https://www.patreon.com/olegkoval',
+            'You can hire me via Upwork:',
+            'https://www.upwork.com/o/profiles/users/~01a40656da65c38d3a/'
         ];
     }
 

Model/AbstractRegenerateRewrites.php

@@ -47,6 +47,11 @@ abstract class AbstractRegenerateRewrites
      */
     protected $secondaryDbTable;
 
+    /**
+     * @var string
+     */
+    protected $categoryProductsDbTable;
+
     /**
      * Regenerate Rewrites custom options
      * @var array
@@ -137,7 +142,7 @@ public function saveUrlRewrites($urlRewrites, $entityData = [])
 
     /**
      * Show a progress bar in the console
-     * @return void
+     * @param int $size
      */
     protected function _showProgress($size = 70)
     {
@@ -199,6 +204,18 @@ protected function _getSecondaryTableName()
         return $this->secondaryDbTable;
     }
 
+    /**
+     * @return string
+     */
+    protected function _getCategoryProductsTableName()
+    {
+        if (empty($this->categoryProductsDbTable)) {
+            $this->categoryProductsDbTable = $this->_getResourceConnection()->getTableName('catalog_category_product');
+        }
+
+        return $this->categoryProductsDbTable;
+    }
+
     /**
      * Delete current Url Rewrites
      * @param array $entitiesData

Model/RegenerateCategoryRewrites.php

@@ -19,6 +19,7 @@
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGeneratorFactory;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory;
 use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandlerFactory;
+use OlegKoval\RegenerateUrlRewrites\Model\RegenerateProductRewrites;
 
 class RegenerateCategoryRewrites extends AbstractRegenerateRewrites
 {
@@ -77,6 +78,11 @@ class RegenerateCategoryRewrites extends AbstractRegenerateRewrites
      */
     protected $urlRewriteHandler;
 
+    /**
+     * @var RegenerateProductRewrites
+     */
+    protected $regenerateProductRewrites;
+
     /**
      * RegenerateCategoryRewrites constructor.
      * @param RegenerateHelper $helper
@@ -89,7 +95,8 @@ public function __construct(
         DatabaseMapPool\Proxy $databaseMapPool,
         CategoryUrlPathGeneratorFactory\Proxy $categoryUrlPathGeneratorFactory,
         CategoryUrlRewriteGeneratorFactory\Proxy $categoryUrlRewriteGeneratorFactory,
-        UrlRewriteHandlerFactory\Proxy $urlRewriteHandlerFactory
+        UrlRewriteHandlerFactory\Proxy $urlRewriteHandlerFactory,
+        RegenerateProductRewrites $regenerateProductRewrites
     )
     {
         parent::__construct($helper, $resourceConnection);
@@ -99,6 +106,7 @@ public function __construct(
         $this->categoryUrlPathGeneratorFactory = $categoryUrlPathGeneratorFactory;
         $this->categoryUrlRewriteGeneratorFactory = $categoryUrlRewriteGeneratorFactory;
         $this->urlRewriteHandlerFactory = $urlRewriteHandlerFactory;
+        $this->regenerateProductRewrites = $regenerateProductRewrites;
 
         $this->dataUrlRewriteClassNames = [
             DataCategoryUrlRewriteDatabaseMap::class,
@@ -202,7 +210,7 @@ protected function categoryProcess($category, $storeId = 0)
 
         if (!$this->regenerateOptions['noRegenUrlKey']) {
             $category->setOrigData('url_key', null);
-            $category->setUrlKey($this->_getCategoryUrlPathGenerator()->getUrlKey($category));
+            $category->setUrlKey($this->_getCategoryUrlPathGenerator()->getUrlKey($category->setUrlKey(null)));
             $category->getResource()->saveAttribute($category, 'url_key');
         }
 
@@ -217,10 +225,11 @@ protected function categoryProcess($category, $storeId = 0)
 
         // if config option "Use Categories Path for Product URLs" is "Yes" then regenerate product urls
         if ($this->helper->useCategoriesPathForProductUrls($storeId)) {
-            $productUrlRewriteResult = $this->_getUrlRewriteHandler()->generateProductUrlRewrites($category);
-            if (!empty($productUrlRewriteResult)) {
-                $productUrlRewriteResult = $this->helper->sanitizeProductUrlRewrites($productUrlRewriteResult);
-                $this->saveUrlRewrites($productUrlRewriteResult);
+            $productsIds = $this->_getCategoriesProductsIds($category->getAllChildren());
+            if (!empty($productsIds)) {
+                $this->regenerateProductRewrites->regenerateOptions = $this->regenerateOptions;
+                $this->regenerateProductRewrites->regenerateOptions['showProgress'] = false;
+                $this->regenerateProductRewrites->regenerateProductsRangeUrlRewrites($productsIds, $storeId);
             }
         }
 
@@ -263,6 +272,29 @@ protected function _getCategoriesCollection($categoriesFilter = [], $storeId = 0
         return $categoriesCollection;
     }
 
+    /**
+     * Get products Ids which are related to specific categories
+     * @param string $categoryIds
+     * @return array
+     */
+    protected function _getCategoriesProductsIds($categoryIds = '')
+    {
+        $result = [];
+
+        if (!empty($categoryIds)) {
+            $select = $this->_getResourceConnection()->getConnection()->select()
+                ->from($this->_getCategoryProductsTableName(), ['product_id'])
+                ->where("category_id IN ({$categoryIds})");
+            $rows =  $this->_getResourceConnection()->getConnection()->fetchAll($select);
+
+            foreach ($rows as $row) {
+                $result[] = $row['product_id'];
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * Get category Url Path generator
      * @return mixed

README.md

@@ -9,6 +9,7 @@ Extension homepage: https://github.com/olegkoval/magento2-regenerate_url_rewrite
 
 ## DONATIONS / SUPPORT ME ON
 * [Patreon](https://www.patreon.com/olegkoval)
+* You can hire me via [Upwork](https://www.upwork.com/o/profiles/users/~01a40656da65c38d3a/)
 
 ## INSTALLATION
 
@@ -76,8 +77,6 @@ or
 >`$> php bin/magento ok:urlrewrites:regenerate --no-progress`
 
 #### REGENERATE URL REWRITES OF CATEGORY
-WARNING: When you regenerate Url Rewrites of some category then you also regenerate Url Rewrites of all products from this category AND Url Rewrites of all sub-categories (all levels - Magento use recursive logic) AND all products from this sub-categories. This is the built-in Magento logic. So, take into account that regenerating of Url Rewrites of any category (specially from top level) is a "heavy" process and it's take a time.
-
 * to regenerate Url Rewrites of all categories in all stores set entity type to "category":
 >`$> php bin/magento ok:urlrewrites:regenerate --entity-type=category`
 
@@ -89,6 +88,8 @@ WARNING: When you regenerate Url Rewrites of some category then you also regener
 
 \* if in the range you have a gap of ID's (in range 4-12 category with ID "6" not exists) - do not worry, script handle this.
 
+\*\* If you use options `--category-id` or `--categories-range` then you can skip option `--entity-type=category` - extension will understand that you want to use a category entity.
+
 ### YOU CAN COMBINE OPTIONS
 >`$> php bin/magento ok:urlrewrites:regenerate --store-id=2 --save-old-urls --no-regen-url-key --no-reindex`
 

composer.json

@@ -1,9 +1,9 @@
 {
     "name": "olegkoval/magento2-regenerate-url-rewrites",
-    "description": "Add into Magento 2 a CLI feature which allow to regenerate a Url rewrites of products and categories",
+    "description": "Add into Magento 2 a CLI feature which allow to regenerate a Url Rewrites of products and categories",
     "keywords": ["magento", "magento2 extension", "magento 2 extension", "extension", "module", "magento2 module", "magento 2 module"],
     "type": "magento2-module",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "homepage": "https://github.com/olegkoval/magento2-regenerate_url_rewrites",
     "authors": [
         {

etc/module.xml

@@ -10,7 +10,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="OlegKoval_RegenerateUrlRewrites" setup_version="1.5.1">
+    <module name="OlegKoval_RegenerateUrlRewrites" setup_version="1.5.2">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>