fix(job-queue-plugin): Correct retry setting for BullMQ jobs

Relates to #1467
vendure-ecommerce · Sep 26, 2023 · 972ba0e · 972ba0e
1 parent baeb036
commit 972ba0e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/job-queue-plugin/src/bullmq/bullmq-job-queue-strategy.ts b/packages/job-queue-plugin/src/bullmq/bullmq-job-queue-strategy.ts
@@ -116,7 +116,7 @@ export class BullMQJobQueueStrategy implements InspectableJobQueueStrategy {
     }
 
     async add<Data extends JobData<Data> = object>(job: Job<Data>): Promise<Job<Data>> {
-        const retries = this.options.setRetries?.(job.queueName, job) ?? job.retries;
+        const retries = this.options.setRetries?.(job.queueName, job) ?? job.retries ?? 0;
         const backoff = this.options.setBackoff?.(job.queueName, job) ?? {
             delay: 1000,
             type: 'exponential',
@@ -297,7 +297,7 @@ export class BullMQJobQueueStrategy implements InspectableJobQueueStrategy {
             error: jobJson.failedReason,
             progress: +jobJson.progress,
             result: jobJson.returnvalue,
-            retries: bullJob.opts.attempts ?? 0,
+            retries: bullJob.opts.attempts ? bullJob.opts.attempts - 1 : 0,
         });
     }