Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Add] People & Anime Staff #144

Merged
merged 6 commits into from
May 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions app/Console/Commands/FetchAnimeActors.php

This file was deleted.

61 changes: 0 additions & 61 deletions app/Http/Controllers/ActorController.php

This file was deleted.

18 changes: 9 additions & 9 deletions app/Http/Controllers/AnimeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use App\Http\Requests\RateAnimeRequest;
use App\Http\Requests\SearchAnimeRequest;
use App\Http\Resources\AnimeCastResource;
use App\Http\Resources\ActorResource;
use App\Http\Resources\PersonResource;
use App\Http\Resources\AnimeRelatedShowsResource;
use App\Http\Resources\AnimeResource;
use App\Http\Resources\AnimeResourceBasic;
Expand Down Expand Up @@ -40,18 +40,18 @@ public function view(Anime $anime): JsonResponse
}

/**
* Returns actor information of an Anime.
* Returns person information of an Anime.
*
* @param Anime $anime
* @return JsonResponse
*/
public function actors(Anime $anime): JsonResponse
public function people(Anime $anime): JsonResponse
{
// Get the actors
$actors = $anime->getActors();
// Get the people
$people = $anime->getPeople();

return JSONResult::success([
'data' => ActorResource::collection($actors)
'data' => PersonResource::collection($people)
]);
}

Expand All @@ -63,11 +63,11 @@ public function actors(Anime $anime): JsonResponse
*/
public function characters(Anime $anime): JsonResponse
{
// Get the actors
$actors = $anime->getCharacters();
// Get the characters
$characters = $anime->getCharacters();

return JSONResult::success([
'data' => CharacterResourceBasic::collection($actors)
'data' => CharacterResourceBasic::collection($characters)
]);
}

Expand Down
14 changes: 7 additions & 7 deletions app/Http/Controllers/CharacterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use App\Models\Character;
use App\Helpers\JSONResult;
use App\Http\Resources\ActorResource;
use App\Http\Resources\PersonResource;
use App\Http\Resources\AnimeResourceBasic;
use App\Http\Resources\CharacterResource;
use Illuminate\Http\JsonResponse;
Expand All @@ -26,19 +26,19 @@ public function details(Character $character): JsonResponse
}

/**
* Returns actor information about a character.
* Returns person information about a character.
*
* @param Character $character
* @return JsonResponse
*/
public function actors(Character $character): JsonResponse
public function people(Character $character): JsonResponse
{
// Get the actors
$actors = $character->getActors();
// Get the people
$people = $character->getPeople();

// Return character actors
// Return character people
return JSONResult::success([
'data' => ActorResource::collection($actors)
'data' => PersonResource::collection($people)
]);
}

Expand Down
61 changes: 61 additions & 0 deletions app/Http/Controllers/PersonController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?php

namespace App\Http\Controllers;

use App\Helpers\JSONResult;
use App\Http\Resources\PersonResource;
use App\Http\Resources\AnimeResourceBasic;
use App\Http\Resources\CharacterResourceBasic;
use App\Models\Person;
use Illuminate\Http\JsonResponse;

class PersonController extends Controller
{
/**
* Shows person details.
*
* @param Person $person
* @return JsonResponse
*/
public function details(Person $person): JsonResponse
{
// Return person details
return JSONResult::success([
'data' => PersonResource::collection([$person])
]);
}

/**
* Returns anime information of the person.
*
* @param Person $person
* @return JsonResponse
*/
public function anime(Person $person): JsonResponse
{
// Get the anime
$anime = $person->getAnime();

// Return person shows
return JSONResult::success([
'data' => AnimeResourceBasic::collection($anime)
]);
}

/**
* Returns character information of the person.
*
* @param Person $person
* @return JsonResponse
*/
public function characters(Person $person): JsonResponse
{
// Get the characters
$characters = $person->getCharacters();

// Return person characters
return JSONResult::success([
'data' => CharacterResourceBasic::collection($characters)
]);
}
}
35 changes: 0 additions & 35 deletions app/Http/Resources/ActorResourceBasic.php

This file was deleted.

16 changes: 7 additions & 9 deletions app/Http/Resources/AnimeCastResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,29 @@ public function toArray($request): array

$relationships = [];

// Include actors
$relationships = array_merge($relationships, $this->getActorsRelationship());
// Include people
$relationships = array_merge($relationships, $this->getPeopleRelationship());

// Include characters
$relationships = array_merge($relationships, $this->getCharactersRelationship());

// Merge relationships with resource
$resource = array_merge($resource, ['relationships' => $relationships]);

return $resource;
return array_merge($resource, ['relationships' => $relationships]);
}

/**
* Returns the actors relationship for the resource.
* Returns the people relationship for the resource.
*
* @return array
*/
protected function getActorsRelationship(): array
protected function getPeopleRelationship(): array
{
/** @var AnimeCast $animeCast */
$animeCast = $this->resource;

return [
'actors' => [
'data' => ActorResource::collection([$animeCast->actor])
'people' => [
'data' => PersonResource::collection([$animeCast->person])
]
];
}
Expand Down
Loading