Updated Url Rewrite preparing function. Updated logic of Url Rewrite regeneration via category entity. Updated save logic.

Author: olegkoval

CHANGELOG.md

@@ -4,6 +4,12 @@ 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.3] - 2020-03-21
+### Changed
+- updated Url Rewrite preparing function
+- updated logic of Url Rewrite regeneration via category entity
+- updated save logic
+
 ## [1.5.2] - 2020-03-18
 ### Changed
 - updated logic of Url Rewrite regeneration via category entity

Model/AbstractRegenerateRewrites.php

@@ -128,7 +128,8 @@ public function saveUrlRewrites($urlRewrites, $entityData = [])
         try {
             $this->_getResourceConnection()->getConnection()->insertOnDuplicate(
                 $this->_getMainTableName(),
-                $data
+                $data,
+                ['request_path', 'metadata']
             );
             $this->_getResourceConnection()->getConnection()->commit();
 
@@ -288,7 +289,8 @@ protected function _updateSecondaryTable()
             try {
                 $this->_getResourceConnection()->getConnection()->insertOnDuplicate(
                     $this->_getSecondaryTableName(),
-                    $data
+                    $data,
+                    ['product_id']
                 );
                 $this->_getResourceConnection()->getConnection()->commit();
 
@@ -312,12 +314,17 @@ protected function _prepareUrlRewrites($urlRewrites)
             $rewrite = $urlRewrite->toArray();
 
             // check if same Url Rewrite already exists
-            $originalRequestPath = $rewrite['request_path'];
+            $originalRequestPath = trim($rewrite['request_path']);
+
+            // skip empty Url Rewrites - I don't know how this possible, but it happens in Magento:
+            // maybe someone did import product programmatically and product(s) name(s) are empty
+            if (empty($originalRequestPath)) continue;
+
             $index = 0;
             while ($this->_urlRewriteExists($rewrite)) {
                 $index++;
                 $pathParts = pathinfo($originalRequestPath);
-                $rewrite['request_path'] = $pathParts['dirname'] . $pathParts['filename'] . '-'. $index . (!empty($pathParts['extension']) ? $pathParts['extension'] : '');
+                $rewrite['request_path'] = trim($pathParts['dirname'], '.') . $pathParts['filename'] . '-'. $index . (!empty($pathParts['extension']) ? '.'. $pathParts['extension'] : '');
             }
 
             $result[] = $rewrite;

Model/RegenerateCategoryRewrites.php

@@ -223,14 +223,11 @@ protected function categoryProcess($category, $storeId = 0)
             $this->saveUrlRewrites($categoryUrlRewriteResult);
         }
 
-        // if config option "Use Categories Path for Product URLs" is "Yes" then regenerate product urls
-        if ($this->helper->useCategoriesPathForProductUrls($storeId)) {
-            $productsIds = $this->_getCategoriesProductsIds($category->getAllChildren());
-            if (!empty($productsIds)) {
-                $this->regenerateProductRewrites->regenerateOptions = $this->regenerateOptions;
-                $this->regenerateProductRewrites->regenerateOptions['showProgress'] = false;
-                $this->regenerateProductRewrites->regenerateProductsRangeUrlRewrites($productsIds, $storeId);
-            }
+        $productsIds = $this->_getCategoriesProductsIds($category->getAllChildren());
+        if (!empty($productsIds)) {
+            $this->regenerateProductRewrites->regenerateOptions = $this->regenerateOptions;
+            $this->regenerateProductRewrites->regenerateOptions['showProgress'] = false;
+            $this->regenerateProductRewrites->regenerateProductsRangeUrlRewrites($productsIds, $storeId);
         }
 
         //frees memory for maps that are self-initialized in multiple classes that were called by the generators

composer.json

@@ -3,7 +3,7 @@
     "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.2",
+    "version": "1.5.3",
     "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.2">
+    <module name="OlegKoval_RegenerateUrlRewrites" setup_version="1.5.3">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>