Merge pull request #99 from crynobone/queued-export

Allow QueuedExport to serialize query builder (to array) using laravie/serializes-queries

composer.json

@@ -19,6 +19,7 @@
   "require": {
     "php": ">=7.1.0",
     "laravel/nova": "*",
+    "laravie/serialize-queries": "^0.2",
     "maatwebsite/excel": "^3.1"
   },
   "autoload": {

src/Actions/QueuedExport.php

@@ -3,12 +3,11 @@
 namespace Maatwebsite\LaravelNovaExcel\Actions;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Laravel\Nova\Nova;
+use Laravie\SerializesQuery\Eloquent;
 use Maatwebsite\LaravelNovaExcel\Requests\SerializedRequest;
 
-/**
- * @deprecated It's currently impossible to queue an export based on dynamic filters due to serialization issues of the query.
- */
 class QueuedExport extends ExportToExcel implements ShouldQueue
 {
     /**
@@ -25,7 +24,11 @@ public function __sleep()
             $this->request = SerializedRequest::serialize($this->request);
         }
 
-        return ['headings', 'except', 'only', 'onlyIndexFields', 'request', 'resource'];
+        if ($this->query instanceof QueryBuilder) {
+            $this->query = Eloquent::serialize($this->query);
+        }
+
+        return ['headings', 'except', 'only', 'onlyIndexFields', 'request', 'resource', 'query'];
     }
 
     /**
@@ -37,6 +40,10 @@ public function __wakeup()
             $this->request = $this->request->unserialize();
         }
 
+        if (is_array($this->query)) {
+            $this->query = Eloquent::unserialize($this->query);
+        }
+
         // Reload Nova resources
         Nova::resourcesIn(app_path('Nova'));
     }