Merge pull request #147

[Improvement] Anime Studio

app/Http/Resources/AnimeResource.php

@@ -159,7 +159,7 @@ protected function getStudiosRelationship(): array
         return [
             'studios' => [
                 'href' => route('api.anime.studios', $anime, false),
-                'data' => StudioResource::collection($anime->getStudios(Anime::MAXIMUM_RELATIONSHIPS_LIMIT))
+                'data' => AnimeStudioResource::collection($anime->getAnimeStudios(Anime::MAXIMUM_RELATIONSHIPS_LIMIT))
             ]
         ];
     }

app/Http/Resources/AnimeStudioResource.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\AnimeStudio;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class AnimeStudioResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  Request  $request
+     * @return array
+     */
+    public function toArray($request): array
+    {
+        /** @var AnimeStudio $animeStudio */
+        $animeStudio = $this->resource;
+
+        $resource = [
+            'id'            => $animeStudio->id,
+            'type'          => 'studios',
+            'href'          => route('api.anime.studios', $animeStudio->anime, false),
+            'attributes'    => $animeStudio->only(['is_licensor', 'is_producer', 'is_studio']),
+        ];
+
+        $relationships = [];
+
+        $relationships = array_merge($relationships, $this->getStudioRelationship());
+
+        $resource = array_merge($resource, ['relationships' => $relationships]);
+
+        return $resource;
+    }
+
+    /**
+     * Returns the person relationship for the resource.
+     *
+     * @return array
+     */
+    protected function getStudioRelationship(): array
+    {
+        /** @var AnimeStudio $animeStudio */
+        $animeStudio = $this->resource;
+
+        return [
+            'studio' => [
+                'href' => route('api.studios.details', $animeStudio, false),
+                'data' => StudioResourceBasic::make($animeStudio->studio),
+            ]
+        ];
+    }
+}

app/Http/Resources/StudioResource.php

@@ -51,8 +51,9 @@ protected function getAnimeRelationship(?Anime $excludingAnime = null): array
         $studio = $this->resource;
 
         $whereRules = [];
