fix(core): Fix race condition in updating JobRecords

packages/core/e2e/default-search-plugin.e2e-spec.ts

@@ -4,7 +4,6 @@ import {
     DefaultJobQueuePlugin,
     DefaultSearchPlugin,
     facetValueCollectionFilter,
-    JobQueueService,
     mergeConfig,
 } from '@vendure/core';
 import { createTestEnvironment, E2E_DEFAULT_CHANNEL_TOKEN, SimpleGraphQLClient } from '@vendure/testing';

packages/core/e2e/utils/await-running-jobs.ts

@@ -13,7 +13,7 @@ export async function awaitRunningJobs(adminClient: SimpleGraphQLClient, timeout
     let timedOut = false;
     // Allow a brief period for the jobs to start in the case that
     // e.g. event debouncing is used before triggering the job.
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise(resolve => setTimeout(resolve, 100));
     do {
         const { jobs } = await adminClient.query<GetRunningJobs.Query, GetRunningJobs.Variables>(
             GET_RUNNING_JOBS,

packages/core/src/plugin/default-job-queue-plugin/sql-job-queue-strategy.ts

@@ -112,7 +112,7 @@ export class SqlJobQueueStrategy extends PollingJobQueueStrategy implements Insp
             .update()
             .set(this.toRecord(job))
             .where('id = :id', { id: job.id })
-            .andWhere('state != :cancelled', { cancelled: JobState.CANCELLED })
+            .andWhere('settledAt IS NULL')
             .execute();
     }
 

packages/elasticsearch-plugin/e2e/elasticsearch-plugin.e2e-spec.ts

@@ -344,7 +344,6 @@ describe('Elasticsearch plugin', () => {
                         })),
                     },
                 );
-
                 await awaitRunningJobs(adminClient);
                 const { search: search2 } = await doAdminSearchQuery(adminClient, {
                     term: 'drive',