fix: align attemptsMade to the behavior of BullMQ.

closes #386
felixmosh · Mar 22, 2022 · 7ea0bbc · 7ea0bbc
1 parent bd7a6c0
commit 7ea0bbc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/api/src/queueAdapters/bull.ts b/packages/api/src/queueAdapters/bull.ts
@@ -20,11 +20,21 @@ export class BullAdapter extends BaseAdapter {
   }
 
   public getJob(id: string): Promise<Job | undefined | null> {
-    return this.queue.getJob(id);
+    return this.queue.getJob(id).then((job) => {
+      if (typeof job?.attemptsMade === 'number') {
+        job.attemptsMade++;
+      }
+      return job;
+    });
   }
 
   public getJobs(jobStatuses: JobStatus[], start?: number, end?: number): Promise<Job[]> {
-    return this.queue.getJobs(jobStatuses, start, end);
+    return this.queue.getJobs(jobStatuses, start, end).then((jobs) =>
+      jobs.map((job) => {
+        job.attemptsMade++; // increase to align it with bullMQ behavior
+        return job;
+      })
+    );
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars

diff --git a/packages/ui/src/components/JobCard/JobCard.tsx b/packages/ui/src/components/JobCard/JobCard.tsx
@@ -32,7 +32,7 @@ export const JobCard = ({ job, status, actions, readOnlyMode, allowRetries }: Jo
       <div className={s.title}>
         <h4>
           {job.name}
-          {job.attempts > 0 && <span>attempt #{job.attempts + 1}</span>}
+          {job.attempts > 1 && <span>attempt #{job.attempts}</span>}
           {!!job.opts?.repeat?.count && (
             <span>
               repeat {job.opts?.repeat?.count}