Fix having null as the filter query parameter name

Author: AlexVanderbist

tests/FilterTest.php

@@ -18,8 +18,8 @@
 
 it('can filter models by partial property by default', function () {
     $models = createQueryFromFilterRequest([
-            'name' => $this->models->first()->name,
-        ])
+        'name' => $this->models->first()->name,
+    ])
         ->allowedFilters('name')
         ->get();
 

tests/QueryBuilderEndpointTest.php

@@ -0,0 +1,23 @@
+<?php
+
+use Spatie\QueryBuilder\QueryBuilder;
+use Spatie\QueryBuilder\Tests\TestClasses\Models\TestModel;
+
+it('can instantiate the query builder and filter the query for an actual api request', function () {
+    TestModel::factory()->create();
+
+    config(['query-builder.parameters.filter' => null]);
+
+    Route::get('/test-request', function () {
+        return QueryBuilder::for(TestModel::class)
+            ->allowedIncludes(['group', 'incidents'])
+            ->allowedFilters(['name', 'status', 'enabled'])
+            ->allowedSorts(['name', 'order', 'id'])
+            ->simplePaginate(request('per_page', 15));
+    });
+
+    $response = $this->getJson('/test-request');
+
+    $response->assertOk();
+    $response->assertJsonCount(1, 'data');
+});

tests/QueryBuilderRequestTest.php

@@ -75,8 +75,6 @@
 });
 
 it('can get the sort query param from the request body', function () {
-    config(['query-builder.request_data_source' => 'body']);
-
     $request = new QueryBuilderRequest([], [
         'sort' => 'foobar',
     ], [], [], [], ['REQUEST_METHOD' => 'POST']);
@@ -135,8 +133,6 @@
 });
 
 it('can get the filter query params from the request body', function () {
-    config(['query-builder.request_data_source' => 'body']);
-
     $request = new QueryBuilderRequest([], [
             'filter' => [
                 'foo' => 'bar',
@@ -152,7 +148,7 @@
     expect($request->filters())->toEqual($expected);
 });
 
-it('can get different filter query parameter name', function () {
+it('can use different filter query parameter name', function () {
     config(['query-builder.parameters.filter' => 'filters']);
 
     $request = new QueryBuilderRequest([
@@ -170,6 +166,22 @@
     expect($request->filters())->toEqual($expected);
 });
 
+it('can use null as the filter query parameter name', function () {
+    config(['query-builder.parameters.filter' => null]);
+
+    $request = new QueryBuilderRequest([
+        'foo' => 'bar',
+        'baz' => 'qux,lex',
+    ]);
+
+    $expected = collect([
+        'foo' => 'bar',
+        'baz' => ['qux', 'lex'],
+    ]);
+
+    expect($request->filters())->toEqual($expected);
+});
+
 it('can get empty filters', function () {
     config(['query-builder.parameters.filter' => 'filters']);
 
@@ -264,8 +276,6 @@
 });
 
 it('can get the include from the request body', function () {
-    config(['query-builder.request_data_source' => 'body']);
-
     $request = new QueryBuilderRequest([], [
         'include' => 'foo,bar',
     ], [], [], [], ['REQUEST_METHOD' => 'POST']);
@@ -350,8 +360,6 @@
 });
 
 it('can get requested fields from the request body', function () {
-    config(['query-builder.request_data_source' => 'body']);
-
     $request = new QueryBuilderRequest([], [
         'fields' => [
             'table' => 'name,email',
@@ -408,8 +416,6 @@
 });
 
 it('can get the append query params from the request body', function () {
-    config(['query-builder.request_data_source' => 'body']);
-
     $request = new QueryBuilderRequest([], [
         'append' => 'foo,bar',
     ], [], [], [], ['REQUEST_METHOD' => 'POST']);