query filter withour array key avoid collision

Author: iqbalatma

src/Traits/QueryFilter.php

@@ -132,26 +132,49 @@ private function filterRelationModel(): void
      */
     private function defaultFilterableColumn(): self
     {
-        $this->builder->when(!empty(request()?->query("created_at")[0]), function (Builder $query) {
+        if ($filterKey = config('queryextend.filter_query_param_root')) {
+            $requestCreatedStartFilter = empty(request()->query()[$filterKey]["created_at"][0]);
+            $requestCreatedEndFilter = empty(request()->query()[$filterKey]["created_at"][1]);
+        } else {
+            $requestCreatedStartFilter = empty(request()->query("filter_created_at")[0]);
+            $requestCreatedEndFilter = empty(request()->query("filter_created_at")[1]);
+        }
+
+        $this->builder->when(!$requestCreatedStartFilter, function (Builder $query) use ($filterKey) {
             try {
-                $date = Carbon::createFromFormat('Y-m-d', request()?->query("created_at")[0]);
+                $date = Carbon::createFromFormat('Y-m-d', $filterKey ?
+                    request()->query()[$filterKey]["created_at"][0] :
+                    request()->query("filter_created_at")[0]
+                );
             } catch (\Exception $e) {
-                throw ValidationException::withMessages(['created_at.0' => 'Date format should be yyyy-mm-dd']);
+                if ($filterKey) {
+                    throw ValidationException::withMessages(["$filterKey.created_at.0" => 'Date format should be yyyy-mm-dd']);
+                } else {
+                    throw ValidationException::withMessages(["filter_created_at.0" => 'Date format should be yyyy-mm-dd']);
+                }
             }
 
             $query->where("created_at", ">=", $date->startOfDay());
         });
 
-        $this->builder->when(!empty(request()?->query("created_at")[1]), function (Builder $query) {
+        $this->builder->when(!$requestCreatedEndFilter, function (Builder $query) use ($filterKey) {
             try {
-                $date = Carbon::createFromFormat('Y-m-d', request()?->query("created_at")[1]);
+                $date = Carbon::createFromFormat('Y-m-d', $filterKey ?
+                    request()->query()[$filterKey]["created_at"][1] :
+                    request()->query("filter_created_at")[1]
+                );
             } catch (\Exception $e) {
-                throw ValidationException::withMessages(['created_at.1' => 'Date format should be yyyy-mm-dd']);
+                if ($filterKey) {
+                    throw ValidationException::withMessages(["$filterKey.created_at.1" => 'Date format should be yyyy-mm-dd']);
+                } else {
+                    throw ValidationException::withMessages(["filter_created_at.1" => 'Date format should be yyyy-mm-dd']);
+                }
             }
 
             $query->where("created_at", "<=", $date->endOfDay());
         });
 
+
         return $this;
     }
 

src/Traits/QueryOrder.php

@@ -45,8 +45,22 @@ public function _orderColumn(array|string|null $orderableColumns = null, string
      */
     private function defaultOrderColumn(): void
     {
-        $this->builder->when(!empty(request()->query("order_created_at")), function (Builder $query) {
-            $query->orderBy("created_at", request()->query("order_created_at"));
+        if ($orderKey = config('queryextend.order_query_param_root')) {
+            $requestCreatedOrder = empty(request()->query()[$orderKey]["created_at"]);
+        } else {
+            $requestCreatedOrder = empty(request()->query("order_created_at"));
+        }
+
+        $this->builder->when(!$requestCreatedOrder, function (Builder $query) use ($orderKey) {
+            $direction = $orderKey ?
+                request()->query()[$orderKey]["created_at"] :
+                request()->query("order_created_at");
+
+            $direction = strtolower($direction);
+
+            if ($direction === "asc" || $direction === "desc") {
+                $query->orderBy("created_at", $direction);
+            }
         });
     }