DbQueue use lock for update from hectororm/query package instead of try another job

Author: ElGigi

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.0.0-beta9] - 2025-02-04
+
+### Changed
+
+- `DbQueue` use lock for update from `hectororm/query` package instead of try another job
+
 ## [1.0.0-beta8] - 2025-02-03
 
 ### Added

src/Queue/DbQueue.php

@@ -82,41 +82,35 @@ public function size(): int
      */
     public function consume(): ?DbJob
     {
-        $attempts = 0;
-
-        do {
-            $jobRaw = $this->addBuilderConditions($this->getQueryBuilder())
-                ->orderBy('job_id', Order::ORDER_ASC)
-                ->limit(1)
-                ->fetchOne();
-
-            if (null === $jobRaw) {
-                return null;
-            }
-
-            // Lock
-            $affected = $this->getQueryBuilder()
-                ->whereEquals(
-                    array_filter(
-                        $jobRaw,
-                        fn($k) => in_array(
-                            $k,
-                            ['job_id', 'queue', 'availability_time', 'attempts', 'lock_time']
-                        ),
-                        ARRAY_FILTER_USE_KEY
-                    )
+        $jobRaw = $this->addBuilderConditions($this->getQueryBuilder())
+            ->orderBy('job_id', Order::ORDER_ASC)
+            ->limit(1)
+            ->fetchOne(true);
+
+        if (null === $jobRaw) {
+            return null;
+        }
+
+        // Lock
+        $affected = $this->getQueryBuilder()
+            ->whereEquals(
+                array_filter(
+                    $jobRaw,
+                    fn($k) => in_array(
+                        $k,
+                        ['job_id', 'queue', 'availability_time', 'attempts', 'lock_time']
+                    ),
+                    ARRAY_FILTER_USE_KEY
                 )
-                ->update($updatedData = [
-                    'lock_time' => $this->now()->format('Y-m-d H:i:s'),
-                    'attempts' => ($jobRaw['attempts'] ?? 0) + 1,
-                ]);
-
-            if ($affected === 1) {
-                return $this->createJob(array_replace($jobRaw, $updatedData));
-            }
+            )
+            ->update($updatedData = [
+                'lock_time' => $this->now()->format('Y-m-d H:i:s'),
+                'attempts' => ($jobRaw['attempts'] ?? 0) + 1,
+            ]);
 
-            $attempts++;
-        } while ($attempts < 5);
+        if ($affected === 1) {
+            return $this->createJob(array_replace($jobRaw, $updatedData));
+        }
 
         return null;
     }