Rename taskSchedule.entitySubmissionBacklog config and default to 5 days

getodk · Aug 30, 2024 · 4dd1fca · 4dd1fca
1 parent 5b6eb2d
commit 4dd1fca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/lib/model/query/entities.js b/lib/model/query/entities.js
@@ -529,9 +529,12 @@ const _deleteHeldSubmissionByEventId = (eventId) => ({ run }) => run(sql`
 ////////////////////////////////////////////////////////////////////////////////
 // FORCE PROCESSING SUBMISSIONS FROM BACKLOG
 
-const DAY_RANGE = config.has('default.taskSchedule.forceProcess')
-  ? config.get('default.taskSchedule.forceProcess')
-  : 7; // Default is 7 days
+// Submissions that have been held in the backlog for longer than 5 days
+// will be force-processed, including out-of-order updates and updates
+// applied as entity creates.
+const DAY_RANGE = config.has('default.taskSchedule.entitySubmissionBacklog')
+  ? config.get('default.taskSchedule.entitySubmissionBacklog')
+  : 5; // Default is 5 days
 
 const _getHeldSubmissionsAsEvents = (force) => ({ all }) => all(sql`
   SELECT audits.* FROM entity_submission_backlog

diff --git a/test/integration/api/offline-entities.js b/test/integration/api/offline-entities.js
@@ -1105,11 +1105,23 @@ describe('Offline Entities', () => {
 
         await exhaust(container);
 
+        // One submission should be in the backlog
         let backlogCount = await container.oneFirst(sql`select count(*) from entity_submission_backlog`);
         backlogCount.should.equal(1);
 
+        // Update the timestamp on this to in the past, but less than the default hold duration
+        await container.run(sql`UPDATE entity_submission_backlog SET "loggedAt" = "loggedAt" - interval '4 days'`);
+
+        // The submission should not have been processed
+        let count = await container.Entities.processBacklog();
+        count.should.equal(0);
+
+        // The submission should still be held in the backlog
+        backlogCount = await container.oneFirst(sql`select count(*) from entity_submission_backlog`);
+        backlogCount.should.equal(1);
+
         // Update the timestamp on this backlog
-        await container.run(sql`UPDATE entity_submission_backlog SET "loggedAt" = "loggedAt" - interval '8 days'`);
+        await container.run(sql`UPDATE entity_submission_backlog SET "loggedAt" = "loggedAt" - interval '6 days'`);
 
         // Send the next submission, which will also be held in the backlog.
         // This submission immediately follows the previous one, but force-processing
@@ -1132,7 +1144,7 @@ describe('Offline Entities', () => {
 
         // Process submissions that have been in the backlog for a long time
         // (only 1 of 2 should be processed)
-        const count = await container.Entities.processBacklog();
+        count = await container.Entities.processBacklog();
         count.should.equal(1);
 
         await asAlice.get('/v1/projects/1/datasets/people/entities/12345678-1234-4123-8234-123456789abc')