Fix automation next poll scheduling for locked steps

Author: EvanHahn

ghost/core/core/server/services/automations/fake-database-automations-repository.ts

@@ -303,7 +303,7 @@ function fetchAndLockSteps(database: DatabaseSync, limit: number): {
     if (candidates.length === 0) {
         return {
             steps: [],
-            nextStepReadyAt: findNextPendingReadyAt(database, now)
+            nextStepReadyAt: findNextPendingReadyAt(database, staleLockCutoff)
         };
     }
 

ghost/core/test/unit/server/services/automations/automations-repository.test.ts

@@ -556,6 +556,24 @@ describe('automations repository', function () {
             assert.equal(result.nextStepReadyAt.toISOString(), sooner.toISOString());
         });
 
+        it('does not schedule an immediate poll when due steps are locked by another worker', async function () {
+            const automation = await getAutomationBySlug('member-welcome-email-free');
+            const action = getActionByIndex(automation.id, 0);
+            const run = insertRun(automation.id);
+            const lockedAt = new Date(Date.now() - 60 * 1000);
+
+            insertStep(run.id, action.revision_id, {
+                locked_at: lockedAt.toISOString(),
+                ready_at: new Date(Date.now() - 1000).toISOString(),
+                locked_by: 'fresh-lock'
+            });
+
+            const result = await repo.fetchAndLockSteps(10);
+
+            assert.deepEqual(result.steps, []);
+            assert.equal(result.nextStepReadyAt, null);
+        });
+
         it('respects the limit argument', async function () {
             const automation = await getAutomationBySlug('member-welcome-email-free');
             const action = getActionByIndex(automation.id, 0);