Dispatch job from batches

Author: kevinmeijer97

src/Actions/WarmUrls.php

@@ -2,6 +2,7 @@
 
 namespace JustBetter\StaticCacheWarmer\Actions;
 
+use Illuminate\Support\Facades\Bus;
 use JustBetter\StaticCacheWarmer\Contracts\WarmsUrls;
 use JustBetter\StaticCacheWarmer\Jobs\WarmUrlJob;
 use Statamic\Eloquent\Entries\EntryQueryBuilder;
@@ -16,8 +17,13 @@ public function warm(): void
 
         $entries = $query->whereNotNull('uri')->lazy();
 
+        $jobs = [];
         foreach ($entries as $entry) {
-            WarmUrlJob::dispatch($entry->absoluteUrl());
+            $jobs[] = new WarmUrlJob($entry->absoluteUrl());
+        }
+
+        if (! empty($jobs)) {
+            Bus::batch($jobs)->dispatchAfterResponse();
         }
     }
 

src/Jobs/WarmUrlJob.php

@@ -2,14 +2,15 @@
 
 namespace JustBetter\StaticCacheWarmer\Jobs;
 
+use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use JustBetter\StaticCacheWarmer\Contracts\WarmsUrl;
 
 class WarmUrlJob implements ShouldBeUnique, ShouldQueue
 {
-    use Queueable;
+    use Batchable, Queueable;
 
     public function __construct(protected string $url)
     {

tests/Actions/WarmUrlsTest.php

@@ -14,7 +14,7 @@
 class WarmUrlsTest extends TestCase
 {
     #[Test]
-    public function it_can_dispatch_jobs(): void
+    public function it_can_dispatch_jobs_in_batch(): void
     {
         Bus::fake();
 
@@ -34,6 +34,9 @@ public function it_can_dispatch_jobs(): void
 
         $action->warm();
 
-        Bus::assertDispatched(WarmUrlJob::class);
+        Bus::assertBatched(function ($batch) {
+            return $batch->jobs->count() > 0
+                && $batch->jobs->first() instanceof WarmUrlJob;
+        });
     }
 }