fix: Take next job with the oldest perform_at

flusio · Apr 6, 2023 · ebc484a · ebc484a
1 parent 7bf78bc
commit ebc484a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 36 deletions.
diff --git a/src/models/dao/Job.php b/src/models/dao/Job.php
@@ -58,7 +58,7 @@ public function findNextJob($queue)
             AND perform_at <= :perform_at
             AND (number_attempts <= 25 OR frequency != '')
             {$queue_placeholder}
-            ORDER BY frequency, created_at;
+            ORDER BY perform_at ASC
         SQL;
 
         $statement = $this->prepare($sql);

diff --git a/tests/models/dao/JobTest.php b/tests/models/dao/JobTest.php
@@ -34,19 +34,17 @@ public function testFindNextJobReturnsJobTakingTheOldestOne()
         $this->freeze($now);
         $minutes_ago = $this->fake('randomNumber');
         $number_attempts = $this->fake('numberBetween', 0, 25);
-        $created_at_1 = \Minz\Time::ago($minutes_ago, 'minutes');
-        $created_at_2 = \Minz\Time::ago($minutes_ago + 5, 'minutes');
+        $perform_at_1 = \Minz\Time::ago($minutes_ago, 'minutes');
+        $perform_at_2 = \Minz\Time::ago($minutes_ago + 5, 'minutes');
         $job_dao = new Job();
         $job_id_1 = $this->create('job', [
-            'created_at' => $created_at_1->format(\Minz\Model::DATETIME_FORMAT),
-            'perform_at' => \Minz\Time::ago($minutes_ago, 'minutes')->format(\Minz\Model::DATETIME_FORMAT),
+            'perform_at' => $perform_at_1->format(\Minz\Model::DATETIME_FORMAT),
             'locked_at' => null,
             'number_attempts' => $number_attempts,
             'frequency' => '',
         ]);
         $job_id_2 = $this->create('job', [
-            'created_at' => $created_at_2->format(\Minz\Model::DATETIME_FORMAT),
-            'perform_at' => \Minz\Time::ago($minutes_ago, 'minutes')->format(\Minz\Model::DATETIME_FORMAT),
+            'perform_at' => $perform_at_2->format(\Minz\Model::DATETIME_FORMAT),
             'locked_at' => null,
             'number_attempts' => $number_attempts,
             'frequency' => '',
@@ -57,35 +55,6 @@ public function testFindNextJobReturnsJobTakingTheOldestOne()
         $this->assertSame($job_id_2, $db_job['id']);
     }
 
-    public function testFindNextJobGivesPriorityToJobsWithNoFrequency()
-    {
-        $now = $this->fake('dateTime');
-        $this->freeze($now);
-        $minutes_ago = $this->fake('randomNumber');
-        $number_attempts = $this->fake('numberBetween', 0, 25);
-        $created_at_1 = \Minz\Time::ago($minutes_ago, 'minutes');
-        $created_at_2 = \Minz\Time::ago($minutes_ago + 5, 'minutes');
-        $job_dao = new Job();
-        $job_id_1 = $this->create('job', [
-            'created_at' => $created_at_1->format(\Minz\Model::DATETIME_FORMAT),
-            'perform_at' => \Minz\Time::ago($minutes_ago, 'minutes')->format(\Minz\Model::DATETIME_FORMAT),
-            'locked_at' => null,
-            'number_attempts' => $number_attempts,
-            'frequency' => '',
-        ]);
-        $job_id_2 = $this->create('job', [
-            'created_at' => $created_at_2->format(\Minz\Model::DATETIME_FORMAT),
-            'perform_at' => \Minz\Time::ago($minutes_ago, 'minutes')->format(\Minz\Model::DATETIME_FORMAT),
-            'locked_at' => null,
-            'number_attempts' => $number_attempts,
-            'frequency' => '+5 minutes',
-        ]);
-
-        $db_job = $job_dao->findNextJob('all');
-
-        $this->assertSame($job_id_1, $db_job['id']);
-    }
-
     public function testFindNextJobReturnsJobInGivenQueue()
     {
         $now = $this->fake('dateTime');