Skip to content

Fix desc order in paginate. #285

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix desc order in paginate. #285

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
751fe5c
Fix desc order in paginate.
MostafaRabia Sep 3, 2020
84dea6d
Update TNTSearchEngine.php
MostafaRabia Sep 12, 2020
cf3b488
Faced problem in laravel 8 while order pagination
MostafaRabia Sep 17, 2020
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
33 changes: 16 additions & 17 deletions src/Engines/TNTSearchEngine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,20 @@ public function paginate(Builder $builder, $perPage, $page)

$results['hits'] = $filtered->count();

$chunks = array_chunk($filtered->toArray(), $perPage);
/*$chunks = array_chunk($filtered->toArray(), $perPage);

if (empty($chunks)) {
return $results;
}
}*/

if (array_key_exists($page - 1, $chunks)) {
/*if (array_key_exists($page - 1, $chunks)) {
$results['ids'] = $chunks[$page - 1];
} else {
$results['ids'] = [];
}
}*/

$results['per_page'] = $perPage;
$results['page'] = $page;

return $results;
}
Expand Down Expand Up @@ -195,21 +198,17 @@ public function map(Builder $builder, $results, $model)
call_user_func($this->builder->queryCallback, $builder);
}

$models = $builder->whereIn(
$model->getQualifiedKeyName(), $keys
)->get()->keyBy($model->getKeyName());

// sort models by user choice
if (!empty($this->builder->orders)) {
return $models->values();
if (array_key_exists('per_page',$results)){
$models = $builder->whereIn(
$model->getQualifiedKeyName(), $keys
)->paginate($results['per_page'],['*'],'page',$results['page']);
}else{
$models = $builder->whereIn(
$model->getQualifiedKeyName(), $keys
)->get();
}

// sort models by tnt search result set
return $model->newCollection($results['ids'])->map(function ($hit) use ($models) {
if (isset($models[$hit])) {
return $models[$hit];
}
})->filter()->values();
return $models;
}

/**
Expand Down