Merge pull request #109 from mathiasmoser/fix-task-last-run-finished-…

…too-late-logic Fix wrong lastRunFinishedTooLate behaviour when lastStartedAt and lastFinishedAt are within a second because of a very fast task
spatie · Mar 28, 2024 · 51e9f00 · 51e9f00
2 parents 46b95ba + 4ab5606
commit 51e9f00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Support/ScheduledTasks/Tasks/Task.php b/src/Support/ScheduledTasks/Tasks/Task.php
@@ -136,10 +136,9 @@ public function lastRunFinishedTooLate(): bool
 
         $lastFinishedAt = $this->lastRunFinishedAt()
             ? $this->lastRunFinishedAt()
-            : $this->monitoredScheduledTask->created_at;
-
-        $expectedNextRunStart = $this->nextRunAt($lastFinishedAt->subSecond());
+            : $this->monitoredScheduledTask->created_at->subSecond();
 
+        $expectedNextRunStart = $this->nextRunAt($lastFinishedAt);
         $shouldHaveFinishedAt = $expectedNextRunStart->addMinutes($this->graceTimeInMinutes());
 
         return $shouldHaveFinishedAt->isPast();

diff --git a/tests/Support/Tasks/LastRunFinishedTooLateTest.php b/tests/Support/Tasks/LastRunFinishedTooLateTest.php
@@ -29,6 +29,14 @@
     expect(createTask()->lastRunFinishedTooLate())->toBeTrue();
 });
 
+test('a task will be not consider too late if the last start and finished date are the same because the task executes pretty fast', function () {
+    expect(createTask()->lastRunFinishedTooLate())->toBeFalse();
+
+    $this->monitoredScheduledTask->update(['last_started_at' => now(), 'last_finished_at' => now()]);
+    TestTime::addMinutes(6);
+    expect(createTask()->lastRunFinishedTooLate())->toBeFalse();
+});
+
 it('will reset the period', function () {
     expect(createTask()->lastRunFinishedTooLate())->toBeFalse();