From 32353eb658dca76a0c85e682d48f29c6b68e928c Mon Sep 17 00:00:00 2001 From: Irfan Date: Thu, 24 Feb 2022 04:02:04 +0500 Subject: [PATCH] minor changes --- app/Anime.php | 2 +- app/Http/Controllers/V4DB/SearchController.php | 13 ++++--------- .../QueryBuilder/ScoutSearchQueryBuilderAnime.php | 11 ++--------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/app/Anime.php b/app/Anime.php index 8c0f307..514bc5f 100644 --- a/app/Anime.php +++ b/app/Anime.php @@ -170,7 +170,7 @@ class Anime extends Model * * @return array */ - public function toSearchableArray() + public function toSearchableArray(): array { return [ 'mal_id' => $this->mal_id, diff --git a/app/Http/Controllers/V4DB/SearchController.php b/app/Http/Controllers/V4DB/SearchController.php index 2f93f23..fb1d74d 100644 --- a/app/Http/Controllers/V4DB/SearchController.php +++ b/app/Http/Controllers/V4DB/SearchController.php @@ -202,15 +202,10 @@ class SearchController extends Controller ); $results = $results - ->paginate($page); - -// $results = $results -// ->paginate( -// $limit, -// ['*'], -// null, -// $page -// ); + ->paginate( + $limit, + $page + ); return new AnimeCollection( $results diff --git a/app/Http/QueryBuilder/ScoutSearchQueryBuilderAnime.php b/app/Http/QueryBuilder/ScoutSearchQueryBuilderAnime.php index 065764b..358fa83 100644 --- a/app/Http/QueryBuilder/ScoutSearchQueryBuilderAnime.php +++ b/app/Http/QueryBuilder/ScoutSearchQueryBuilderAnime.php @@ -112,14 +112,7 @@ class ScoutSearchQueryBuilderAnime $startDate = $request->get('start_date'); $endDate = $request->get('end_date'); - if (!empty($query) && is_null($letter)) { - $results = Anime::search($query); - } - - if (!is_null($letter)) { - $results = $results - ->where('title', 'like', "{$letter}%"); - } + $results = Anime::search($query); if (empty($query) && is_null($orderBy)) { $results = $results @@ -257,7 +250,7 @@ class ScoutSearchQueryBuilderAnime ->orderBy($orderBy, $sort ?? 'asc'); } - return $results; + return $results->get(); } /**