Added caching for UrlService::getUrlByPageKey

krazzer · Feb 22, 2023 · e6021c5 · e6021c5
1 parent 62ad397
commit e6021c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Config/CacheConfig.php b/src/Config/CacheConfig.php
@@ -22,6 +22,7 @@ class CacheConfig
     const PAGE_LANGUAGE_FOR_KEY = 'pageLanguageForKey';
     const OTHER_LANG_MAP        = 'otherLangMap';
     const URL                   = 'url';
+    const URL_FOR_KEY           = 'urlForKey';
     const MENU                  = 'menu';
     const MENU_PAGES            = 'menuPages';
     const EXISTING_PAGE_CACHE   = 'existingPageCache';

diff --git a/src/Services/CacheService.php b/src/Services/CacheService.php
@@ -64,6 +64,7 @@ public function clearPageCache()
         $this->clear(CacheConfig::MENU_PAGES);
         $this->clear(CacheConfig::PAGE_LANGUAGE_FOR_URL);
         $this->clear(CacheConfig::PAGE_LANGUAGE_FOR_KEY);
+        $this->clear(CacheConfig::URL_FOR_KEY);
 
         $this->existingPageCacheService->clear();
     }

diff --git a/src/Services/Pages/UrlService.php b/src/Services/Pages/UrlService.php
@@ -207,11 +207,19 @@ public function getUrlByPageId(int $pageId, string $languageCode = null): string
      */
     public function getUrlByPageKey(string $pageKey, string $languageCode = null): string
     {
-        if ( ! $page = $this->pageService->getByKey($pageKey)) {
-            return '';
+        $cacheKey = CacheConfig::URL_FOR_KEY . CacheConfig::SEPARATOR . $pageKey;
+
+        if($languageCode){
+            $cacheKey .= CacheConfig::SEPARATOR . $languageCode;
         }
 
-        return $this->getUrlByPageId($page->getId(), $languageCode);
+        return $this->cacheService->cache($cacheKey, function () use ($pageKey, $languageCode) {
+            if ( ! $page = $this->pageService->getByKey($pageKey)) {
+                return '';
+            }
+
+            return $this->getUrlByPageId($page->getId(), $languageCode);
+        });
     }
 
     /**