Merge pull request #37 from JohnDivam/FIX-scopeForUser

Refactor scopeForUser function
alkrauss48 · Oct 11, 2024 · cf2f0e3 · cf2f0e3
2 parents afac95e + c0e27b4
commit cf2f0e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/app/Models/DailyView.php b/app/Models/DailyView.php
@@ -74,13 +74,11 @@ public function scopeStats(Builder $query, ?string $presentationId = null): void
      */
     public function scopeForUser(Builder $query): void
     {
-        if (auth()->user()->isAdministrator()) {
-            return;
-        }
-
-        $presentationIds = auth()->user()->presentations()->pluck('id');
-
-        $query->whereIn('presentation_id', $presentationIds);
+        $query->when(!auth()->user()->isAdministrator(), function($qr){
+            $qr->whereHas('presentation', function($qrPresn){
+                $qrPresn->where('user_id',auth()->id());
+            });
+        });
     }
 
     /**

diff --git a/app/Models/Presentation.php b/app/Models/Presentation.php
@@ -108,13 +108,9 @@ protected function shouldTrackView(): Attribute
      */
     public function scopeForUser(Builder $query): void
     {
-        if (auth()->user()->isAdministrator()) {
-            return;
-        }
-
-        $presentationIds = auth()->user()->presentations()->pluck('id');
-
-        $query->whereIn('id', $presentationIds);
+        $query->when(!auth()->user()->isAdministrator(), function($qr){
+            $qr->where('user_id',auth()->id());
+        });
     }
 
     /**