Using new remember() helper

AsgardCms · Nov 20, 2017 · fee36dc · fee36dc
1 parent 89508b4
commit fee36dc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 65 deletions.
diff --git a/Modules/Setting/Repositories/Cache/CacheSettingDecorator.php b/Modules/Setting/Repositories/Cache/CacheSettingDecorator.php
@@ -33,15 +33,9 @@ public function createOrUpdate($settings)
      */
     public function findByName($settingName)
     {
-        return $this->cache
-            ->tags([$this->entityName, 'global'])
-            ->remember(
-                "{$this->locale}.{$this->entityName}.findByName.{$settingName}",
-                $this->cacheTime,
-                function () use ($settingName) {
-                    return $this->repository->findByName($settingName);
-                }
-            );
+        return $this->remember(function () use ($settingName) {
+            return $this->repository->findByName($settingName);
+        });
     }
 
     /**
@@ -52,17 +46,9 @@ function () use ($settingName) {
      */
     public function moduleSettings($modules)
     {
-        $moduleList = implode(',', $modules);
-
-        return $this->cache
-            ->tags([$this->entityName, 'global'])
-            ->remember(
-                "{$this->locale}.{$this->entityName}.moduleSettings.{$moduleList}",
-                $this->cacheTime,
-                function () use ($modules) {
-                    return $this->repository->moduleSettings($modules);
-                }
-            );
+        return $this->remember(function() use ($modules) {
+            return $this->repository->moduleSettings($modules);
+        });
     }
 
     /**
@@ -72,15 +58,9 @@ function () use ($modules) {
      */
     public function savedModuleSettings($module)
     {
-        return $this->cache
-            ->tags([$this->entityName, 'global'])
-            ->remember(
-                "{$this->locale}.{$this->entityName}.savedModuleSettings.{$module}",
-                $this->cacheTime,
-                function () use ($module) {
-                    return $this->repository->savedModuleSettings($module);
-                }
-            );
+        return $this->remember(function() use ($module) {
+            return $this->repository->savedModuleSettings($module);
+        });
     }
 
     /**
@@ -90,15 +70,9 @@ function () use ($module) {
      */
     public function findByModule($module)
     {
-        return $this->cache
-            ->tags([$this->entityName, 'global'])
-            ->remember(
-                "{$this->locale}.{$this->entityName}.findByModule.{$module}",
-                $this->cacheTime,
-                function () use ($module) {
-                    return $this->repository->findByModule($module);
-                }
-            );
+        return $this->remember(function() use ($module) {
+            return $this->repository->findByModule($module);
+        });
     }
 
     /**
@@ -108,15 +82,9 @@ function () use ($module) {
      */
     public function get($settingName)
     {
-        return $this->cache
-            ->tags([$this->entityName, 'global'])
-            ->remember(
-                "{$this->locale}.{$this->entityName}.get.{$settingName}",
-                $this->cacheTime,
-                function () use ($settingName) {
-                    return $this->repository->get($settingName);
-                }
-            );
+        return $this->remember(function() use ($settingName) {
+            return $this->repository->get($settingName);
+        });
     }
 
     /**
@@ -126,15 +94,9 @@ function () use ($settingName) {
      */
     public function translatableModuleSettings($module)
     {
-        return $this->cache
-            ->tags([$this->entityName, 'global'])
-            ->remember(
-                "{$this->locale}.{$this->entityName}.translatableModuleSettings.{$module}",
-                $this->cacheTime,
-                function () use ($module) {
-                    return $this->repository->translatableModuleSettings($module);
-                }
-            );
+        return $this->remember(function() use ($module) {
+            return $this->repository->translatableModuleSettings($module);
+        });
     }
 
     /**
@@ -144,14 +106,8 @@ function () use ($module) {
      */
     public function plainModuleSettings($module)
     {
-        return $this->cache
-            ->tags([$this->entityName, 'global'])
-            ->remember(
-                "{$this->locale}.{$this->entityName}.plainModuleSettings.{$module}",
-                $this->cacheTime,
-                function () use ($module) {
-                    return $this->repository->plainModuleSettings($module);
-                }
-            );
+        return $this->remember(function() use ($module) {
+            return $this->repository->plainModuleSettings($module);
+        });
     }
 }
diff --git a/Modules/Setting/changelog.yml b/Modules/Setting/changelog.yml
@@ -3,6 +3,7 @@ versions:
     "3.4.0@unreleased":
         changed:
             - Fix settings with falsey values not getting returned
+            - Using new <code>remember</code> method in the <code>CacheSettingDecorator</code> class
     "3.1.0":
         changed:
             - Checking for null value instead of empty for non translatable settings