MC-39463: GraphQL caches urlResolver response and can return the old value after the url rewrite update

Author: thiaramus

app/code/Magento/UrlRewrite/Model/UrlRewrite.php

@@ -145,23 +145,27 @@ public function setMetadata($metadata)
      */
     private function getFinalTargetUrlRewrite(string $path, int $storeId): ?UrlRewriteService
     {
+        $urlRewriteTarget = $this->urlFinder->findOneByData(
+            [
+                'request_path' => $path,
+                'store_id' => $storeId
+            ]
+        );
+
+        while (
+            $urlRewriteTarget &&
+            $urlRewriteTarget->getTargetPath() !== $urlRewriteTarget->getRequestPath() &&
+            $urlRewriteTarget->getRedirectType() > 0
+        ) {
             $urlRewriteTarget = $this->urlFinder->findOneByData(
                 [
-                    'request_path' => $path,
-                    'store_id' => $storeId
+                    'request_path' => $urlRewriteTarget->getTargetPath(),
+                    'store_id' => $urlRewriteTarget->getStoreId()
                 ]
             );
+        }
 
-            while ($urlRewriteTarget && $urlRewriteTarget->getRedirectType() > 0) {
-                $urlRewriteTarget = $this->urlFinder->findOneByData(
-                    [
-                        'request_path' => $urlRewriteTarget->getTargetPath(),
-                        'store_id' => $urlRewriteTarget->getStoreId()
-                    ]
-                );
-            }
-
-            return $urlRewriteTarget;
+        return $urlRewriteTarget;
     }
 
     /**