From 2dfb12f23d9cfdf4074f184eccc15855f5cf113d Mon Sep 17 00:00:00 2001 From: Jonatan Rek Date: Tue, 6 Aug 2024 07:17:35 +0200 Subject: [PATCH] Scheduing progress --- app/Jobs/ScheduleNextMaintenance.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Jobs/ScheduleNextMaintenance.php b/app/Jobs/ScheduleNextMaintenance.php index 944cd6a..b3e884f 100644 --- a/app/Jobs/ScheduleNextMaintenance.php +++ b/app/Jobs/ScheduleNextMaintenance.php @@ -30,9 +30,17 @@ class ScheduleNextMaintenance implements ShouldQueue { $maintenances = Maintenance::all(); foreach ($maintenances as $maintenance) { - $cron = new CronExpression($maintenance->schedule); - dump($cron->getNextRunDate(null, 2)->format('Y-m-d H:i:s')); + $valid = CronExpression::isValidExpression($maintenance->schedule); + if (!$valid) { + dd($maintenance->schedule); + return; + } + $cron = new CronExpression($maintenance->schedule); + if (!$cron->isDue('now')) { + dd($cron->getNextRunDate()); + return; + } $maintenance->history()->create([ 'start_at' => $cron->getNextRunDate(null, 2)