fix(testing): Refactor worker waiting logic during e2e

Prevent deadlocks while waiting for the worker to process async jobs during e2e tests.
novuhq · Jan 29, 2025 · 6149dd8 · 6149dd8
1 parent a23b023
commit 6149dd8
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/libs/testing/src/jobs.service.ts b/libs/testing/src/jobs.service.ts
@@ -61,11 +61,9 @@ export class JobsService {
     unfinishedJobs?: number;
   }) {
     let runningJobs = 0;
-    let totalCount = 0;
+    unfinishedJobs = Math.max(unfinishedJobs, 0);
 
-    const workflowMatch = templateId
-      ? { _templateId: Array.isArray(templateId) ? { $in: templateId } : templateId }
-      : {};
+    const workflowMatch = templateId ? { _templateId: { $in: [templateId].flat() } } : {};
     const typeMatch = delay
       ? {
           type: {
@@ -75,16 +73,18 @@ export class JobsService {
       : {};
 
     do {
-      totalCount = (await this.getQueueMetric()).totalCount;
-      runningJobs = await this.jobRepository.count({
-        _organizationId: organizationId,
-        ...typeMatch,
-        ...workflowMatch,
-        status: {
-          $in: [JobStatusEnum.PENDING, JobStatusEnum.QUEUED, JobStatusEnum.RUNNING],
-        },
-      });
-    } while (totalCount > 0 || runningJobs > unfinishedJobs);
+      runningJobs = Math.max(
+        await this.jobRepository.count({
+          _organizationId: organizationId,
+          ...typeMatch,
+          ...workflowMatch,
+          status: {
+            $in: [JobStatusEnum.PENDING, JobStatusEnum.QUEUED, JobStatusEnum.RUNNING],
+          },
+        }),
+        0
+      );
+    } while (runningJobs > unfinishedJobs);
 
     return {
       getDelayedTimestamp: async () => {