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

Merge pull request #470 from jikan-me/hotfix/469-season-endpoint

Browse Source 
🚑 Fixed missing items issue in seasons endpoint
This commit is contained in:
pushrbx 2024-01-20 20:14:45 +00:00 committed by GitHub
commit 68fbd0c2a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/Repositories/DefaultAnimeRepository.php
View File

@ -120,32 +120,34 @@ final class DefaultAnimeRepository extends DatabaseRepository implements AnimeRe
?string $premiered = null
): EloquentBuilder
{
// $queryable = $this->queryable(true)->whereBetween("aired.from", [
// $from->toAtomString(),
// $to->modify("last day of this month")->toAtomString()
// ]);
/** @noinspection PhpParamsInspection */
$queryable = $this->queryable(true);
if ($premiered !== null) {
$queryable = $queryable
->where("premiered", null)
->orWhere("premiered", $premiered);
}
$airedFilter = ["aired.from" => [
'$gte' => $from->toAtomString(),
'$lte' => $to->modify("last day of this month")->toAtomString()
]];
$queryable = $queryable
->whereRaw([
"aired.from" => [
'$gte' => $from->toAtomString(),
'$lte' => $to->modify("last day of this month")->toAtomString()
]
]);
$finalFilter = [];
if ($premiered !== null) {
$finalFilter['$or'] = [
["premiered" => $premiered],
[
"premiered" => null,
...$airedFilter
]
];
} else {
$finalFilter = array_merge($finalFilter, $airedFilter);
}
if (!is_null($type)) {
$queryable = $queryable->where("type", $type->label);
$finalFilter["type"] = $type->label;
}
$queryable = $queryable->whereRaw($finalFilter);
return $queryable->orderBy("members", "desc");
}