From 5dca40eea2a1fee63b0f366c67406a5552f3bccb Mon Sep 17 00:00:00 2001 From: Andrew Rumble Date: Fri, 14 Feb 2025 11:50:01 +0000 Subject: [PATCH] Merge pull request #22646 from overleaf/ar-address-mongo-count-deprecation-warning [web] Switch from find.count to countDocuments GitOrigin-RevId: cc607868334d54b3d5c375c06fec97a482a16cc5 --- services/web/app/src/Features/User/UserHandler.js | 10 ++++------ services/web/test/unit/src/User/UserHandlerTests.js | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/services/web/app/src/Features/User/UserHandler.js b/services/web/app/src/Features/User/UserHandler.js index c4c929c452..cdd2e51431 100644 --- a/services/web/app/src/Features/User/UserHandler.js +++ b/services/web/app/src/Features/User/UserHandler.js @@ -15,12 +15,10 @@ function populateTeamInvites(user, callback) { async function countActiveUsers() { const oneYearAgo = new Date() oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1) - return await db.users - .find( - { lastActive: { $gte: oneYearAgo } }, - { readPreference: READ_PREFERENCE_SECONDARY } - ) - .count() + return await db.users.countDocuments( + { lastActive: { $gte: oneYearAgo } }, + { readPreference: READ_PREFERENCE_SECONDARY } + ) } module.exports = { diff --git a/services/web/test/unit/src/User/UserHandlerTests.js b/services/web/test/unit/src/User/UserHandlerTests.js index 2dcbc88d6b..e990ccaf90 100644 --- a/services/web/test/unit/src/User/UserHandlerTests.js +++ b/services/web/test/unit/src/User/UserHandlerTests.js @@ -17,9 +17,7 @@ describe('UserHandler', function () { this.db = { users: { - find: sinon.stub().returns({ - count: sinon.stub().resolves(2), - }), + countDocuments: sinon.stub().resolves(2), }, }