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

fixes order_by not working when a query is passed via typesense

Browse Source
This commit is contained in:
Irfan 2023-04-23 10:27:33 +05:00 committed by pushrbx
parent 2b67dc0d26
commit 55229901ab
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Features/SearchRequestHandler.php
View File

@ -48,12 +48,18 @@ abstract class SearchRequestHandler implements RequestHandler
protected function prepareOrderByParam(Collection $requestData): Collection
{
if ($requestData->has("order_by") && $requestData->get("order_by") instanceof Enum) {
$requestData->offsetSet("order_by", $requestData->get("order_by")->label);
} else {
$requestData->offsetSet("order_by", 'mal_id');
if (!$requestData->has('order_by') || !$requestData->get('order_by') instanceof Enum) {
$requestData->offsetSet('order_by', 'mal_id');
return $requestData;
}
if ($requestData->has('order_by') && $requestData->has('q')) {
$requestData->offsetSet("order_by", $requestData->get("order_by")->label);
return $requestData;
}
$requestData->offsetSet("order_by", 'mal_id');
return $requestData;
}
}

5
app/Services/TypeSenseScoutSearchService.php
View File

@ -65,6 +65,11 @@ class TypeSenseScoutSearchService implements ScoutSearchService
$options['sort_by'] = "_text_match:desc,$orderByField:" . ($sortDirectionDescending ? "desc" : "asc");
}
// if order_by is a user supplied value make it a priority over _text_match
if ($orderByField !== 'members' && !is_null($orderByField)) {
$options['sort_by'] = "$orderByField:" . ($sortDirectionDescending ? "desc" : "asc") . ",_text_match:desc";
}
// override overall sorting direction
if (is_null($orderByField) && $sortDirectionDescending && array_key_exists("sort_by", $options) && Str::contains($options["sort_by"], "asc")) {
$options["sort_by"] = Str::replace("asc", "desc", $options["sort_by"]);