Feat:return instance builder when eloquent filter is disable or reque…

…st is null
mehdi-fathi · Dec 15, 2022 · bc33c37 · bc33c37
1 parent 6177d05
commit bc33c37
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/src/QueryFilter/Core/FilterBuilder/QueryFilterBuilder.php b/src/QueryFilter/Core/FilterBuilder/QueryFilterBuilder.php
@@ -61,7 +61,7 @@ public function apply($builder, array $request = null, array $ignore_request = n
         }
 
         if (!config('eloquentFilter.enabled') || empty($this->requestFilter->getRequest())) {
-            return;
+            return $builder;
         }
 
         $this->requestHandel($ignore_request, $accept_request);

diff --git a/src/QueryFilter/Core/FilterBuilder/RequestFilter.php b/src/QueryFilter/Core/FilterBuilder/RequestFilter.php
@@ -31,7 +31,7 @@ class RequestFilter
     protected $ignore_request;
 
     /**
-     * @param $builder
+     * @param $request
      */
     public function __construct($request)
     {

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -57,7 +57,7 @@ private function mergeConfig()
      */
     private function registerBindings()
     {
-        if (config('eloquentFilter.enabled') != false) {
+        if (config('eloquentFilter.enabled')) {
             $this->app->singleton(
                 'eloquentFilter',
                 function () {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -3,6 +3,7 @@
 use eloquentFilter\QueryFilter\Core\FilterBuilder\QueryFilterBuilder;
 use eloquentFilter\QueryFilter\Factory\QueryFilterCoreFactory;
 use Mockery as m;
+use eloquentFilter\QueryFilter\Core\FilterBuilder\RequestFilter;
 
 /**
  * Class TestCase.
@@ -30,15 +31,15 @@ public function setUp(): void
 
         $this->config = require __DIR__ . '/../src/config/config.php';
 
-        if (config('eloquentFilter.enabled') != false) {
+        if (config('eloquentFilter.enabled')) {
 
             $this->app->singleton(
                 'eloquentFilter',
                 function () {
 
                     $queryFilterCoreFactory = new QueryFilterCoreFactory();
 
-                    $request = new \eloquentFilter\QueryFilter\Core\FilterBuilder\RequestFilter($this->request->query());
+                    $request = new RequestFilter($this->request->query());
 
                     $core = $queryFilterCoreFactory->createQueryFilterCoreBuilder();
 

diff --git a/tests/Tests/ModelFilterMockTest.php b/tests/Tests/ModelFilterMockTest.php
@@ -1261,6 +1261,31 @@ public function testFalseEnabledConfig()
         $this->assertNotEquals(['mehdifathi.developer@gmail.com'], $users->getBindings());
     }
 
+    public function testFalseEnabledConfigNotBreakQuery()
+    {
+        config(['eloquentFilter.enabled' => false]);
+
+        $builder = new User();
+
+        $builder = $builder->query()
+            ->where('email', 'mehdifathi.developer@gmail.com');
+
+        $this->request->shouldReceive('query')->andReturn(
+            [
+                'filter' => [
+                    'email' => 'new_memeber@gmail.com',
+                ],
+            ]
+        );
+
+        $users = User::filter($this->request->query())
+            ->where('email', 'mehdifathi.developer@gmail.com');
+
+        $this->assertSame($users->toSql(), $builder->toSql());
+
+        $this->assertEquals(['mehdifathi.developer@gmail.com'], $users->getBindings());
+    }
+
     public function testWhereBetweenWithRelation()
     {
         $builder = new User();