Optimized code; modified logic of url rewrites regeneration; fixed issue of store filter in categories collection;

Author: olegkoval

CHANGELOG.md

@@ -4,7 +4,7 @@ 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.3.0] - 2018-10-09
+## [1.3.0] - 2018-10-29
 ### Added
 - new option "--no-cache-clean"
 - new option "--no-cache-flush"
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Changed
 - optimized code
 - modified logic of url rewrites regeneration
+- fixed issue of store filter in categories collection
 
 ## [1.2.3] - 2018-10-03
 ### Added

Console/Command/RegenerateUrlRewrites.php

@@ -104,13 +104,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         if ($this->_commandOptions['runCacheClean'] || $this->_commandOptions['runCacheFlush']) {
-            $this->_output->writeln('Cache refreshing...');
+            $this->_output->write('Cache refreshing...');
             if ($this->_commandOptions['runCacheClean']) {
                 shell_exec('php bin/magento cache:clean');
             }
             if ($this->_commandOptions['runCacheFlush']) {
                 shell_exec('php bin/magento cache:flush');
             }
+            $this->_output->writeln(' Done');
             $this->_output->writeln('If you use some external cache mechanisms (e.g.: Redis, Varnish, etc.) - please, refresh this external cache.');
         }
 

Console/Command/RegenerateUrlRewritesAbstract.php

@@ -439,6 +439,24 @@ protected function _generateIdsRangeArray($idsRange, $type = 'product')
         return $result;
     }
 
+    /**
+     * Get root category Id of specific store
+     * @param  string $storeId
+     * @return integer
+     */
+    protected function _getStoreRootCategoryId($storeId)
+    {
+        $result = 0;
+
+        // get existed Id's from this range in entity DB table
+        $tableName = $this->_resource->getTableName('store_group');
+        $sql = "SELECT root_category_id FROM {$tableName} WHERE default_store_id = {$storeId};";
+
+        $result = (int) $this->_resource->getConnection()->fetchOne($sql);
+
+        return $result;
+    }
+
     /**
      * @return Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
      */
@@ -511,12 +529,17 @@ protected function _getCategoriesCollection($storeId = 0, $categoriesFilter = []
         // get categories collection
         $categoriesCollection = $this->_categoryCollectionFactory->create()
             ->addAttributeToSelect('*')
-            ->setStore($storeId)
             ->addFieldToFilter('level', array('gt' => '1'))
             ->setOrder('level', 'DESC')
             // use limit to avoid a "eating" of a memory
             ->setPageSize($this->_collectionPageSize);
 
+        $rootCategoryId = $this->_getStoreRootCategoryId($storeId);
+        if ($rootCategoryId > 0) {
+            // we use this filter instead of "->setStore()" - because "setStore()" is not working now (another Magento issue)
+            $categoriesCollection->addAttributeToFilter('path', array('like' => "1/{$rootCategoryId}/%"));
+        }
+
         if (count($categoriesFilter) > 0) {
             $categoriesCollection->addAttributeToFilter('entity_id', array('in' => $categoriesFilter));
         }
@@ -628,7 +651,7 @@ protected function _categoryProcess($category, $storeId = 0)
     protected function _regenerateCategoryUrlRewrites($category, $storeId)
     {
         try {
-            $categoryUrlRewriteResult = $this->_getCategoryUrlRewriteGenerator()->generate($category);
+            $categoryUrlRewriteResult = $this->_getCategoryUrlRewriteGenerator()->generate($category, true);
             $this->_doBunchReplaceUrlRewrites($categoryUrlRewriteResult);
 
             $productUrlRewriteResult = $this->_getUrlRewriteHandler()->generateProductUrlRewrites($category);

README.md

@@ -6,7 +6,6 @@ Extension homepage: https://github.com/olegkoval/magento2-regenerate_url_rewrite
 ## DONATIONS / SUPPORT ME ON:
 * [Patreon](https://www.patreon.com/olegkoval)
 * [Fondy](https://api.fondy.eu/s/ghYyR)
-* [Liqpay](https://www.liqpay.ua/en/checkout/card/380983346262)
 
 ## INSTALLATION
 
@@ -51,9 +50,11 @@ or
 * do not run cache:flush at the end of Url rewrites generation:
 >`$> bin/magento ok:urlrewrites:regenerate --no-cache-flush`
 
-* do not clean current products url_key values (take into account that new URL's will be generated based on the current url_key values, not products "name" values, \*\* see bottom):
+* do not clean current products url_key values (take into account that new URL's will be generated based on the current url_key values, not products "name" values) \*\*:
 >`$> bin/magento ok:urlrewrites:regenerate --no-clean-url-key`
 
+\*\* When Magento generate URL rewrites for some product it check if product have a url_key value and use it (and do not take into acount "name" value, even if you modified it), otherwise (if url_key not exists or have an empty value) Magento use a product name to generate new url_key and then use it to generate a URL rewrites.
+
 * do not display a progress dots in the console (usefull for a stores with a big number of products):
 >`$> bin/magento ok:urlrewrites:regenerate --no-progress`
 
@@ -79,5 +80,3 @@ Oleg Koval
 
 -------------
 \* see: http://devdocs.magento.com/guides/v2.0/config-guide/cli/config-cli-subcommands.html
-
-\*\* when Magento generate URL rewrites for some product it check if product have a url_key value and use it (and do not take into acount "name" value, even if you modified it), otherwise (if url_key not exists or have an empty value) Magento use a product name to generate new url_key and then use it to generate a URL rewrites.