Merge pull request #3385 from codeeu/dev

Dev

Author: bernardhanna

app/Jobs/GenerateCertificateBatchJob.php

@@ -54,7 +54,7 @@ public function handle(): void
                 ->orWhereNotNull('certificate_generation_error');
         });
 
-        $rows = $query->offset($this->offset)->limit(self::BATCH_SIZE)->get();
+        $rows = $query->limit(self::BATCH_SIZE)->get();
 
         if ($rows->isEmpty()) {
             Cache::forget($runningKey);
@@ -101,19 +101,17 @@ public function handle(): void
             }
         }
 
-        $nextOffset = $this->offset + $rows->count();
         $hasMore = Excellence::query()
             ->where('edition', $this->edition)
             ->where('type', $this->type)
             ->where(function ($q) {
                 $q->whereNull('certificate_url')->orWhereNotNull('certificate_generation_error');
             })
-            ->offset($nextOffset)
             ->limit(1)
             ->exists();
 
         if ($hasMore && ! Cache::get($cancelledKey)) {
-            self::dispatch($this->edition, $this->type, $nextOffset);
+            self::dispatch($this->edition, $this->type, 0);
         } else {
             Cache::forget($runningKey);
         }

app/Jobs/SendCertificateBatchJob.php

@@ -44,7 +44,7 @@ public function handle(): void
             ->with('user')
             ->orderBy('id');
 
-        $rows = $query->offset($this->offset)->limit(self::BATCH_SIZE)->get();
+        $rows = $query->limit(self::BATCH_SIZE)->get();
 
         foreach ($rows as $excellence) {
             $user = $excellence->user;
@@ -70,20 +70,18 @@ public function handle(): void
             }
         }
 
-        $nextOffset = $this->offset + $rows->count();
         $hasMore = Excellence::query()
             ->where('edition', $this->edition)
             ->where('type', $this->type)
             ->whereNotNull('certificate_url')
             ->where(function ($q) {
                 $q->whereNull('notified_at')->orWhereNotNull('certificate_sent_error');
             })
-            ->offset($nextOffset)
             ->limit(1)
             ->exists();
 
         if ($hasMore) {
-            self::dispatch($this->edition, $this->type, $nextOffset);
+            self::dispatch($this->edition, $this->type, 0);
         } else {
             Cache::forget($runningKey);
         }