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

Author: thiaramus

app/code/Magento/CatalogUrlRewrite/etc/di.xml

@@ -56,6 +56,14 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\UrlRewrite\Model\UrlRewrite">
+        <arguments>
+            <argument name="entityToCacheTagMap" xsi:type="array">
+                <item name="product" xsi:type="const">Magento\Catalog\Model\Product::CACHE_TAG</item>
+                <item name="category" xsi:type="const">Magento\Catalog\Model\Category::CACHE_TAG</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Eav\Model\Config">
         <arguments>
             <argument name="attributesForPreload" xsi:type="array">

app/code/Magento/CmsUrlRewrite/etc/di.xml

@@ -9,4 +9,11 @@
     <type name="Magento\Cms\Model\ResourceModel\Page">
         <plugin name="cms_url_rewrite_plugin" type="Magento\CmsUrlRewrite\Plugin\Cms\Model\ResourceModel\Page"/>
     </type>
+    <type name="Magento\UrlRewrite\Model\UrlRewrite">
+        <arguments>
+            <argument name="entityToCacheTagMap" xsi:type="array">
+                <item name="cms-page" xsi:type="const">Magento\Cms\Model\Page::CACHE_TAG</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

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

@@ -56,6 +56,11 @@ class UrlRewrite extends AbstractModel
      */
     private $eventManager;
 
+    /**
+     * @var array
+     */
+    private $entityToCacheTagMap;
+
     /**
      * UrlRewrite constructor.
      *
@@ -67,6 +72,7 @@ class UrlRewrite extends AbstractModel
      * @param Json|null $serializer
      * @param CacheContext|null $cacheContext
      * @param EventManager|null $eventManager
+     * @param array $entityToCacheTagMap
      */
     public function __construct(
         Context $context,
@@ -76,12 +82,14 @@ public function __construct(
         array $data = [],
         Json $serializer = null,
         CacheContext $cacheContext = null,
-        EventManager $eventManager = null
+        EventManager $eventManager = null,
+        array $entityToCacheTagMap = []
     )
     {
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
         $this->cacheContext = $cacheContext ?: ObjectManager::getInstance()->get(CacheContext::class);
         $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(EventManager::class);
+        $this->entityToCacheTagMap = $entityToCacheTagMap;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -130,14 +138,8 @@ public function setMetadata($metadata)
      */
     private function cleanCacheForEntity($entityType, $entityId)
     {
-        if ($entityType !== Rewrite::ENTITY_TYPE_CUSTOM) {
-            $map = [
-                Rewrite::ENTITY_TYPE_PRODUCT => Product::CACHE_TAG,
-                Rewrite::ENTITY_TYPE_CATEGORY => Category::CACHE_TAG,
-                Rewrite::ENTITY_TYPE_CMS_PAGE => Page::CACHE_TAG
-            ];
-
-            $cacheKey = $map[$entityType];
+        if ($entityType !== Rewrite::ENTITY_TYPE_CUSTOM && array_key_exists($entityType, $this->entityToCacheTagMap)) {
+            $cacheKey = $this->entityToCacheTagMap[$entityType];
 
             $this->cacheContext->registerEntities($cacheKey, [$entityId]);
             $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
@@ -147,7 +149,7 @@ private function cleanCacheForEntity($entityType, $entityId)
     public function afterDelete()
     {
         $this->cleanCacheForEntity($this->getEntityType(), $this->getEntityId());
-        return parent::afterDelete(); // TODO: Change the autogenerated stub
+        return parent::afterDelete();
     }
 
     public function afterSave()