Remove cache tags -> incompatible with redis

visualbuilder · Dec 19, 2024 · 665ec38 · 665ec38
1 parent 4c9f433
commit 665ec38
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/config/filament-user-consent.php b/config/filament-user-consent.php
@@ -1,8 +1,5 @@
 <?php
 
-
-use Visualbuilder\FilamentUserConsent\Models\ConsentOption;
-
 return [
 
     //To which authenticatable models consents should be applied?

diff --git a/src/Models/ConsentOption.php b/src/Models/ConsentOption.php
@@ -90,12 +90,12 @@ protected static function booted()
             if ($consentOption->isDirty('is_current') && $consentOption->is_current) {
                 $consentOption->setCurrentVersion();
             }
-            Cache::tags(['user-consents'])->flush();
+            Cache::flush();
         });
 
         // Handle the deleted event
         static::deleted(function ($consentOption) {
-            Cache::tags(['user-consents'])->flush();
+            Cache::flush();
         });
     }
 
@@ -149,7 +149,7 @@ public static function activeKeysForUser($user): array
     {
         $className = class_basename($user);
         $cacheKey = 'consent_option_active_keys_for_'.$className.'_'.$user->id;
-        return Cache::tags(['user-consents'])->rememberForever($cacheKey, function () use ($user, $className) {
+        return Cache::rememberForever($cacheKey, function () use ($user, $className) {
             return self::where('models', 'like', "%$className%")
                 ->where('is_current', true)
                 ->where('enabled', true)

diff --git a/src/Models/ConsentOptionUser.php b/src/Models/ConsentOptionUser.php
@@ -53,18 +53,8 @@ public static function clearCache($consentOptionUser)
         $userKey = class_basename($consentOptionUser->consentable_type).'_'.$consentOptionUser->consentable_id;
         $cacheKey1 = 'consent_option_active_keys_for_'.$userKey;
         $cacheKey2 = 'user_consent_'.$userKey;
-
-        // Similarly, flush the cache when a consent option user relationship is deleted
-        // Flush the cache for the specific user involved using a simplified class name
-        Cache::tags([
-            'user-consents',
-            $cacheKey1
-        ])->flush();
-
-        Cache::tags([
-            'user-consents',
-            $cacheKey2
-        ])->flush();
+        Cache::forget($cacheKey1);
+        Cache::forget($cacheKey2);
     }
 
     public static function getAllSavedUserTypes(): array

diff --git a/src/Traits/HasConsent.php b/src/Traits/HasConsent.php
@@ -132,7 +132,7 @@ public function hasRequiredConsents()
         $cacheKey = 'user_consent_'.class_basename($this).'_'.$this->getKey();
 
         // Retrieve from cache or calculate if not cached
-        return Cache::tags(['user-consents'])->rememberForever($cacheKey, function () {
+        return Cache::rememberForever($cacheKey, function () {
             $consentOptionModel =  config('filament-user-consent.models.consent_option');
             $requiredConsents = $consentOptionModel::findbykeys($this->requiredConsentKeys())
                 ->where('force_user_update', true)