Merge pull request #125 from Kurozora/improve-tv-rating

[Update] TV Rating Weights
Kurozora · Apr 28, 2021 · ccec8f4 · ccec8f4
2 parents b246f06 + 128cb7d
commit ccec8f4
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 11 deletions.
diff --git a/app/Models/Anime.php b/app/Models/Anime.php
@@ -89,10 +89,11 @@ protected static function boot()
 
         static::addGlobalScope('tv_rating', function (Builder $builder) {
             if (Auth::user() != null) {
-                $tvRating = settings('tv_rating');
+                $preferredTvRating = settings('tv_rating');
+                $tvRating = TvRating::firstWhere('weight', $preferredTvRating);
 
-                if ($tvRating != -1) {
-                    $builder->where('tv_rating_id', '<=', $tvRating);
+                if (!empty($tvRating)) {
+                    $builder->where('tv_rating_id', '<=', $tvRating->id);
                 }
             }
         });

diff --git a/app/Models/TvRating.php b/app/Models/TvRating.php
@@ -32,6 +32,7 @@ class TvRating extends Model
     protected $fillable = [
         'rating',
         'description',
+        'weight',
     ];
 
     /**

diff --git a/app/Nova/TvRating.php b/app/Nova/TvRating.php
@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Laravel\Nova\Fields\HasMany;
 use Laravel\Nova\Fields\ID;
+use Laravel\Nova\Fields\Number;
 use Laravel\Nova\Fields\Text;
 
 class TvRating extends Resource
@@ -58,6 +59,11 @@ public function fields(Request $request)
                 ->help('A very short description of the rating. E.g. Not Rated, All Ages, Children...')
                 ->required(),
 
+            Number::make('Weight')
+                ->help('The priority of the rating. E.g: if a TV rating with a weight of 5 is selected, all ratings that are less than, and equal to, 5 are accessible to the user.')
+                ->rules(['min:0', 'max:255'])
+                ->required(),
+
             HasMany::make('Anime'),
         ];
     }

diff --git a/config/app.php b/config/app.php
@@ -38,7 +38,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '1.2.0-alpha.31',
+    'version' => '1.2.0-alpha.32',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/database/factories/TvRatingFactory.php b/database/factories/TvRatingFactory.php
@@ -23,7 +23,8 @@ public function definition()
     {
         return [
             'name'          => $this->faker->randomLetter,
-            'description'   => $this->faker->words(3, true)
+            'description'   => $this->faker->words(3, true),
+            'weight'        => $this->faker->unique()->numberBetween(1, 10)
         ];
     }
 }
diff --git a/database/migrations/2018_08_17_103103_create_tv_ratings_table.php b/database/migrations/2018_08_17_103103_create_tv_ratings_table.php
@@ -18,6 +18,7 @@ public function up()
             $table->bigIncrements('id');
             $table->string('name');
             $table->string('description');
+            $table->unsignedTinyInteger('weight');
             $table->timestamps();
         });
     }

diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -17,14 +17,14 @@ public function run()
             RoleSeeder::class,
             StudioSeeder::class,
             TvRatingSeeder::class,
+            GenreSeeder::class,
             AnimeDummySeeder::class,
             AnimeRelationsSeeder::class,
             UserSeeder::class,
             ForumSectionSeeder::class,
             BadgeSeeder::class,
             ForumThreadSeeder::class,
             ForumReplySeeder::class,
-            GenreSeeder::class,
             AppThemeSeeder::class,
             ActorCharacterAnimeSeeder::class,
         ]);

diff --git a/database/seeders/TvRatingSeeder.php b/database/seeders/TvRatingSeeder.php
@@ -16,22 +16,27 @@ class TvRatingSeeder extends Seeder
         [
             'name'          => 'NR',
             'description'   => 'Not Rated',
+            'weight'        => 1,
         ],
         [
             'name'          => 'G',
             'description'   => 'All Ages',
+            'weight'        => 2,
         ],
         [
             'name'          => 'PG-12',
             'description'   => 'Parental Guidance Suggested',
+            'weight'        => 3,
         ],
         [
             'name'          => 'R15+',
             'description'   => 'Violence & Profanity',
+            'weight'        => 4,
         ],
         [
             'name'          => 'R18+',
             'description'   => 'Adults Only',
+            'weight'        => 5,
         ]
     ];
 
@@ -43,10 +48,7 @@ class TvRatingSeeder extends Seeder
     public function run()
     {
         foreach ($this->tvRatings as $tvRating) {
-            TvRating::create([
-                'name'          => $tvRating['name'],
-                'description'   => $tvRating['description'],
-            ]);
+            TvRating::create($tvRating);
         }
     }
 }
diff --git a/resources/views/livewire/profile/select-preferred-tv-rating-form.blade.php b/resources/views/livewire/profile/select-preferred-tv-rating-form.blade.php
@@ -17,7 +17,7 @@
                 <x-select id="tv_rating" wire:model.defer="state.tv_rating">
                     <option value="-1">{{ __('Allow All Shows') }}</option>
                     @foreach (App\Models\TvRating::all()->where('id', '!=', 1) as $tvRating)
-                        <option value="{{ $tvRating->id }}">{{ $tvRating->full_name }}</option>
+                        <option value="{{ $tvRating->weight }}">{{ $tvRating->full_name }}</option>
                     @endforeach
                 </x-select>
                 <x-input-error for="tv_rating" class="mt-2" />