From bf2ad1952c8dcce016b275f05da95c920d8afb42 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Fri, 1 Nov 2024 13:16:23 +0100
Subject: [PATCH] Merge pull request #21506 from
 overleaf/jpa-fix-batched-update-edge

[web] fix edge behavior of batchedUpdate

GitOrigin-RevId: 5d1c0b884aa02c52682d114fa66b2d9b201e724e
---
 .../web/scripts/helpers/batchedUpdate.mjs     |  4 +-
 .../acceptance/src/BatchedUpdateTests.mjs     | 69 +++++++++++++++++++
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/services/web/scripts/helpers/batchedUpdate.mjs b/services/web/scripts/helpers/batchedUpdate.mjs
index 7f89959314..441a38aa7d 100644
--- a/services/web/scripts/helpers/batchedUpdate.mjs
+++ b/services/web/scripts/helpers/batchedUpdate.mjs
@@ -91,12 +91,12 @@ async function getNextBatch(
   if (BATCH_DESCENDING) {
     query._id = {
       $gt: end,
-      $lt: start,
+      $lte: start,
     }
   } else {
     query._id = {
       $gt: start,
-      $lt: end,
+      $lte: end,
     }
   }
   return await collection
diff --git a/services/web/test/acceptance/src/BatchedUpdateTests.mjs b/services/web/test/acceptance/src/BatchedUpdateTests.mjs
index aee7899a29..1d0796d290 100644
--- a/services/web/test/acceptance/src/BatchedUpdateTests.mjs
+++ b/services/web/test/acceptance/src/BatchedUpdateTests.mjs
@@ -36,4 +36,73 @@ describe('BatchedUpdateTests', function () {
       { content: '42' },
     ])
   })
+
+  it('can handle ids sitting on the edge', async function () {
+    const edge = '3028de800000000000000000'
+    await db.systemmessages.insertOne({
+      content: '1',
+      _id: new ObjectId('300000000000000000000000'),
+    })
+    await db.systemmessages.insertOne({
+      content: '2',
+      _id: new ObjectId(),
+    })
+    await db.systemmessages.insertOne({
+      content: '3',
+      _id: new ObjectId('400000000000000000000000'),
+    })
+    const { stderr } = spawnSync(
+      process.argv0,
+      [
+        '--input-type=module',
+        '-e',
+        'import BatchedUpdateModule from "./scripts/helpers/batchedUpdate.mjs"; BatchedUpdateModule.batchedUpdateWithResultHandling("systemmessages", { content: { $ne: "42" }}, { $set: { content: "42" } })',
+      ],
+      { encoding: 'utf-8' }
+    )
+    expect(
+      await db.systemmessages.find({}).project({ content: 1, _id: 0 }).toArray()
+    ).to.deep.equal([{ content: '42' }, { content: '42' }, { content: '42' }])
+    expect(stderr).to.include('Completed batch ending 300000000000000000000000')
+    expect(stderr).to.include(`Completed batch ending ${edge}`) // hit the edge
+    expect(stderr).to.include('Completed batch ending 400000000000000000000000')
+  })
+
+  it('can handle ids sitting on the edge descending', async function () {
+    const edge = '3fd721800000000000000000'
+    await db.systemmessages.insertOne({
+      content: '1',
+      _id: new ObjectId('300000000000000000000000'),
+    })
+    await db.systemmessages.insertOne({
+      content: '2',
+      _id: new ObjectId(edge),
+    })
+    await db.systemmessages.insertOne({
+      content: '3',
+      _id: new ObjectId('400000000000000000000000'),
+    })
+    const { stderr } = spawnSync(
+      process.argv0,
+      [
+        '--input-type=module',
+        '-e',
+        'import BatchedUpdateModule from "./scripts/helpers/batchedUpdate.mjs"; BatchedUpdateModule.batchedUpdateWithResultHandling("systemmessages", { content: { $ne: "42" }}, { $set: { content: "42" } })',
+      ],
+      {
+        encoding: 'utf-8',
+        env: {
+          ...process.env,
+          BATCH_DESCENDING: 'true',
+          BATCH_RANGE_START: '400000000000000000000001',
+        },
+      }
+    )
+    expect(
+      await db.systemmessages.find({}).project({ content: 1, _id: 0 }).toArray()
+    ).to.deep.equal([{ content: '42' }, { content: '42' }, { content: '42' }])
+    expect(stderr).to.include('Completed batch ending 400000000000000000000000')
+    expect(stderr).to.include(`Completed batch ending ${edge}`) // hit the edge
+    expect(stderr).to.include('Completed batch ending 300000000000000000000000')
+  })
 })