Update formatting of force processing backlog

getodk · Aug 22, 2024 · b64f783 · b64f783
1 parent 571c2f1
commit b64f783
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/model/query/entities.js b/lib/model/query/entities.js
@@ -526,7 +526,8 @@ const processHeldSubmissions = (force = false) => async (container) => {
     async () => {
       await container.Entities._deleteHeldSubmissionByEventId(event.id);
       return processSubmissionEvent(event, { details: { force: true } })(container);
-    }));
+    }))
+    .then(() => events.length);
 };
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/lib/task/process-held-submissions.js b/lib/task/process-held-submissions.js
@@ -1,4 +1,4 @@
-// Copyright 2019 ODK Central Developers
+// Copyright 2024 ODK Central Developers
 // See the NOTICE file at the top-level directory of this distribution and at
 // https://github.com/getodk/central-backend/blob/master/NOTICE.
 // This file is part of ODK Central. It is subject to the license terms in

diff --git a/test/integration/api/offline-entities.js b/test/integration/api/offline-entities.js
@@ -1106,7 +1106,9 @@ describe('Offline Entities', () => {
         backlogCount.should.equal(2);
 
         // Process submissions that have been in the backlog for a long time
-        await container.Entities.processHeldSubmissions();
+        // (only 1 of 2 should be processed)
+        const count = await container.Entities.processHeldSubmissions();
+        count.should.equal(1);
 
         await asAlice.get('/v1/projects/1/datasets/people/entities/12345678-1234-4123-8234-123456789abc')
           .expect(200)