Merge remote-tracking branch '39681/fix-for-issue-35371' into blprs

Author: engcom-Charlie

app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php

@@ -1,8 +1,10 @@
 <?php
+
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
+
 declare(strict_types=1);
 
 namespace Magento\CatalogUrlRewrite\Model\Storage;
@@ -170,7 +172,7 @@ private function findProductRewriteByRequestPath(array $data): ?array
         }
         $categorySuffix = $this->getCategoryUrlSuffix($data[UrlRewrite::STORE_ID]);
         $productResource = $this->productFactory->create();
-        $categoryPath = str_replace('/' . $productUrl, '', $requestPath);
+        $categoryPath = substr($requestPath, 0, -1 * strlen('/' . $productUrl));
         if ($productFromDb[UrlRewrite::REDIRECT_TYPE]) {
             $productUrl = $productFromDb[UrlRewrite::TARGET_PATH];
         }

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DynamicStorageTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -80,6 +80,11 @@ class DynamicStorageTest extends TestCase
      */
     private $logger;
 
+    /**
+     * @var string
+     */
+    private $requestPath;
+
     /**
      * @inheritdoc
      */
@@ -169,9 +174,7 @@ public function testFindProductRewriteByRequestPath(
         bool $canBeShownInCategory,
         ?array $expectedProductRewrite
     ): void {
-        $this->connectionMock->expects($this->any())
-            ->method('fetchRow')
-            ->will($this->onConsecutiveCalls($productFromDb, $categoryFromDb));
+        $this->fetchDataMock($productFromDb, $categoryFromDb);
 
         $scopeConfigMap = [
             [
@@ -347,6 +350,68 @@ public static function findProductRewriteByRequestPathDataProvider(): array
                     'redirect_type' => OptionProvider::PERMANENT,
                 ]
             ],
+            [
+                // Category has product url key at the beginning of its url key
+                [
+                    'request_path' => 'test-category/test-sub-category/test',
+                    'store_id' => 1
+                ],
+                [
+                    'entity_type' => 'product',
+                    'entity_id' => '1',
+                    'request_path' => 'test',
+                    'target_path' => 'catalog/product/view/id/1',
+                    'redirect_type' => '0',
+                ],
+                '',
+                [
+                    'entity_type' => 'category',
+                    'entity_id' => '38',
+                    'request_path' => 'test-category/test-sub-category',
+                    'target_path' => 'catalog/category/view/id/38',
+                    'redirect_type' => '0',
+                ],
+                true,
+                [
+                    'entity_type' => 'product',
+                    'entity_id' => '1',
+                    'request_path' => 'test-category/test-sub-category/test',
+                    'target_path' => 'catalog/product/view/id/1/category/38',
+                    'redirect_type' => '0',
+                ]
+            ],
         ];
     }
+
+    /**
+     * @param array|false $productFromDb
+     * @param array|false $categoryFromDb
+     *
+     * @return void
+     */
+    private function fetchDataMock($productFromDb, $categoryFromDb): void
+    {
+        $selectMock = $this->selectMock;
+        $this->selectMock->expects($this->any())
+            ->method('where')
+            ->willReturnCallback(function ($string, $value) use ($selectMock) {
+                if ($string == 'url_rewrite.request_path IN (?)') {
+                    $this->requestPath = array_shift($value);
+                }
+                return $selectMock;
+            });
+        $this->connectionMock->expects($this->any())
+            ->method('fetchRow')
+            ->willReturnCallback(function () use ($productFromDb, $categoryFromDb) {
+                switch (true) {
+                    case $productFromDb && $productFromDb['request_path'] == $this->requestPath:
+                        return $productFromDb;
+                    case $categoryFromDb && $categoryFromDb['request_path'] == $this->requestPath:
+                        return $categoryFromDb;
+                    default:
+                        return false;
+                }
+            })
+        ;
+    }
 }