malhuda/jikan-rest
1
0
Fork 0
mirror of https://github.com/jikan-me/jikan-rest.git synced 2025-02-20 11:23:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

review: changes

Browse Source
This commit is contained in:
Irfan 2023-10-24 09:27:35 +05:00
parent 8d67c115d7
commit 657510bf9f
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Contracts/AnimeRepository.php
View File

@ -43,8 +43,7 @@ interface AnimeRepository extends Repository
Carbon $from,
Carbon $to,
?AnimeTypeEnum $type = null,
?AnimeSeasonEnum $season = null,
?int $year = null
?string $premiered = null
): EloquentBuilder;
public function getUpcomingSeasonItems(?AnimeTypeEnum $type = null): EloquentBuilder;

2
app/Features/QueryAnimeSeasonHandlerBase.php
View File

@ -51,7 +51,7 @@ abstract class QueryAnimeSeasonHandlerBase implements RequestHandler
* @param ?AnimeTypeEnum $type
* @return Builder
*/
protected abstract function getSeasonItems($request, ?AnimeTypeEnum $type, ?AnimeSeasonEnum $season, ?int $year): Builder;
protected abstract function getSeasonItems($request, ?AnimeTypeEnum $type): Builder;
protected function getSeasonRange(int $year, AnimeSeasonEnum $season): array
{

6
app/Features/QueryCurrentAnimeSeasonHandler.php
View File

@ -44,7 +44,7 @@ final class QueryCurrentAnimeSeasonHandler extends QueryAnimeSeasonHandlerBase
/**
* @throws Exception
*/
protected function getSeasonItems($request, ?AnimeTypeEnum $type, ?AnimeSeasonEnum $season, ?int $year): Builder
protected function getSeasonItems($request, ?AnimeTypeEnum $type): Builder
{
[$season, $year] = $this->getCurrentSeason();
/**
@ -52,6 +52,8 @@ final class QueryCurrentAnimeSeasonHandler extends QueryAnimeSeasonHandlerBase
* @var Carbon $to
*/
[$from, $to] = $this->getSeasonRange($year, $season);
return $this->repository->getAiredBetween($from, $to, $type, $season, $year);
$premiered = ucfirst($season)." {$year}";
return $this->repository->getAiredBetween($from, $to, $type, $premiered);
}
}

5
app/Features/QuerySpecificAnimeSeasonHandler.php
View File

@ -19,7 +19,7 @@ final class QuerySpecificAnimeSeasonHandler extends QueryAnimeSeasonHandlerBase
return QuerySpecificAnimeSeasonCommand::class;
}
protected function getSeasonItems($request, ?AnimeTypeEnum $type, ?AnimeSeasonEnum $season, ?int $year): Builder
protected function getSeasonItems($request, ?AnimeTypeEnum $type): Builder
{
/**
* @var Carbon $from
@ -27,8 +27,9 @@ final class QuerySpecificAnimeSeasonHandler extends QueryAnimeSeasonHandlerBase
*/
[$from, $to] = $this->getSeasonRange($request->year, $request->season);
$premiered = ucfirst($request->season)." {$request->year}";
return $this->repository->getAiredBetween($from, $to, $type, $request->season, $request->year);
return $this->repository->getAiredBetween($from, $to, $type, $premiered);
// ->where("status", "!=", AnimeStatusEnum::upcoming()->label);
}
}

2
app/Features/QueryUpcomingAnimeSeasonHandler.php
View File

@ -17,7 +17,7 @@ final class QueryUpcomingAnimeSeasonHandler extends QueryAnimeSeasonHandlerBase
return QueryUpcomingAnimeSeasonCommand::class;
}
protected function getSeasonItems($request, ?AnimeTypeEnum $type, ?AnimeSeasonEnum $season, ?int $year): Builder
protected function getSeasonItems($request, ?AnimeTypeEnum $type): Builder
{
return $this->repository->getUpcomingSeasonItems($type);
}

9
app/Repositories/DefaultAnimeRepository.php
View File

@ -117,8 +117,7 @@ final class DefaultAnimeRepository extends DatabaseRepository implements AnimeRe
Carbon $from,
Carbon $to,
?AnimeTypeEnum $type = null,
?AnimeSeasonEnum $season = null,
?int $year = null
?string $premiered = null
): EloquentBuilder
{
// $queryable = $this->queryable(true)->whereBetween("aired.from", [
@ -129,8 +128,7 @@ final class DefaultAnimeRepository extends DatabaseRepository implements AnimeRe
/** @noinspection PhpParamsInspection */
$queryable = $this->queryable(true);
if (!is_null($season) && !is_null($year)) {
$premiered = ucfirst($season)." {$year}";
if ($premiered !== null) {
$queryable = $this->queryable()
->where("premiered", null)
->orWhere("premiered", $premiered);
@ -152,8 +150,7 @@ final class DefaultAnimeRepository extends DatabaseRepository implements AnimeRe
}
public function getUpcomingSeasonItems(
?AnimeTypeEnum $type = null,
?AnimeSeasonEnum $specificSeason = null
?AnimeTypeEnum $type = null
): EloquentBuilder
{
$queryable = $this->queryable(true)->where("status", AnimeStatusEnum::upcoming()->label);