Merge pull request #15341 from overleaf/csh-issue-11625-mongo-ug-5-notifications

Upgrade mongodb module for notifications from 4.11.0 to 6.1.0

GitOrigin-RevId: 8e185d2d9128e2bc889bbc00a7f21fbee0f27daa

services/notifications/app/js/HealthCheckController.js

@@ -18,11 +18,11 @@ const logger = require('@overleaf/logger')
 
 module.exports = {
   check(callback) {
-    const userId = ObjectId()
+    const userId = new ObjectId()
     const cleanupNotifications = callback =>
       db.notifications.remove({ user_id: userId }, callback)
 
-    let notificationKey = `smoke-test-notification-${ObjectId()}`
+    let notificationKey = `smoke-test-notification-${new ObjectId()}`
     const getOpts = endPath => ({
       url: `http://localhost:${port}/user/${userId}${endPath}`,
       timeout: 5000,

services/notifications/app/js/Notifications.js

@@ -20,7 +20,7 @@ module.exports = Notifications = {
       callback = function () {}
     }
     const query = {
-      user_id: ObjectId(userId),
+      user_id: new ObjectId(userId),
       templateKey: { $exists: true },
     }
     db.notifications.find(query).toArray(callback)
@@ -31,7 +31,7 @@ module.exports = Notifications = {
       callback = function () {}
     }
     const query = {
-      user_id: ObjectId(userId),
+      user_id: new ObjectId(userId),
       key: notification.key,
     }
     return db.notifications.count(query, function (err, count) {
@@ -54,7 +54,7 @@ module.exports = Notifications = {
           return callback()
         }
         const doc = {
-          user_id: ObjectId(userId),
+          user_id: new ObjectId(userId),
           key: notification.key,
           messageOpts: notification.messageOpts,
           templateKey: notification.templateKey,
@@ -88,8 +88,8 @@ module.exports = Notifications = {
 
   removeNotificationId(userId, notificationId, callback) {
     const searchOps = {
-      user_id: ObjectId(userId),
-      _id: ObjectId(notificationId),
+      user_id: new ObjectId(userId),
+      _id: new ObjectId(notificationId),
     }
     const updateOperation = { $unset: { templateKey: true, messageOpts: true } }
     db.notifications.updateOne(searchOps, updateOperation, callback)
@@ -97,7 +97,7 @@ module.exports = Notifications = {
 
   removeNotificationKey(userId, notificationKey, callback) {
     const searchOps = {
-      user_id: ObjectId(userId),
+      user_id: new ObjectId(userId),
       key: notificationKey,
     }
     const updateOperation = { $unset: { templateKey: true } }