Merge pull request #11 from ghonijee/development

Fixing bug filter nested relation field

Author: ghonijee

.github/workflows/main.yml

@@ -33,10 +33,10 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
         steps:
-            - name: Verify MySQL connection from host
-              run: |
-                    sudo apt-get install -y mysql-client
-                    mysql --host 127.0.0.1 --port 33306 -uroot -ppassword -e "SHOW DATABASES"
+            # - name: Verify MySQL connection from host
+            #   run: |
+            #         sudo apt-get install -y mysql-client
+            #         mysql --host 127.0.0.1 --port 33306 -uroot -ppassword -e "SHOW DATABASES"
 
             - name: Checkout code
               uses: actions/checkout@v2

CHANGELOG.md

@@ -17,4 +17,9 @@ All notable changes to `QueryAdapter` will be documented in this file
 
 ## 1.0.5-Beta - 2021-11-04
 
-- Bug Fixed sorted by relation data
+- Bug Fixed sorted by relation data
+
+## 1.0.7-Beta - 2022-02-03
+
+- Fixing bug filter deep relation model
+- Remove Add Day on Filter Date

src/Builders/FilterQuery.php

@@ -72,10 +72,12 @@ private function isRelationFilter(Builder $query, FilterData $item)
             return false;
         }
 
-        if (!method_exists($query->getModel(), $item->relationMethod)) {
+        $firstRelationship = explode('.', $item->relationMethod)[0];
+
+        if (!method_exists($query->getModel(), $firstRelationship)) {
             return false;
         }
 
-        return is_a($query->getModel()->{$item->relationMethod}(), Relation::class);
+        return is_a($query->getModel()->{$firstRelationship}(), Relation::class);
     }
 }

src/FilterClass/QueryClass/DateFilter.php

@@ -48,16 +48,16 @@ protected function notCondition()
                 $this->query->where($this->filterData->field, '!=', $this->filterData->value);
                 break;
             case '<':
-                $this->query->whereDate($this->filterData->field, '>', Carbon::parse($this->filterData->value)->addDay());
+                $this->query->whereDate($this->filterData->field, '>', Carbon::parse($this->filterData->value));
                 break;
             case '<=':
-                $this->query->whereDate($this->filterData->field, '>=', Carbon::parse($this->filterData->value)->addDay());
+                $this->query->whereDate($this->filterData->field, '>=', Carbon::parse($this->filterData->value));
                 break;
             case '>':
-                $this->query->whereDate($this->filterData->field, '<', Carbon::parse($this->filterData->value)->addDay());
+                $this->query->whereDate($this->filterData->field, '<', Carbon::parse($this->filterData->value));
                 break;
             case '>=':
-                $this->query->whereDate($this->filterData->field, '<=', Carbon::parse($this->filterData->value)->addDay());
+                $this->query->whereDate($this->filterData->field, '<=', Carbon::parse($this->filterData->value));
                 break;
             default:
                 throw new Exception("Error Processing Request");
@@ -71,7 +71,7 @@ protected function orCondition()
                 $this->query->orWhere($this->filterData->field, '=', $this->filterData->value);
                 break;
             default:
-                $this->query->orWhereDate($this->filterData->field, $this->filterData->condition, Carbon::parse($this->filterData->value)->addDay());
+                $this->query->orWhereDate($this->filterData->field, $this->filterData->condition, Carbon::parse($this->filterData->value));
                 break;
         }
     }
@@ -83,7 +83,7 @@ protected function andCondition()
                 $this->query->where($this->filterData->field, '=', $this->filterData->value);
                 break;
             default:
-                $this->query->whereDate($this->filterData->field, $this->filterData->condition, Carbon::parse($this->filterData->value)->addDay());
+                $this->query->whereDate($this->filterData->field, $this->filterData->condition, Carbon::parse($this->filterData->value));
                 break;
         }
     }

tests/Feature/FilterTest.php

@@ -4,6 +4,7 @@
 use GhoniJee\DxAdapter\Models\TestComment;
 use GhoniJee\DxAdapter\Models\TestModel;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 
 beforeEach(function () {
     $this->request = new Request();
@@ -119,6 +120,32 @@
     expect($query)->toEqual($queryExpectation);
 });
 
+test('can filter date data with contion <', function () {
+    $dateFilter = now()->addDays(1)->setTime(0, 0, 0)->format('Y-m-d H:i:s');
+    $filter = ['created_at', '<', $dateFilter]; //->format('Y-m-d H:i:s')
+
+    $this->request->replace(['filter' => $filter]);
+
+    $query = DxAdapter::load(TestModel::query(), $this->request)->get();
+    $queryExpectation = TestModel::whereDate('created_at', '<', $dateFilter)->get();
+
+    expect($query)->toEqual($queryExpectation);
+    expect($query->count())->toEqual($queryExpectation->count());
+});
+
+test('can filter date data with contion <=', function () {
+    $dateFilter = now()->addDays(1)->format('Y-m-d');
+    $filter = ['created_at', '<=', $dateFilter];
+
+    $this->request->replace(['filter' => $filter]);
+
+    $query = DxAdapter::load(TestModel::query(), $this->request)->get();
+    $queryExpectation = TestModel::whereDate('created_at', '<=', $dateFilter)->get();
+
+    expect($query)->toEqual($queryExpectation);
+    expect($query->count())->toEqual($queryExpectation->count());
+});
+
 test('can filter boolean data', function () {
     $filter = ['active', '=', true];
 

tests/TestCase.php

@@ -79,21 +79,24 @@ protected function createTestModel()
                 'last_name' => "Yunus",
                 'address' => "Jl. Pendidikan",
                 'gender' => "L",
-                'active' => true
+                'active' => true,
+                'created_at' => now()->addDays(2)
             ],
             [
                 'name' => "Ahmad",
                 'last_name' => "Ghoni",
                 'address' => "Jl. Pendidikan 2",
                 'gender' => "L",
-                'active' => false
+                'active' => false,
+                'created_at' => now()->addDays(1)
             ],
             [
                 'name' => "Yunus",
                 'last_name' => "Ghoni",
                 'address' => "Jl. Pendidikan 3",
                 'gender' => "L",
-                'active' => false
+                'active' => false,
+                'created_at' => now()
             ]
         ];