From 858c4c38a9ee2d7edb460b325e75502aaf33ad97 Mon Sep 17 00:00:00 2001
From: Arthur Kirkosa <arthur.kirkosa@me.com>
Date: Wed, 26 May 2021 18:23:56 +0300
Subject: [PATCH 1/2] Make sure Advanced Filters are picked up

---
 src/Filters/AdvancedFiltersCollection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Filters/AdvancedFiltersCollection.php b/src/Filters/AdvancedFiltersCollection.php
index 46782de8b..12036957d 100644
--- a/src/Filters/AdvancedFiltersCollection.php
+++ b/src/Filters/AdvancedFiltersCollection.php
@@ -20,7 +20,7 @@ public function apply(RestifyRequest $request, $query): self
 
     public static function collectQueryFilters(RestifyRequest $request, Repository $repository): self
     {
-        $filters = json_decode(base64_decode($request->query('filters')), true);
+        $filters = json_decode(base64_decode($request->input('filters')), true);
 
         $allowedFilters = $repository->collectAdvancedFilters($request);
 

From f5155fe50447e2e0dad25b427b9f26ded5396793 Mon Sep 17 00:00:00 2001
From: arthurkirkosa <arthurkirkosa@users.noreply.github.com>
Date: Wed, 26 May 2021 15:24:43 +0000
Subject: [PATCH 2/2] Fix styling

---
 src/Repositories/ValidatingTrait.php | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Repositories/ValidatingTrait.php b/src/Repositories/ValidatingTrait.php
index 7dd44e91a..b63a504da 100644
--- a/src/Repositories/ValidatingTrait.php
+++ b/src/Repositories/ValidatingTrait.php
@@ -44,9 +44,9 @@ public static function validatorForStoring(RestifyRequest $request, array $plain
             $on->getStoringRules($request),
             $messages
         )->after(function ($validator) use ($request) {
-                static::afterValidation($request, $validator);
-                static::afterStoringValidation($request, $validator);
-            });
+            static::afterValidation($request, $validator);
+            static::afterStoringValidation($request, $validator);
+        });
     }
 
     public static function validatorForStoringBulk(RestifyRequest $request, array $plainPayload = null)
@@ -67,9 +67,9 @@ public static function validatorForStoringBulk(RestifyRequest $request, array $p
             $on->getStoringBulkRules($request),
             $messages
         )->after(function ($validator) use ($request) {
-                static::afterValidation($request, $validator);
-                static::afterStoringBulkValidation($request, $validator);
-            });
+            static::afterValidation($request, $validator);
+            static::afterStoringBulkValidation($request, $validator);
+        });
     }
 
     /**
@@ -101,9 +101,9 @@ public static function validatorForUpdate(RestifyRequest $request, $resource = n
             $on->getUpdatingRules($request),
             $messages
         )->after(function ($validator) use ($request) {
-                static::afterValidation($request, $validator);
-                static::afterUpdatingValidation($request, $validator);
-            });
+            static::afterValidation($request, $validator);
+            static::afterUpdatingValidation($request, $validator);
+        });
     }
 
     public static function validatorForPatch(RestifyRequest $request, $resource = null, array $plainPayload = null)
@@ -127,9 +127,9 @@ public static function validatorForPatch(RestifyRequest $request, $resource = nu
             collect($on->getUpdatingRules($request))->intersectByKeys($request->json())->all(),
             $messages
         )->after(function ($validator) use ($request) {
-                static::afterValidation($request, $validator);
-                static::afterUpdatingValidation($request, $validator);
-            });
+            static::afterValidation($request, $validator);
+            static::afterUpdatingValidation($request, $validator);
+        });
     }
 
     public static function validatorForAttach(RestifyRequest $request, $resource = null, array $plainPayload = null)
@@ -179,9 +179,9 @@ public static function validatorForUpdateBulk(RestifyRequest $request, $resource
             $on->getUpdatingBulkRules($request),
             $messages
         )->after(function ($validator) use ($request) {
-                static::afterValidation($request, $validator);
-                static::afterUpdatingBulkValidation($request, $validator);
-            });
+            static::afterValidation($request, $validator);
+            static::afterUpdatingBulkValidation($request, $validator);
+        });
     }
 
     /**