Merge pull request #1010 from bambamboole/feat/allow-filters-as-array

Allow nested filters

Author: freekmurze

src/Concerns/FiltersQuery.php

@@ -14,7 +14,7 @@ public function allowedFilters($filters): static
     {
         $filters = is_array($filters) ? $filters : func_get_args();
 
-        $this->allowedFilters = collect($filters)->map(function ($filter) {
+        $this->allowedFilters = collect($filters)->flatten(1)->map(function ($filter) {
             if ($filter instanceof AllowedFilter) {
                 return $filter;
             }

tests/FilterTest.php

@@ -479,6 +479,20 @@ public function __invoke(Builder $query, $value, string $property): Builder
     expect($results->pluck('id')->all())->toEqual([$model1->id, $model2->id]);
 });
 
+it('can allow multiple filters as nested array', function () {
+    $model1 = TestModel::create(['name' => 'abcdef']);
+    $model2 = TestModel::create(['name' => 'abcdef']);
+
+    $results = createQueryFromFilterRequest([
+        'name' => 'abc',
+    ])
+        ->allowedFilters([['name'], [AllowedFilter::exact('id')]])
+        ->get();
+
+    expect($results)->toHaveCount(2);
+    expect($results->pluck('id')->all())->toEqual([$model1->id, $model2->id]);
+});
+
 it('can filter by multiple filters', function () {
     $model1 = TestModel::create(['name' => 'abcdef']);
     $model2 = TestModel::create(['name' => 'abcdef']);