Skip to content

Commit

Permalink
Merge branch 'advanced-filters-post' of github.com:BinarCode/laravel-…
Browse files Browse the repository at this point in the history
…restify into advanced-filters-post
  • Loading branch information
binaryk committed Jul 2, 2024
2 parents f18acbe + e4ef33e commit f35c23c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 3 additions & 4 deletions src/Filters/AdvancedFiltersCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Binaryk\LaravelRestify\Filters;

use Binaryk\LaravelRestify\Http\Requests\RepositoryApplyFiltersRequest;
use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
use Binaryk\LaravelRestify\Repositories\Repository;
use Illuminate\Support\Collection;
Expand All @@ -17,12 +16,12 @@ class AdvancedFiltersCollection extends Collection
{
public function authorized(RestifyRequest $request): self
{
return $this->filter(fn(Filter $filter) => $filter->authorizedToSee($request))->values();
return $this->filter(fn (Filter $filter) => $filter->authorizedToSee($request))->values();
}

public function apply(RestifyRequest $request, $query): self
{
return $this->each(fn(AdvancedFilter $filter) => $filter->filter($request, $query, $filter->dataObject->value));
return $this->each(fn (AdvancedFilter $filter) => $filter->filter($request, $query, $filter->dataObject->value));
}

public static function collectQueryFilters(RestifyRequest $request, Repository $repository): self
Expand All @@ -36,7 +35,7 @@ public static function collectQueryFilters(RestifyRequest $request, Repository $
return static::make($filters)
->map(function (array $queryFilter) use ($allowedFilters, $request) {
/** * @var AdvancedFilter $advancedFilter */
$advancedFilter = $allowedFilters->first(fn(
$advancedFilter = $allowedFilters->first(fn (
AdvancedFilter $filter
) => $filter::uriKey() === data_get($queryFilter, 'key'));

Expand Down
6 changes: 3 additions & 3 deletions tests/Feature/Filters/AdvancedFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function test_filters_can_have_definition(): void
$this->getJson(PostRepository::route('filters', query: [
'only' => 'matches,searchables,sortables',
]))->assertJson(
fn(AssertableJson $json) => $json
fn (AssertableJson $json) => $json
->where('data.1.repository.key', 'users')
->where('data.1.repository.label', 'Users')
->where('data.1.repository.display_key', 'id')
Expand Down Expand Up @@ -73,7 +73,7 @@ public function test_value_filter_doesnt_require_value(): void
'filters' => $filters,
]))
->assertJson(
fn(AssertableJson $json) => $json
fn (AssertableJson $json) => $json
->where('data.0.attributes.title', $expectedTitle)
->etc()
)
Expand Down Expand Up @@ -197,7 +197,7 @@ public function test_the_timestamp_filter_is_applied(): void
]))
->assertOk()
->assertJson(
fn(AssertableJson $json) => $json
fn (AssertableJson $json) => $json
->where('data.0.attributes.title', 'Valid post')
->count('data', 1)
->etc()
Expand Down

0 comments on commit f35c23c

Please sign in to comment.