More consent cache updates

visualbuilder · Dec 16, 2024 · 98fef72 · 98fef72
1 parent 9ba8e15
commit 98fef72
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/Livewire/ConsentOptionFormBuilder.php b/src/Livewire/ConsentOptionFormBuilder.php
@@ -62,7 +62,7 @@ public function mount(): void
         $this->user->collection = $this->user->outstandingConsents();
 
         if ($this->user->collection->count() < 1) {
-            $this->redirect(request()->session()->get('url.saved'));
+            abort(403, 'No required consent');
         }
 
         $this->setDefaultValues();

diff --git a/src/Traits/HasConsent.php b/src/Traits/HasConsent.php
@@ -2,6 +2,7 @@
 
 namespace Visualbuilder\FilamentUserConsent\Traits;
 
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Visualbuilder\FilamentUserConsent\Models\ConsentOption;
 use Visualbuilder\FilamentUserConsent\Models\ConsentOptionUser;
@@ -22,7 +23,7 @@ public function requiredConsentKeys(): array
     {
         return ConsentOption::activeKeysForUser($this);
     }
-    
+
     public function outstandingConsentValidators()
     {
         $consents = $this->outstandingConsents();
@@ -123,14 +124,20 @@ public function activeConsents()
      */
     public function hasRequiredConsents()
     {
-        $requiredConsents = ConsentOption::findbykeys($this->requiredConsentKeys())
-            ->where('force_user_update', true)
-            ->pluck('id')
-            ->toArray();
-        $givenConsents = $this->consents()
-            ->pluck('consent_options.id')
-            ->toArray();
-
-        return ! array_diff($requiredConsents, $givenConsents);
+        // Define a unique cache key based on identifiable attributes including the model class
+        $cacheKey = 'user_consent_'.class_basename($this).'-'.$this->getKey();
+
+        // Retrieve from cache or calculate if not cached
+        return Cache::tags(['user-consents'])->rememberForever($cacheKey, function () {
+            $requiredConsents = ConsentOption::findbykeys($this->requiredConsentKeys())
+                ->where('force_user_update', true)
+                ->pluck('id')
+                ->toArray();
+            $givenConsents = $this->consents()
+                ->pluck('consent_options.id')
+                ->toArray();
+
+            return !array_diff($requiredConsents, $givenConsents);
+        });
     }
 }