Separate Cache Helper File to Package

anisAronno · Oct 16, 2023 · 21a67ba · 21a67ba
1 parent efa0869
commit 21a67ba
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 217 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "anisaronno/laravel-settings",
     "description": "Laravel Settings Table",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "license": "MIT",
     "keywords": [
         "laravel-settings",
@@ -20,6 +20,7 @@
     "homepage": "https://github.com/anisAronno/laravel-settings",
     "require": {
         "php": "^7.4|^8.0",
+        "anisaronno/laravel-cache-control": "^0.0.1",
         "laravel/framework": "^8.0|^9.0|^10.0"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Helpers/CacheHelper.php b/src/Helpers/CacheHelper.php
diff --git a/src/Helpers/CacheKey.php b/src/Helpers/CacheKey.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace AnisAronno\LaravelSettings\Helpers;
+
+class CacheKey
+{
+    /**
+     * Cache Key
+     * @return string
+     */
+    public static function getLaravelSettingsCacheKey(): string
+    {
+        return "_LaravelSettings_";
+    }
+}
diff --git a/src/Helpers/SettingsHelper.php b/src/Helpers/SettingsHelper.php
@@ -2,6 +2,7 @@
 
 namespace AnisAronno\LaravelSettings\Helpers;
 
+use AnisAronno\LaravelCacheMaster\CacheControl;
 use AnisAronno\LaravelSettings\Models\SettingsProperty;
 use Exception;
 use Illuminate\Support\Collection;
@@ -18,11 +19,11 @@ class SettingsHelper
      */
     public static function getSettings(string $settingsKey): string
     {
-        $key = CacheHelper::getLaravelSettingsCacheKey();
+        $key = CacheKey::getLaravelSettingsCacheKey();
 
 
         try {
-            $settings = CacheHelper::init($key)->remember($settingsKey, now()->addDay(), function () use ($settingsKey) {
+            $settings = CacheControl::init($key)->remember($settingsKey, now()->addDay(), function () use ($settingsKey) {
                 return SettingsProperty::select('settings_value')->find($settingsKey);
             });
 
@@ -113,11 +114,11 @@ public static function upsertSettings(string $key, string $value): SettingsPrope
      */
     public static function getAllSettings(): Collection
     {
-        $key = CacheHelper::getLaravelSettingsCacheKey();
+        $key = CacheKey::getLaravelSettingsCacheKey();
         $cacheKey =  $key.md5(serialize(['getAllSettings']));
 
         try {
-            return CacheHelper::init($key)->remember($cacheKey, 10, function () {
+            return CacheControl::init($key)->remember($cacheKey, 10, function () {
                 return SettingsProperty::select('settings_value', 'settings_key')->orderBy('settings_key', 'asc')->get()->flatMap(function ($name) {
                     return [$name->settings_key => $name->settings_value];
                 });

diff --git a/src/Http/Controllers/LaravelSettingsController.php b/src/Http/Controllers/LaravelSettingsController.php
@@ -2,7 +2,8 @@
 
 namespace AnisAronno\LaravelSettings\Http\Controllers;
 
-use AnisAronno\LaravelSettings\Helpers\CacheHelper;
+use AnisAronno\LaravelCacheMaster\CacheControl;
+use AnisAronno\LaravelSettings\Helpers\CacheKey;
 use AnisAronno\LaravelSettings\Http\Requests\StoreLaravelSettingsRequest;
 use AnisAronno\LaravelSettings\Http\Requests\UpdateLaravelSettingsRequest;
 use AnisAronno\LaravelSettings\Http\Resources\SettingsResources;
@@ -29,11 +30,11 @@ public function index(Request $request): JsonResponse
         $endDate = $request->query('endDate', '');
         $page = $request->query('page', 1);
 
-        $imageCacheKey = CacheHelper::getLaravelSettingsCacheKey();
+        $imageCacheKey = CacheKey::getLaravelSettingsCacheKey();
 
         $key =  $imageCacheKey.md5(serialize([$orderBy, $order,  $page, $search, $startDate, $endDate,  ]));
 
-        $images = CacheHelper::init($imageCacheKey)->remember(
+        $images = CacheControl::init($imageCacheKey)->remember(
             $key,
             now()->addDay(),
             function () use ($request) {