Job Simplification

Author: gitananun

app/Events/StatisticRequestedEvent.php

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Services\StatisticService;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\App;
 use App\Jobs\ProcessStatisticReport;
 use App\Http\Resources\PaginatorResource;
 use App\Http\Resources\StatisticResource;
@@ -14,17 +12,11 @@ class StatisticController extends Controller
     public function __construct(private StatisticService $statisticService)
     {}
 
-    private function makeReport(Collection $statistic)
-    {
-        return App::make('\Barryvdh\DomPDF\PDF')->loadView('statistic.report', ['stats' => $statistic]);
-    }
-
     public function index()
     {
-        ProcessStatisticReport::dispatchAfterResponse(
-            $statistic = $this->statisticService->index(request()->type),
-            $this->makeReport($statistic->getCollection())->download()
-        );
+        $statistic = $this->statisticService->index(request()->type);
+
+        ProcessStatisticReport::dispatchAfterResponse($statistic);
 
         return response()->success(new PaginatorResource(StatisticResource::class, $statistic));
     }

app/Http/Controllers/StatisticController.php

@@ -2,33 +2,35 @@
 
 namespace App\Jobs;
 
+use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Support\Facades\App;
 use Illuminate\Queue\SerializesModels;
-use App\Events\StatisticRequestedEvent;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Pagination\LengthAwarePaginator;
+use App\Notifications\Statistic\StatisticReported;
 
 class ProcessStatisticReport implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(protected LengthAwarePaginator $statistic, protected mixed $report)
+    public function __construct(protected LengthAwarePaginator $statistic)
     {}
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
+    private function makeReport(Collection $statistic)
+    {
+        return App::make('\Barryvdh\DomPDF\PDF')->loadView('statistic.report', ['stats' => $statistic]);
+    }
+
     public function handle()
     {
-        event(new StatisticRequestedEvent($this->statistic, $this->report));
+        User::auth()->notify(new StatisticReported(
+            $this->statistic,
+            $this->makeReport($this->statistic->getCollection())->download()
+        ));
     }
+
 }

app/Jobs/ProcessStatisticReport.php

@@ -11,8 +11,6 @@
 use App\Observers\CourseObserver;
 use App\Observers\CategoryObserver;
 use Illuminate\Auth\Events\Registered;
-use App\Events\StatisticRequestedEvent;
-use App\Listeners\SendStatisticReportListener;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
@@ -27,9 +25,6 @@ class EventServiceProvider extends ServiceProvider
         Registered::class => [
             SendEmailVerificationNotification::class,
         ],
-        StatisticRequestedEvent::class => [
-            SendStatisticReportListener::class,
-        ],
     ];
 
     /**

app/Listeners/SendStatisticReportListener.php

@@ -4,7 +4,7 @@
     <table class="pure-table pure-table-bordered">
         <thead>
             <tr>
-                <th>#</th>
+                <th>ID</th>
                 <th>Type</th>
                 <th>Record</th>
                 <th>Statisticable</th>