Fix queue export

Power-Components · Dec 23, 2024 · 0d6dee4 · 0d6dee4
1 parent 361a4fe
commit 0d6dee4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/DataSource/Builder.php b/src/DataSource/Builder.php
@@ -39,8 +39,9 @@ public static function make(
 
     public function filter(): EloquentBuilder|QueryBuilder
     {
+        // To make it work on export, we need to use ->filters instead of filters()
         $filters = collect(
-            app()->runningInConsole()
+            app()->runningInConsole() && !app()->runningUnitTests()
             ? $this->component->filters
             : $this->component->filters()
         );
@@ -227,7 +228,7 @@ private function filterNestedRelation(string $table, array $columns, string $sea
                         });
                     }
                 } catch (RelationNotFoundException $e) {
-                    $query->leftJoin($nestedTable, "$table.$nestedTable" . "_id", '=', "$nestedTable.id")
+                    $query->leftJoin($nestedTable, "$table.$nestedTable" . '_id', '=', "$nestedTable.id")
                         ->orWhere(function (EloquentBuilder $query) use ($nestedTable, $nestedColumns, $search) {
                             foreach ($nestedColumns as $nestedColumn) {
                                 $search = $this->getBeforeSearchMethod($nestedColumn, $search);