[Update] Route Binding

- Added explicit `withoutGlobalScopes` as it works better
Kurozora · Jul 21, 2024 · 711c150 · 711c150
1 parent 15d6aa4
commit 711c150
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 11 deletions.
diff --git a/app/Models/Anime.php b/app/Models/Anime.php
@@ -451,7 +451,7 @@ public function languages(): HasManyThrough
     public function resolveRouteBindingQuery($query, $value, $field = null): \Illuminate\Contracts\Database\Eloquent\Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class, IgnoreListScope::class]);
     }
 
     /**

diff --git a/app/Models/Episode.php b/app/Models/Episode.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Enums\MediaCollection;
+use App\Scopes\TvRatingScope;
 use App\Traits\InteractsWithMediaExtension;
 use App\Traits\Model\Actionable;
 use App\Traits\Model\HasComments;
@@ -399,7 +400,7 @@ public function videos(): MorphMany
     public function resolveRouteBindingQuery($query, $value, $field = null): \Illuminate\Contracts\Database\Eloquent\Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class]);
     }
 
     /**

diff --git a/app/Models/Game.php b/app/Models/Game.php
@@ -6,6 +6,8 @@
 use App\Enums\DayOfWeek;
 use App\Enums\MediaCollection;
 use App\Enums\SeasonOfYear;
+use App\Scopes\IgnoreListScope;
+use App\Scopes\TvRatingScope;
 use App\Traits\InteractsWithMediaExtension;
 use App\Traits\Model\Actionable;
 use App\Traits\Model\Favorable;
@@ -620,7 +622,7 @@ public function toSearchableArray(): array
     public function resolveRouteBindingQuery($query, $value, $field = null): \Illuminate\Contracts\Database\Eloquent\Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class, IgnoreListScope::class]);
     }
 
     /**

diff --git a/app/Models/Genre.php b/app/Models/Genre.php
@@ -3,9 +3,11 @@
 namespace App\Models;
 
 use App\Enums\MediaCollection;
+use App\Scopes\TvRatingScope;
 use App\Traits\InteractsWithMediaExtension;
 use App\Traits\Model\HasSlug;
 use App\Traits\Model\TvRated;
+use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -117,12 +119,12 @@ public function toSearchableArray(): array
      * @param  Model|\Illuminate\Database\Eloquent\Relations\Relation  $query
      * @param  mixed  $value
      * @param  string|null  $field
-     * @return \Illuminate\Contracts\Database\Eloquent\Builder
+     * @return Builder
      */
-    public function resolveRouteBindingQuery($query, $value, $field = null): \Illuminate\Contracts\Database\Eloquent\Builder
+    public function resolveRouteBindingQuery($query, $value, $field = null): Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class]);
     }
 
     /**

diff --git a/app/Models/Manga.php b/app/Models/Manga.php
@@ -6,6 +6,8 @@
 use App\Enums\DayOfWeek;
 use App\Enums\MediaCollection;
 use App\Enums\SeasonOfYear;
+use App\Scopes\IgnoreListScope;
+use App\Scopes\TvRatingScope;
 use App\Traits\InteractsWithMediaExtension;
 use App\Traits\Model\Actionable;
 use App\Traits\Model\Favorable;
@@ -679,7 +681,7 @@ public function toSearchableArray(): array
     public function resolveRouteBindingQuery($query, $value, $field = null): \Illuminate\Contracts\Database\Eloquent\Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class, IgnoreListScope::class]);
     }
 
     /**

diff --git a/app/Models/MediaRating.php b/app/Models/MediaRating.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Scopes\TvRatingScope;
 use App\Traits\Model\MorphTvRated;
 use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -53,6 +54,6 @@ public function user(): BelongsTo
     public function resolveRouteBindingQuery($query, $value, $field = null): Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class]);
     }
 }
diff --git a/app/Models/Season.php b/app/Models/Season.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Enums\MediaCollection;
+use App\Scopes\TvRatingScope;
 use App\Traits\InteractsWithMediaExtension;
 use App\Traits\Model\HasViews;
 use App\Traits\Model\TvRated;
@@ -129,7 +130,7 @@ public function tv_rating(): BelongsTo
     public function resolveRouteBindingQuery($query, $value, $field = null): Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class]);
     }
 
     /**

diff --git a/app/Models/Studio.php b/app/Models/Studio.php
@@ -5,6 +5,7 @@
 use App\Casts\AsArrayObject;
 use App\Enums\MediaCollection;
 use App\Enums\StudioType;
+use App\Scopes\TvRatingScope;
 use App\Traits\InteractsWithMediaExtension;
 use App\Traits\Model\HasMediaRatings;
 use App\Traits\Model\HasMediaStat;
@@ -293,7 +294,7 @@ public function tv_rating(): BelongsTo
     public function resolveRouteBindingQuery($query, $value, $field = null): \Illuminate\Contracts\Database\Eloquent\Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class]);
     }
 
     /**

diff --git a/app/Models/Theme.php b/app/Models/Theme.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Enums\MediaCollection;
+use App\Scopes\TvRatingScope;
 use App\Traits\InteractsWithMediaExtension;
 use App\Traits\Model\HasSlug;
 use App\Traits\Model\TvRated;
@@ -134,7 +135,7 @@ public function toSearchableArray(): array
     public function resolveRouteBindingQuery($query, $value, $field = null): \Illuminate\Contracts\Database\Eloquent\Builder
     {
         return parent::resolveRouteBindingQuery($query, $value, $field)
-            ->withoutTvRatings();
+            ->withoutGlobalScopes([TvRatingScope::class]);
     }
 
     /**