Merge pull request #10 from throwexceptions/master

Enhancement: Passing attributes with self::class

Author: yajra

src/Jobs/DataTableExportJob.php

@@ -16,21 +16,28 @@
 
 class DataTableExportJob implements ShouldQueue, ShouldBeUnique
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
     use Batchable;
 
     private string $dataTable;
+    private array $attributes;
     private array $request;
     private $user;
 
     /**
      * Create a new job instance.
      *
-     * @return void
+     * @param  array  $dataTable
+     * @param  array  $request
+     * @param  null  $user
      */
-    public function __construct(string $dataTable, array $request, $user = null)
+    public function __construct(array $dataTable, array $request, $user = null)
     {
-        $this->dataTable = $dataTable;
+        $this->dataTable = $dataTable[0];
+        $this->attributes = $dataTable[1];
         $this->request = $request;
         $this->user = $user;
     }
@@ -50,7 +57,7 @@ public function handle()
         $oTable = resolve($this->dataTable);
         request()->merge($this->request);
 
-        $query = app()->call([$oTable, 'query']);
+        $query = app()->call([$oTable->with($this->attributes), 'query']);
 
         /** @var \Yajra\DataTables\QueryDataTable $dataTable */
         $dataTable = app()->call([$oTable, 'dataTable'], compact('query'));

src/WithExportQueue.php

@@ -15,7 +15,7 @@ trait WithExportQueue
      * @param  array  $mergeData
      * @return mixed
      */
-    public function render($view, $data = [], $mergeData = [])
+    public function render(string $view, array $data = [], array $mergeData = [])
     {
         if (! $this->request()->wantsJson() && $this->request()->get('action') == 'exportQueue') {
             return $this->exportQueue();
@@ -25,12 +25,18 @@ public function render($view, $data = [], $mergeData = [])
     }
 
     /**
+     * Create and run batch job.
+     *
      * @throws \Throwable
      */
     public function exportQueue(): string
     {
         $batch = Bus::batch([
-            new DataTableExportJob(self::class, $this->request->all(), optional($this->request->user())->id),
+            new DataTableExportJob(
+                [self::class, $this->attributes],
+                $this->request->all(),
+                optional($this->request->user())->id
+            ),
         ])->name('datatables-export')->dispatch();
 
         return $batch->id;