Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dispatch HealthQueueJob for multiple checks #166

Merged
merged 1 commit into from
Feb 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Commands/DispatchQueueCheckJobsCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ class DispatchQueueCheckJobsCommand extends Command
public function handle(): int
{
/** @var QueueCheck|null $queueCheck */
$queueCheck = Health::registeredChecks()->first(
$queueChecks = Health::registeredChecks()->filter(
fn (Check $check) => $check instanceof QueueCheck
);

foreach ($queueCheck->getQueues() as $queue) {
HealthQueueJob::dispatch($queueCheck)->onQueue($queue);
foreach ($queueChecks as $queueCheck) {
foreach ($queueCheck->getQueues() as $queue) {
HealthQueueJob::dispatch($queueCheck)->onQueue($queue);
}
}

return static::SUCCESS;
Expand Down
80 changes: 80 additions & 0 deletions tests/Commands/DispatchQueueCheckJobsCommandTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?php

use Illuminate\Support\Facades\Bus;
use Spatie\Health\Checks\Checks\QueueCheck;
use Spatie\Health\Commands\DispatchQueueCheckJobsCommand;
use Spatie\Health\Jobs\HealthQueueJob;
use function Pest\Laravel\artisan;
use Spatie\Health\Facades\Health;

it('dispatch to default queue by default', function () {
Bus::fake();

Health::checks([
QueueCheck::new()->new(),
]);

artisan(DispatchQueueCheckJobsCommand::class)->assertSuccessful();

Bus::assertDispatchedTimes(HealthQueueJob::class, 1);
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'default');
});

it('dispatch to specified queue', function () {
Bus::fake();

Health::checks([
QueueCheck::new()->onQueue('queue'),
]);

artisan(DispatchQueueCheckJobsCommand::class)->assertSuccessful();

Bus::assertDispatchedTimes(HealthQueueJob::class, 1);
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue');
});

it('dispatch to multiple queues of single check', function () {
Bus::fake();

Health::checks([
QueueCheck::new()->onQueue(['queue1', 'queue2']),
]);

artisan(DispatchQueueCheckJobsCommand::class)->assertSuccessful();

Bus::assertDispatchedTimes(HealthQueueJob::class, 2);
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue1');
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue2');
});

it('dispatch multiple checks', function () {
Bus::fake();

Health::checks([
QueueCheck::new()->onQueue('queue1')->name('Queue 1'),
QueueCheck::new()->onQueue('queue2')->name('Queue 2'),
]);

artisan(DispatchQueueCheckJobsCommand::class)->assertSuccessful();

Bus::assertDispatchedTimes(HealthQueueJob::class, 2);
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue1');
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue2');
});

it('dispatch to multiple queues of multiple checks', function () {
Bus::fake();

Health::checks([
QueueCheck::new()->onQueue(['queue1', 'queue2'])->name('Queue 12'),
QueueCheck::new()->onQueue(['queue3', 'queue4'])->name('Queue 34'),
]);

artisan(DispatchQueueCheckJobsCommand::class)->assertSuccessful();

Bus::assertDispatchedTimes(HealthQueueJob::class, 4);
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue1');
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue2');
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue3');
Bus::assertDispatched(fn (HealthQueueJob $job) => $job->queue === 'queue4');
});