fix(qs): batches that are done shall never be marked failed (#707)

* fix(qs): batches that are done shall never be marked failed

* docs: add changelog

* fix: whitespace was missing from error message

* fix: failed and processing_attempts are not fillable

Author: m90

CHANGELOG.md

@@ -1,5 +1,8 @@
 # api
 
+## 8x.28.11 - 12 December 2023
+- Batches that are done shall never be marked failed
+
 ## 8x.28.10 - 29 November 2023
 - Requeueing should not select failed batches
 

app/Jobs/RequeuePendingQsBatchesJob.php

@@ -20,7 +20,7 @@ public function handle(): void
     {
         $failedBatches = $this->markBatchesFailed();
         foreach ($failedBatches as $batchId) {
-            report("QsBatch with ID ".$batchId."was marked as failed.");
+            report("QsBatch with ID ".$batchId." was marked as failed.");
         }
 
         $this->requeueStalledBatches();
@@ -32,6 +32,7 @@ private function markBatchesFailed(): array
             $failedBatches = QsBatch::where([
                 ['processing_attempts', '>=', $this->markFailedAfter],
                 ['failed', '=', false],
+                ['done', '=', false]
             ])
                 ->select('id')
                 ->get()

app/QsBatch.php

@@ -37,6 +37,8 @@ class QsBatch extends Model
         'wiki_id',
         'entityIds',
         'pending_since',
+        'failed',
+        'processing_attempts',
     ];
 
     protected $casts = [

tests/Jobs/RequeuePendingQsBatchesJobTest.php

@@ -31,6 +31,7 @@ public function testRequeue (): void {
         QsBatch::factory()->create(['pending_since' => Carbon::now()->subSeconds(400), 'id' => 2, 'done' => 0, 'wiki_id' => 1, 'entityIds' => 'a,b']);
         QsBatch::factory()->create(['processing_attempts' => 3, 'id' => 3, 'done' => 0, 'wiki_id' => 1, 'entityIds' => 'a,b']);
         QsBatch::factory()->create(['failed' => 1, 'processing_attempts' => 4, 'id' => 4, 'done' => 0, 'wiki_id' => 1, 'entityIds' => 'a,b']);
+        QsBatch::factory()->create(['failed' => 0, 'processing_attempts' => 3, 'id' => 5, 'done' => 1, 'wiki_id' => 1, 'entityIds' => 'a,b']);
 
         $mockExceptionHandler = $this->createMock(ExceptionHandler::class);
         $mockExceptionHandler
@@ -45,10 +46,11 @@ public function testRequeue (): void {
             ->method('fail');
         $job->handle();
 
-        $this->assertEquals(QsBatch::where('pending_since', '=', null)->count(), 3);
+        $this->assertEquals(QsBatch::where('pending_since', '=', null)->count(), 4);
         $this->assertEquals(QsBatch::where('failed', '=', true)->count(), 2);
         $this->assertEquals(QsBatch::where('id', '=', 2)->first()->processing_attempts, 1);
         $this->assertEquals(QsBatch::where('id', '=', 4)->first()->processing_attempts, 4);
         $this->assertEquals(QsBatch::where('id', '=', 4)->first()->pending_since, null);
+        $this->assertEquals(QsBatch::where('id', '=', 5)->first()->failed, 0);
     }
 }