Fixed URL Alias cache invalidation for old achived entry

ezsystems · Aug 2, 2022 · 50e8777 · 50e8777
1 parent ba88a40
commit 50e8777
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/eZ/Publish/Core/Persistence/Cache/Tests/UrlAliasHandlerTest.php b/eZ/Publish/Core/Persistence/Cache/Tests/UrlAliasHandlerTest.php
@@ -34,10 +34,13 @@ public function providerForUnCachedMethods(): array
                 [
                     ['url_alias_location', [44], false],
                     ['url_alias_location_path', [44], false],
+                    ['url_alias', ['44-abc'], false],
                     ['url_alias_not_found', [], false],
                 ],
                 null,
-                ['urlal-44', 'urlalp-44', 'urlanf'],
+                ['urlal-44', 'urlalp-44', 'urla-44-abc', 'urlanf'],
+                null,
+                '44-abc',
             ],
             [
                 'createCustomUrlAlias',

diff --git a/eZ/Publish/Core/Persistence/Cache/UrlAliasHandler.php b/eZ/Publish/Core/Persistence/Cache/UrlAliasHandler.php
@@ -41,7 +41,7 @@ public function publishUrlAliasForLocation(
         $languageCode,
         $alwaysAvailable = false,
         $updatePathIdentificationString = false
-    ) {
+    ): string {
         $this->logger->logCall(
             __METHOD__,
             [
@@ -53,7 +53,7 @@ public function publishUrlAliasForLocation(
             ]
         );
 
-        $this->persistenceHandler->urlAliasHandler()->publishUrlAliasForLocation(
+        $urlAliasIdentity = $this->persistenceHandler->urlAliasHandler()->publishUrlAliasForLocation(
             $locationId,
             $parentLocationId,
             $name,
@@ -65,8 +65,11 @@ public function publishUrlAliasForLocation(
         $this->cache->invalidateTags([
             $this->cacheIdentifierGenerator->generateTag(self::URL_ALIAS_LOCATION_IDENTIFIER, [$locationId]),
             $this->cacheIdentifierGenerator->generateTag(self::URL_ALIAS_LOCATION_PATH_IDENTIFIER, [$locationId]),
+            $this->cacheIdentifierGenerator->generateTag(self::URL_ALIAS_IDENTIFIER, [$urlAliasIdentity]),
             $this->cacheIdentifierGenerator->generateTag(self::URL_ALIAS_NOT_FOUND_IDENTIFIER),
         ]);
+
+        return $urlAliasIdentity;
     }
 
     /**

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Handler.php b/eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Handler.php
@@ -137,10 +137,10 @@ public function publishUrlAliasForLocation(
         $languageCode,
         $alwaysAvailable = false,
         $updatePathIdentificationString = false
-    ) {
+    ): string {
         $languageId = $this->languageHandler->loadByLanguageCode($languageCode)->id;
 
-        $this->internalPublishUrlAliasForLocation(
+        return $this->internalPublishUrlAliasForLocation(
             $locationId,
             $parentLocationId,
             $name,
@@ -172,7 +172,7 @@ private function internalPublishUrlAliasForLocation(
         $alwaysAvailable = false,
         $updatePathIdentificationString = false,
         $newId = null
-    ) {
+    ): string {
         $parentId = $this->getRealAliasId($parentLocationId);
         $name = $this->slugConverter->convert($name, 'location_' . $locationId);
         $uniqueCounter = $this->slugConverter->getUniqueCounterValue($name, $parentId == 0);
@@ -300,6 +300,8 @@ private function internalPublishUrlAliasForLocation(
         if ($cleanup) {
             $this->gateway->cleanupAfterPublish($action, $languageId, $newId, $parentId, $newTextMD5);
         }
+
+        return $this->mapper->generateIdentityKey($parentId, $newTextMD5);
     }
 
     /**

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Mapper.php b/eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Mapper.php
@@ -43,7 +43,7 @@ public function extractUrlAliasFromData($data)
         $urlAlias = new UrlAlias();
 
         list($type, $destination) = $this->matchTypeAndDestination($data['action']);
-        $urlAlias->id = $data['parent'] . '-' . $data['text_md5'];
+        $urlAlias->id = $this->generateIdentityKey((int)$data['parent'], $data['text_md5']);
         $urlAlias->pathData = $this->normalizePathData($data['raw_path_data']);
         $urlAlias->languageCodes = $this->languageMaskGenerator->extractLanguageCodesFromMask($data['lang_mask']);
         $urlAlias->alwaysAvailable = $this->languageMaskGenerator->isAlwaysAvailable($data['lang_mask']);
@@ -90,6 +90,11 @@ public function extractLanguageCodesFromData(array $rows): array
         return $this->languageMaskGenerator->extractLanguageCodesFromMask($languageMask);
     }
 
+    public function generateIdentityKey(int $parentId, string $hash): string
+    {
+        return sprintf('%d-%s', $parentId, $hash);
+    }
+
     /**
      * @throws \RuntimeException
      *

diff --git a/eZ/Publish/SPI/Persistence/Content/UrlAlias/Handler.php b/eZ/Publish/SPI/Persistence/Content/UrlAlias/Handler.php
@@ -28,7 +28,13 @@ interface Handler
      * @param string $languageCode
      * @param bool $alwaysAvailable
      */
-    public function publishUrlAliasForLocation($locationId, $parentLocationId, $name, $languageCode, $alwaysAvailable = false);
+    public function publishUrlAliasForLocation(
+        $locationId,
+        $parentLocationId,
+        $name,
+        $languageCode,
+        $alwaysAvailable = false
+    ): string;
 
     /**
      * Create a user chosen $alias pointing to $locationId in $languageCode.