-        if ($excludingAnime)
+        if ($excludingAnime) {
             array_push($whereRules, ['animes.id', '!=', $excludingAnime->id]);
+        }
 
         return [
             'shows' => [

app/Models/Anime.php

@@ -211,6 +211,33 @@ public function studios(): BelongsToMany
         return $this->belongsToMany(Studio::class);
     }
 
+    /**
+     * Retrieves the studios for an Anime item in an array
+     *
+     * @param ?int $limit
+     * @return mixed
+     */
+    public function getAnimeStudios(?int $limit = null): mixed
+    {
+        // Find location of cached data
+        $cacheKey = self::cacheKey(['name' => 'anime.anime_studios', 'id' => $this->id, 'limit' => $limit]);
+
+        // Retrieve or save cached result
+        return Cache::remember($cacheKey, self::CACHE_KEY_STUDIOS_SECONDS, function () use ($limit) {
+            return $this->anime_studios()->limit($limit)->get();
+        });
+    }
+
+    /**
+     * Get the Anime's studios
+     *
+     * @return HasMany
+     */
+    public function anime_studios(): HasMany
+    {
+        return $this->hasMany(AnimeStudio::class);
+    }
+
     /**
      * Get the Anime's ratings
      *

app/Models/AnimeStudio.php

@@ -2,15 +2,20 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-class AnimeStudio extends Model
+class AnimeStudio extends KModel
 {
     // Table name
     const TABLE_NAME = 'anime_studio';
     protected $table = self::TABLE_NAME;
 
+    protected $casts = [
+        'is_licensor'   => 'boolean',
+        'is_producer'   => 'boolean',
+        'is_studio'     => 'boolean',
+    ];
+
     /**
      * Returns the anime belonging to the studio.
      *

app/Models/Studio.php

@@ -57,7 +57,7 @@ public function anime(): BelongsToMany
     public function getAnime(array $where = []): Collection
     {
         // Find location of cached data
-        $cacheKey = self::cacheKey(['name' => 'studios', 'id' => $this->id, 'where' => $where]);
+        $cacheKey = self::cacheKey(['name' => 'studios.anime', 'id' => $this->id, 'where' => $where]);
 
         // Retrieve or save cached result
         $animeInfo = Cache::remember($cacheKey, self::CACHE_KEY_ANIME_SECONDS, function () use ($where) {

app/Nova/Anime.php

@@ -29,7 +29,7 @@ class Anime extends Resource
      *
      * @var string
      */
-    public static string $model = 'App\Models\Anime';
+    public static string $model = \App\Models\Anime::class;
 
     /**
      * The single value that should be used to represent the resource when being displayed.
@@ -204,8 +204,7 @@ public function fields(Request $request): array
 
             HasMany::make('Staff', 'staff', AnimeStaff::class),
 
-            BelongsToMany::make('Studios')
-                ->searchable(),
+            HasMany::make('Studios', 'anime_studios', AnimeStudio::class),
 
             BelongsToMany::make('Moderators', 'moderators', User::class)
                 // @TODO
@@ -229,8 +228,9 @@ public function title(): string
     {
         $animeName = $this->title;
 
-        if (!is_string($animeName) || !strlen($animeName))
+        if (!is_string($animeName) || !strlen($animeName)) {
             $animeName = 'No Anime title';
+        }
 
         return $animeName . ' (ID: ' . $this->id . ')';
     }

app/Nova/AnimeImage.php

@@ -20,7 +20,7 @@ class AnimeImage extends Resource
      *
      * @var string
      */
-    public static string $model = 'App\Models\AnimeImages';
+    public static string $model = \App\Models\AnimeImages::class;
 
     /**
      * The single value that should be used to represent the resource when being displayed.

app/Nova/AnimeSong.php

@@ -32,7 +32,7 @@ class AnimeSong extends Resource
      * @var array
      */
     public static $search = [
-        'id',
+        'id', 'type', 'position', 'episodes'
     ];
 
     /**

app/Nova/AnimeStaff.php

@@ -2,6 +2,7 @@
 
 namespace App\Nova;
 
+use Illuminate\Database\Query\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
@@ -79,17 +80,28 @@ public function fields(Request $request): array
      */
     protected static function afterValidation(NovaRequest $request, $validator)
     {
+        $resourceID = $request->resourceId;
         $anime = $request->post('anime');
         $person = $request->post('person');
-
-        $unique = Rule::unique(\App\Models\AnimeStaff::TABLE_NAME, 'person_id')->where(function ($query) use($anime, $person) {
-            return $query->where('anime_id', $anime)->where('person_id', $person);
+        $staffRole = $request->post('staff_role');
+
+        $unique = Rule::unique(\App\Models\AnimeStaff::TABLE_NAME, 'staff_role_id')->where(function ($query) use($resourceID, $anime, $person, $staffRole) {
+            if ($resourceID) {
+                $query->whereNotIn('id', [$resourceID]);
+            }
+
+            return $query
+                ->where([
+                    ['anime_id', $anime],
+                    ['person_id', $person],
+                    ['staff_role_id', $staffRole]
+                ]);
         });
 
-        $uniqueValidator = Validator::make($request->only('person'), [
-            'person' => [$unique],
+        $uniqueValidator = Validator::make($request->only('staff_role'), [
+            'staff_role' => [$unique],
         ], [
-            'person' => __('validation.unique')
+            'staff_role' => __('validation.unique')
         ]);
 
         $uniqueValidator->validate();

app/Nova/AnimeStudio.php

@@ -3,8 +3,13 @@
 namespace App\Nova;
 
 use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\ValidationException;
 use Laravel\Nova\Fields\BelongsTo;
+use Laravel\Nova\Fields\Boolean;
 use Laravel\Nova\Fields\ID;
+use Laravel\Nova\Http\Requests\NovaRequest;
+use Validator;
 
 class AnimeStudio extends Resource
 {
@@ -13,7 +18,7 @@ class AnimeStudio extends Resource
      *
      * @var string
      */
-    public static string $model = 'App\Models\AnimeStudio';
+    public static string $model = \App\Models\AnimeStudio::class;
 
     /**
      * The single value that should be used to represent the resource when being displayed.
@@ -57,9 +62,58 @@ public function fields(Request $request): array
             BelongsTo::make('Studio')
                 ->sortable()
                 ->searchable(),
+
+            Boolean::make('Is Licensor')
+                ->sortable()
+                ->help('The studio is responsible for licensing the anime.')
+                ->required(),
+
+            Boolean::make('Is Producer')
+                ->sortable()
+                ->help('The studio is responsible for producing the anime. Usually sponsors.')
+                ->required(),
+
+            Boolean::make('Is Studio')
+                ->sortable()
+                ->help('The studio responsible for creating (drawing) the anime.')
+                ->required(),
         ];
     }
 
+    /**
+     * Handle any post-validation processing.
+     *
+     * @param NovaRequest $request
+     * @param \Illuminate\Validation\Validator $validator
+     * @return void
+     * @throws ValidationException
+     */
+    protected static function afterValidation(NovaRequest $request, $validator)
+    {
+        $resourceID = $request->resourceId;
+        $anime = $request->post('anime');
+        $studio = $request->post('studio');
+
+        $unique = Rule::unique(\App\Models\AnimeStudio::TABLE_NAME, 'studio_id')->where(function ($query) use($resourceID, $anime, $studio) {
+            if ($resourceID) {
+                $query->whereNotIn('id', [$resourceID]);
+            }
+
+            return $query->where([
+                ['anime_id', $anime],
+                ['studio_id', $studio]
+            ]);
+        });
+
+        $uniqueValidator = Validator::make($request->only('studio'), [
+            'studio' => [$unique],
+        ], [
+            'studio' => __('validation.unique')
+        ]);
+
+        $uniqueValidator->validate();
+    }
+
     /**
      * Get the cards available for the request.
      *

app/Nova/AppTheme.php

@@ -16,7 +16,7 @@ class AppTheme extends Resource
      *
      * @var string
      */
-    public static string $model = 'App\Models\AppTheme';
+    public static string $model = \App\Models\AppTheme::class;
 
     /**
      * The single value that should be used to represent the resource when being displayed.
@@ -25,13 +25,6 @@ class AppTheme extends Resource
      */
     public static $title = 'id';
 
-    /**
-     * The logical group associated with the resource.
-     *
-     * @var string
-     */
-    public static $group = 'Cosmetics';
-
     /**
      * The columns that should be searched.
      *
@@ -41,6 +34,13 @@ class AppTheme extends Resource
         'id', 'name'
     ];
 
+    /**
+     * The logical group associated with the resource.
+     *
+     * @var string
+     */
+    public static $group = 'Cosmetics';
+
     /**
      * Get the fields displayed by the resource.
      *
@@ -178,6 +178,16 @@ public function fields(Request $request): array
         ];
     }
 
+    /**
+     * Get the value that should be displayed to represent the resource.
+     *
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Name: "' . $this->name . '" (ID: ' . $this->id . ')';
+    }
+
     /**
      * Get the cards available for the request.
      *
@@ -221,17 +231,6 @@ public function actions(Request $request): array
     {
         return [];
     }
-
-    /**
-     * Get the value that should be displayed to represent the resource.
-     *
-     * @return string
-     */
-    public function title(): string
-    {
-        return 'Name: "' . $this->name . '" (ID: ' . $this->id . ')';
-    }
-
     /**
      * Returns the user-friendly display name of the resource.
      *