fix: Eager loads relation on non lazy mode

Author: Seb33300

src/Jobs/DataTableExportJob.php

@@ -10,6 +10,8 @@
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Http\File;
 use Illuminate\Queue\InteractsWithQueue;
@@ -112,19 +114,29 @@ public function handle(): void
 
         $writer->addRow(Row::fromValues($headers));
 
+        $query = $dataTable->getFilteredQuery();
+
+        if ($query instanceof Builder) {
+            $eagerLoads = array_keys($query->getEagerLoads());
+        }
+
         if ($this->usesLazyMethod()) {
             $chunkSize = 1_000;
             if (is_int(config('datatables-export.chunk'))) {
                 $chunkSize = config('datatables-export.chunk');
             }
-            $query = $dataTable->getFilteredQuery()->lazy($chunkSize);
+            $results = $query->lazy($chunkSize);
         } else {
-            $query = $dataTable->getFilteredQuery()->cursor();
+            $results = $query->cursor();
         }
 
-        foreach ($query as $row) {
+        foreach ($results as $row) {
             $cells = [];
 
+            if ($row instanceof Model && ! empty($eagerLoads)) {
+                $row->loadMissing($eagerLoads);
+            }
+
             $row = $row instanceof Arrayable ? $row->toArray() : (array) $row;
 
             $defaultDateFormat = 'yyyy-mm-dd';