Skip to content

Commit 883d60b

Browse files
authored
fix: Fixing query matches. (#439)
1 parent 7534c1d commit 883d60b

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

config/config.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@
116116
'related' => \Binaryk\LaravelRestify\Repositories\Casts\RelatedCast::class,
117117
],
118118

119+
'search' => [
120+
/*
121+
| Allow Restify to check the post payload in order to receive matchable filters.
122+
*/
123+
'matchable_using_post_payload' => true,
124+
],
125+
119126
/*
120127
|--------------------------------------------------------------------------
121128
| Restify Logs

src/Filters/MatchesCollection.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public function inQuery(RestifyRequest $request): self
5050
{
5151
return $this->filter(function (MatchFilter $filter) use ($request) {
5252
$possibleKeys = collect([
53-
$filter->getColumn(),
54-
"-{$filter->getColumn()}",
53+
$filter->column(),
54+
"-{$filter->column()}",
5555
]);
5656

5757
if ($filters = collect($request->input('filter', []))) {
@@ -60,7 +60,12 @@ public function inQuery(RestifyRequest $request): self
6060
}
6161
}
6262

63-
return $request->has("-{$filter->getColumn()}") || $request->has($filter->getColumn());
63+
if (! config('restify.search.matchable_using_post_payload')) {
64+
return (bool) ($request->query("-{$filter->column()}") || $request->query($filter->column()));
65+
}
66+
67+
68+
return $request->has("-{$filter->column()}") || $request->has($filter->column());
6469
});
6570
}
6671

src/Http/Requests/ActionRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function builder(Action $action, int $size): Builder
4545
->latest($this->model()->getKeyName());
4646
}
4747

48-
public function collectRepositories(Action $action, $count, Closure $callback)
48+
public function collectRepositories(Action $action, $count, Closure $callback): array
4949
{
5050
$output = [];
5151

0 commit comments

Comments
 (0)