ACP2E-2641: address CR comments

Author: alzota

app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php

@@ -80,10 +80,6 @@ public function getUrlPath($category, $parentCategory = null)
         }
 
         $path = $category->getUrlKey();
-        if (empty($path)) {
-            return $category->getUrlPath();
-        }
-
         if ($this->isNeedToGenerateUrlPathForParent($category)) {
             $parentCategory = $parentCategory === null ?
                 $this->categoryRepository->get($category->getParentId(), $category->getStoreId()) : $parentCategory;
@@ -103,11 +99,14 @@ private function shouldReturnCurrentUrlPath(CategoryInterface $category): bool
     {
         $path = $category->getUrlPath();
         if ($path !== null && !$category->dataHasChangedFor('url_key') && !$category->dataHasChangedFor('parent_id')) {
-            $parentPath = $this->getParentUrlPath($category);
+            $parentPath = $this->generateParentUrlPathFromUrlKeys($category);
             if (strlen($parentPath) && str_contains($path, $parentPath) !== false) {
                 return true;
             }
         }
+        if (empty($category->getUrlKey())) {
+            return true;
+        }
         return false;
     }
 
@@ -182,12 +181,12 @@ public function getUrlKey($category)
     }
 
     /**
-     * Get a parent url path based on custom scoped url keys
+     * Generate a parent url path based on custom scoped url keys
      *
      * @param CategoryInterface $category
      * @return string
      */
-    private function getParentUrlPath(CategoryInterface $category): string
+    private function generateParentUrlPathFromUrlKeys(CategoryInterface $category): string
     {
         $storeId = $category->getStoreId();
         $currentStore = $this->storeManager->getStore();

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserverTest.php

@@ -77,8 +77,8 @@ protected function setUp(): void
     }
 
     #[
-        DbIsolation(false),
-        AppIsolation(false),
+        DbIsolation(true),
+        AppIsolation(true),
         DataFixtureBeforeTransaction(Website::class, as: 'website2'),
         DataFixtureBeforeTransaction(Group::class, ['website_id' => '$website2.id$'], as:'group2'),
         DataFixtureBeforeTransaction(