Merge pull request #3185 from overleaf/jpa-normalize-mongo-imports

[misc] normalize mongo imports

GitOrigin-RevId: ac653d9982e0d36736b90f4c03d4c00be88ea76a

services/web/app/src/Features/Authorization/AuthorizationManager.js

@@ -6,7 +6,7 @@ const PrivilegeLevels = require('./PrivilegeLevels')
 const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler')
 const PublicAccessLevels = require('./PublicAccessLevels')
 const Errors = require('../Errors/Errors')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const { promisifyAll } = require('../../util/promises')
 
 const AuthorizationManager = {

services/web/app/src/Features/Authorization/AuthorizationMiddleware.js

@@ -2,7 +2,7 @@ let AuthorizationMiddleware
 const AuthorizationManager = require('./AuthorizationManager')
 const async = require('async')
 const logger = require('logger-sharelatex')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const Errors = require('../Errors/Errors')
 const HttpErrorHandler = require('../Errors/HttpErrorHandler')
 const AuthenticationController = require('../Authentication/AuthenticationController')

services/web/app/src/Features/Collaborators/CollaboratorsGetter.js

@@ -1,6 +1,6 @@
 const { callbackify } = require('util')
 const pLimit = require('p-limit')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const OError = require('@overleaf/o-error')
 const { Project } = require('../../models/Project')
 const UserGetter = require('../User/UserGetter')

services/web/app/src/Features/Institutions/InstitutionsManager.js

@@ -1,6 +1,6 @@
 const async = require('async')
 const _ = require('underscore')
-const { ObjectId } = require('../../infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const { getInstitutionAffiliations } = require('./InstitutionsAPI')
 const FeaturesUpdater = require('../Subscription/FeaturesUpdater')
 const UserGetter = require('../User/UserGetter')

services/web/app/src/Features/Project/ProjectCollabratecDetailsHandler.js

@@ -13,7 +13,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 let ProjectCollabratecDetailsHandler
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const { Project } = require('../../models/Project')
 
 module.exports = ProjectCollabratecDetailsHandler = {

services/web/app/src/Features/Project/ProjectController.js

@@ -4,7 +4,7 @@ const fs = require('fs')
 const crypto = require('crypto')
 const async = require('async')
 const logger = require('logger-sharelatex')
-const { ObjectId } = require('../../infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const ProjectDeleter = require('./ProjectDeleter')
 const ProjectDuplicator = require('./ProjectDuplicator')
 const ProjectCreationHandler = require('./ProjectCreationHandler')

services/web/app/src/Features/Project/ProjectCreationHandler.js

@@ -17,7 +17,7 @@ const OError = require('@overleaf/o-error')
 const async = require('async')
 const metrics = require('metrics-sharelatex')
 const Settings = require('settings-sharelatex')
-const { ObjectId } = require('mongoose').Types
+const { ObjectId } = require('mongodb')
 const { Project } = require('../../models/Project')
 const { Folder } = require('../../models/Folder')
 const ProjectEntityUpdateHandler = require('./ProjectEntityUpdateHandler')

services/web/app/src/Features/Project/ProjectGetter.js

@@ -13,11 +13,9 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const mongojs = require('../../infrastructure/mongojs')
+const { db, ObjectId } = require('../../infrastructure/mongojs')
 const OError = require('@overleaf/o-error')
 const metrics = require('metrics-sharelatex')
-const { db } = mongojs
-const { ObjectId } = mongojs
 const async = require('async')
 const { promisifyAll } = require('../../util/promises')
 const { Project } = require('../../models/Project')

services/web/app/src/Features/Project/ProjectHelper.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('../../infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const _ = require('lodash')
 const { promisify } = require('util')
 const Settings = require('settings-sharelatex')

services/web/app/src/Features/Subscription/SubscriptionLocator.js

@@ -16,7 +16,6 @@ const { promisify } = require('util')
 const { Subscription } = require('../../models/Subscription')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
 const logger = require('logger-sharelatex')
-const { ObjectId } = require('mongoose').Types
 require('./GroupPlansData') // make sure dynamic group plans are loaded
 
 const SubscriptionLocator = {

services/web/app/src/Features/Subscription/SubscriptionUpdater.js

@@ -1,4 +1,4 @@
-const { db } = require('../../infrastructure/mongojs')
+const { db, ObjectId } = require('../../infrastructure/mongojs')
 const OError = require('@overleaf/o-error')
 const async = require('async')
 const { promisifyAll } = require('../../util/promises')
@@ -6,7 +6,6 @@ const { Subscription } = require('../../models/Subscription')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const UserGetter = require('../User/UserGetter')
 const PlansLocator = require('./PlansLocator')
-const { ObjectId } = require('mongoose').Types
 const FeaturesUpdater = require('./FeaturesUpdater')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
 

services/web/app/src/Features/Subscription/TeamInvitesHandler.js

@@ -4,7 +4,7 @@ const crypto = require('crypto')
 const async = require('async')
 
 const settings = require('settings-sharelatex')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 const { Subscription } = require('../../models/Subscription')
 

services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('../../infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const _ = require('lodash')
 const { callbackify } = require('util')
 const logger = require('logger-sharelatex')

services/web/app/src/Features/TokenAccess/TokenAccessHandler.js

@@ -2,7 +2,7 @@ const { Project } = require('../../models/Project')
 const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const UserGetter = require('../User/UserGetter')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const Settings = require('settings-sharelatex')
 const logger = require('logger-sharelatex')
 const V1Api = require('../V1/V1Api')

services/web/app/src/Features/User/UserGetter.js

@@ -1,8 +1,6 @@
-const mongojs = require('../../infrastructure/mongojs')
+const { db, ObjectId } = require('../../infrastructure/mongojs')
 const metrics = require('metrics-sharelatex')
 const logger = require('logger-sharelatex')
-const { db } = mongojs
-const { ObjectId } = mongojs
 const { promisifyAll } = require('../../util/promises')
 const { getUserAffiliations } = require('../Institutions/InstitutionsAPI')
 const InstitutionsHelper = require('../Institutions/InstitutionsHelper')

services/web/app/src/Features/User/UserInfoController.js

@@ -1,7 +1,7 @@
 let UserController
 const UserGetter = require('./UserGetter')
 const AuthenticationController = require('../Authentication/AuthenticationController')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 module.exports = UserController = {
   getLoggedInUsersPersonalInfo(req, res, next) {

services/web/app/src/Features/User/UserUpdater.js

@@ -1,10 +1,8 @@
 const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
-const mongojs = require('../../infrastructure/mongojs')
+const { db, ObjectId } = require('../../infrastructure/mongojs')
 const metrics = require('metrics-sharelatex')
-const { db } = mongojs
 const async = require('async')
-const { ObjectId } = mongojs
 const { callbackify, promisify } = require('util')
 const UserGetter = require('./UserGetter')
 const {

services/web/app/src/Features/UserMembership/UserMembershipHandler.js

@@ -13,7 +13,7 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const { ObjectId } = require('mongoose').Types
+const { ObjectId } = require('mongodb')
 const async = require('async')
 const { promisifyAll } = require('../../util/promises')
 const Errors = require('../Errors/Errors')

services/web/app/src/Features/UserMembership/UserMembershipViewModel.js

@@ -11,7 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 let UserMembershipViewModel
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const UserGetter = require('../User/UserGetter')
 
 module.exports = UserMembershipViewModel = {

services/web/app/src/infrastructure/Validation.js

@@ -1,5 +1,5 @@
 const { Joi: CelebrateJoi, celebrate, errors } = require('celebrate')
-const { ObjectId } = require('./mongojs')
+const { ObjectId } = require('mongodb')
 
 const objectIdValidator = {
   name: 'objectId',

services/web/modules/launchpad/test/unit/src/LaunchpadControllerTests.js

@@ -15,7 +15,6 @@ const assert = require('assert')
 require('chai').should()
 const { expect } = require('chai')
 const sinon = require('sinon')
-const { ObjectId } = require('mongojs')
 const modulePath = require('path').join(
   __dirname,
   '../../../app/src/LaunchpadController.js'

services/web/scripts/add_multiple_emails.js

@@ -1,5 +1,4 @@
-const mongojs = require('../app/src/infrastructure/mongojs')
+const { db } = require('../app/src/infrastructure/mongojs')
-const { db } = mongojs
 const async = require('async')
 const minilist = require('minimist')
 

services/web/scripts/increase_compile_timeouts.js

@@ -1,5 +1,4 @@
-const mongojs = require('../app/src/infrastructure/mongojs')
+const { db } = require('../app/src/infrastructure/mongojs')
-const { db } = mongojs
 const async = require('async')
 const minilist = require('minimist')
 

services/web/scripts/project-tokens/add_readAndWritePrefix_index.js

@@ -1,5 +1,4 @@
-const mongojs = require('../../app/src/infrastructure/mongojs')
+const { db } = require('../../app/src/infrastructure/mongojs')
-const { db } = mongojs
 
 const keys = { 'tokens.readAndWritePrefix': 1 }
 const opts = {

services/web/scripts/project-tokens/deactivate_projects.js

@@ -1,5 +1,4 @@
-const mongojs = require('../../app/src/infrastructure/mongojs')
+const { db, ObjectId } = require('../../app/src/infrastructure/mongojs')
-const { db, ObjectId } = mongojs
 const Async = require('async')
 
 const projectIds = [

services/web/scripts/project-tokens/extract_read_and_write_token_prefix.js

@@ -1,5 +1,4 @@
-const mongojs = require('../../app/src/infrastructure/mongojs')
+const { db } = require('../../app/src/infrastructure/mongojs')
-const { db } = mongojs
 const Async = require('async')
 
 db.projects.find(

services/web/scripts/wfh_2020/wfh_2020_export.js

@@ -1,5 +1,4 @@
-const mongojs = require('../../app/src/infrastructure/mongojs')
+const { db } = require('../../app/src/infrastructure/mongojs')
-const { db } = mongojs
 const async = require('async')
 
 db.deletedSubscriptions.aggregate(

services/web/scripts/wfh_2020/wfh_2020_notifications.js

@@ -1,7 +1,6 @@
 const NotificationsHandler = require('../../app/src/Features/Notifications/NotificationsHandler')
 
-const mongojs = require('../../app/src/infrastructure/mongojs')
+const { db } = require('../../app/src/infrastructure/mongojs')
-const { db } = mongojs
 const async = require('async')
 
 const templateKey = 'wfh_2020_upgrade_offer'

services/web/scripts/wfh_2020/wfh_2020_upgrades.js

@@ -1,7 +1,6 @@
 const NotificationsHandler = require('../../app/src/Features/Notifications/NotificationsHandler')
 
-const mongojs = require('../../app/src/infrastructure/mongojs')
+const { db } = require('../../app/src/infrastructure/mongojs')
-const { db } = mongojs
 const async = require('async')
 
 const templateKey = 'wfh_2020_upgrade_offer'

services/web/test/acceptance/src/FeatureUpdaterTests.js

@@ -17,7 +17,7 @@ const async = require('async')
 const UserClient = require('./helpers/User')
 const request = require('./helpers/request')
 const settings = require('settings-sharelatex')
-const { ObjectId } = require('../../../app/src/infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const { Subscription } = require('../../../app/src/models/Subscription')
 const { User } = require('../../../app/src/models/User')
 const FeaturesUpdater = require('../../../app/src/Features/Subscription/FeaturesUpdater')

services/web/test/acceptance/src/LabelsTests.js

@@ -13,7 +13,7 @@
  */
 const _ = require('underscore')
 const { expect } = require('chai')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const request = require('./helpers/request')
 
 const MockProjectHistoryApi = require('./helpers/MockProjectHistoryApi')

services/web/test/acceptance/src/ProjectCRUDTests.js

@@ -1,7 +1,7 @@
 const { expect } = require('chai')
 const User = require('./helpers/User').promises
 const { Project } = require('../../../app/src/models/Project')
-const { ObjectId } = require('../../../app/src/infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 
 describe('Project CRUD', function() {
   beforeEach(async function() {

services/web/test/acceptance/src/ProjectDuplicateNameTests.js

@@ -19,7 +19,6 @@ const async = require('async')
 const { expect } = require('chai')
 const sinon = require('sinon')
 const mkdirp = require('mkdirp')
-const { ObjectId } = require('mongojs')
 const Path = require('path')
 const fs = require('fs')
 const Settings = require('settings-sharelatex')

services/web/test/acceptance/src/ProjectStructureTests.js

@@ -1,6 +1,6 @@
 const { expect } = require('chai')
 const mkdirp = require('mkdirp')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const Path = require('path')
 const fs = require('fs')
 const Settings = require('settings-sharelatex')

services/web/test/acceptance/src/helpers/Institution.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('../../../../app/src/infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const InstitutionModel = require('../../../../app/src/models/Institution')
   .Institution
 

services/web/test/acceptance/src/helpers/MockProjectHistoryApi.js

@@ -3,7 +3,7 @@ const _ = require('lodash')
 const express = require('express')
 const bodyParser = require('body-parser')
 const app = express()
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 module.exports = MockProjectHistoryApi = {
   docs: {},

services/web/test/acceptance/src/helpers/MockV1HistoryApi.js

@@ -16,7 +16,6 @@ const _ = require('lodash')
 const express = require('express')
 const bodyParser = require('body-parser')
 const app = express()
-const { ObjectId } = require('mongojs')
 
 module.exports = MockV1HistoryApi = {
   fakeZipCall: 0,

services/web/test/acceptance/src/helpers/Publisher.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('../../../../app/src/infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const PublisherModel = require('../../../../app/src/models/Publisher').Publisher
 
 let count = parseInt(Math.random() * 999999)

services/web/test/acceptance/src/helpers/RecurlySubscription.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('../../../../app/src/infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const Subscription = require('./Subscription')
 const MockRecurlyApi = require('./MockRecurlyApi')
 const RecurlyWrapper = require('../../../../app/src/Features/Subscription/RecurlyWrapper')

services/web/test/unit/src/Authentication/AuthenticationControllerTests.js

@@ -7,7 +7,7 @@ const SandboxedModule = require('sandboxed-module')
 const tk = require('timekeeper')
 const MockRequest = require('../helpers/MockRequest')
 const MockResponse = require('../helpers/MockResponse')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 describe('AuthenticationController', function() {
   beforeEach(function() {

services/web/test/unit/src/Authentication/AuthenticationManagerTests.js

@@ -1,7 +1,7 @@
 const sinon = require('sinon')
 const chai = require('chai')
 const SandboxedModule = require('sandboxed-module')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const AuthenticationErrors = require('../../../../app/src/Features/Authentication/AuthenticationErrors')
 
 chai.should()

services/web/test/unit/src/Authorization/AuthorizationMiddlewareTests.js

@@ -36,7 +36,7 @@ describe('AuthorizationMiddleware', function() {
       requires: {
         './AuthorizationManager': this.AuthorizationManager,
         'logger-sharelatex': { log() {} },
-        mongojs: {
+        mongodb: {
           ObjectId: this.ObjectId
         },
         '../Errors/HttpErrorHandler': this.HttpErrorHandler,

services/web/test/unit/src/Collaborators/CollaboratorsGetterTests.js

@@ -2,7 +2,7 @@ const Path = require('path')
 const SandboxedModule = require('sandboxed-module')
 const sinon = require('sinon')
 const { expect } = require('chai')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const { Project } = require('../helpers/models/Project')
 const Errors = require('../../../../app/src/Features/Errors/Errors')
 

services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js

@@ -5,7 +5,7 @@ const sinon = require('sinon')
 const { expect } = require('chai')
 const Errors = require('../../../../app/src/Features/Errors/Errors')
 const { Project } = require('../helpers/models/Project')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 const MODULE_PATH = path.join(
   __dirname,

services/web/test/unit/src/Collaborators/CollaboratorsInviteControllerTests.js

@@ -21,7 +21,7 @@ const SandboxedModule = require('sandboxed-module')
 const events = require('events')
 const MockRequest = require('../helpers/MockRequest')
 const MockResponse = require('../helpers/MockResponse')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 describe('CollaboratorsInviteController', function() {
   beforeEach(function() {

services/web/test/unit/src/Collaborators/CollaboratorsInviteHandlerTests.js

@@ -22,7 +22,7 @@ const modulePath =
   '../../../../app/src/Features/Collaborators/CollaboratorsInviteHandler.js'
 const SandboxedModule = require('sandboxed-module')
 const events = require('events')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const Crypto = require('crypto')
 
 describe('CollaboratorsInviteHandler', function() {

services/web/test/unit/src/DocumentUpdater/DocumentUpdaterHandlerTests.js

@@ -1,7 +1,7 @@
 const sinon = require('sinon')
 const SandboxedModule = require('sandboxed-module')
 const path = require('path')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const modulePath = path.join(
   __dirname,
   '../../../../app/src/Features/DocumentUpdater/DocumentUpdaterHandler'

services/web/test/unit/src/Institutions/InstitutionsManagerTests.js

@@ -83,7 +83,7 @@ describe('InstitutionsManager', function() {
         '../Subscription/SubscriptionLocator': this.SubscriptionLocator,
         '../../models/Institution': this.InstitutionModel,
         '../../models/Subscription': SubscriptionModel,
-        '../../infrastructure/mongojs': this.Mongo,
+        mongodb: this.Mongo,
         '../User/SAMLIdentityManager': this.SAMLIdentityManager
       }
     }))

services/web/test/unit/src/Project/ProjectCollabratecDetailsTest.js

@@ -11,7 +11,7 @@
  * DS102: Remove unnecessary code created because of implicit returns
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const Path = require('path')
 const SandboxedModule = require('sandboxed-module')
 const assert = require('assert')

services/web/test/unit/src/Project/ProjectDeleterTests.js

@@ -7,7 +7,7 @@ const tk = require('timekeeper')
 const moment = require('moment')
 const { Project } = require('../helpers/models/Project')
 const { DeletedProject } = require('../helpers/models/DeletedProject')
-const { ObjectId } = require('mongoose').Types
+const { ObjectId } = require('mongodb')
 const Errors = require('../../../../app/src/Features/Errors/Errors')
 
 describe('ProjectDeleter', function() {

services/web/test/unit/src/Project/ProjectEntityHandlerTests.js

@@ -20,7 +20,6 @@ const { expect } = chai
 const sinon = require('sinon')
 const modulePath = '../../../../app/src/Features/Project/ProjectEntityHandler'
 const SandboxedModule = require('sandboxed-module')
-const { ObjectId } = require('mongoose').Types
 const Errors = require('../../../../app/src/Features/Errors/Errors')
 
 describe('ProjectEntityHandler', function() {

services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js

@@ -2,7 +2,7 @@ const { expect } = require('chai')
 const sinon = require('sinon')
 const tk = require('timekeeper')
 const Errors = require('../../../../app/src/Features/Errors/Errors')
-const { ObjectId } = require('mongoose').Types
+const { ObjectId } = require('mongodb')
 const SandboxedModule = require('sandboxed-module')
 const { Project } = require('../helpers/models/Project')
 

services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js

@@ -3,7 +3,7 @@ const { expect } = chai
 const sinon = require('sinon')
 const Errors = require('../../../../app/src/Features/Errors/Errors')
 const SandboxedModule = require('sandboxed-module')
-const { ObjectId } = require('mongoose').Types
+const { ObjectId } = require('mongodb')
 
 const MODULE_PATH =
   '../../../../app/src/Features/Project/ProjectEntityUpdateHandler'

services/web/test/unit/src/Project/ProjectGetterTests.js

@@ -17,7 +17,7 @@ const should = chai.should()
 const { expect } = chai
 const modulePath = '../../../../app/src/Features/Project/ProjectGetter.js'
 const SandboxedModule = require('sandboxed-module')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const { assert } = require('chai')
 
 describe('ProjectGetter', function() {

services/web/test/unit/src/Project/ProjectHelperTests.js

@@ -1,7 +1,7 @@
 const chai = require('chai')
 const { expect } = chai
 const SandboxedModule = require('sandboxed-module')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 const MODULE_PATH = '../../../../app/src/Features/Project/ProjectHelper.js'
 

services/web/test/unit/src/Project/ProjectHistoryHandlerTests.js

@@ -19,7 +19,6 @@ const { expect } = chai
 const sinon = require('sinon')
 const modulePath = '../../../../app/src/Features/Project/ProjectHistoryHandler'
 const SandboxedModule = require('sandboxed-module')
-const { ObjectId } = require('mongoose').Types
 
 describe('ProjectHistoryHandler', function() {
   const project_id = '4eecb1c1bffa66588e0000a1'

services/web/test/unit/src/Subscription/FeaturesUpdaterTests.js

@@ -16,7 +16,7 @@ const { expect } = require('chai')
 const sinon = require('sinon')
 const modulePath = '../../../../app/src/Features/Subscription/FeaturesUpdater'
 const { assert } = require('chai')
-const { ObjectId } = require('mongoose').Types
+const { ObjectId } = require('mongodb')
 
 describe('FeaturesUpdater', function() {
   beforeEach(function() {

services/web/test/unit/src/Subscription/SubscriptionLocatorTests.js

@@ -17,7 +17,6 @@ const sinon = require('sinon')
 const modulePath =
   '../../../../app/src/Features/Subscription/SubscriptionLocator'
 const { assert } = require('chai')
-const { ObjectId } = require('mongoose').Types
 
 describe('Subscription Locator Tests', function() {
   beforeEach(function() {

services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js

@@ -4,7 +4,7 @@ const sinon = require('sinon')
 const modulePath =
   '../../../../app/src/Features/Subscription/SubscriptionUpdater'
 const { assert } = require('chai')
-const { ObjectId } = require('mongoose').Types
+const { ObjectId } = require('mongodb')
 
 chai.should()
 

services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js

@@ -4,7 +4,7 @@ const { expect } = require('chai')
 const modulePath =
   '../../../../app/src/Features/Subscription/TeamInvitesHandler'
 
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const Errors = require('../../../../app/src/Features/Errors/Errors')
 
 describe('TeamInvitesHandler', function() {

services/web/test/unit/src/Tags/TagsHandlerTests.js

@@ -3,7 +3,7 @@ const { expect } = require('chai')
 require('chai').should()
 const sinon = require('sinon')
 const { Tag } = require('../helpers/models/Tag')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const modulePath = require('path').join(
   __dirname,
   '../../../../app/src/Features/Tags/TagsHandler.js'

services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('../../../../app/src/infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const SandboxedModule = require('sandboxed-module')
 const chai = require('chai')
 const path = require('path')

services/web/test/unit/src/TokenAccess/TokenAccessHandlerTests.js

@@ -21,7 +21,7 @@ const modulePath = path.join(
   '../../../../app/src/Features/TokenAccess/TokenAccessHandler'
 )
 const { expect } = require('chai')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 describe('TokenAccessHandler', function() {
   beforeEach(function() {

services/web/test/unit/src/User/UserGetterTests.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const should = require('chai').should()
 const SandboxedModule = require('sandboxed-module')
 const assert = require('assert')

services/web/test/unit/src/User/UserInfoControllerTests.js

@@ -20,7 +20,7 @@ const SandboxedModule = require('sandboxed-module')
 const events = require('events')
 const MockResponse = require('../helpers/MockResponse')
 const MockRequest = require('../helpers/MockRequest')
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 
 describe('UserInfoController', function() {
   beforeEach(function() {

services/web/test/unit/src/User/UserOnboardingControllerTests.js

@@ -1,7 +1,7 @@
 const SandboxedModule = require('sandboxed-module')
 const modulePath =
   '../../../../app/src/Features/User/UserOnboardingController.js'
-const { ObjectId } = require('mongojs')
+const { ObjectId } = require('mongodb')
 const sinon = require('sinon')
 
 describe('UserOnboardingController', function() {

services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js

@@ -17,7 +17,7 @@ const { expect } = require('chai')
 const sinon = require('sinon')
 const assertCalledWith = sinon.assert.calledWith
 const assertNotCalled = sinon.assert.notCalled
-const { ObjectId } = require('../../../../app/src/infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const modulePath =
   '../../../../app/src/Features/UserMembership/UserMembershipHandler'
 const SandboxedModule = require('sandboxed-module')

services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js

@@ -16,8 +16,7 @@ const { expect } = require('chai')
 const sinon = require('sinon')
 const assertCalledWith = sinon.assert.calledWith
 const assertNotCalled = sinon.assert.notCalled
-const mongojs = require('mongojs')
+const { ObjectId } = require('mongodb')
-const { ObjectId } = mongojs
 const modulePath =
   '../../../../app/src/Features/UserMembership/UserMembershipViewModel'
 const SandboxedModule = require('sandboxed-module')
@@ -30,7 +29,7 @@ describe('UserMembershipViewModel', function() {
         console: console
       },
       requires: {
-        mongojs: mongojs,
+        mongodb: require('mongodb'),
         '../User/UserGetter': this.UserGetter
       }
     })

services/web/test/unit/src/UserMembership/UserMembershipsHandlerTests.js

@@ -12,7 +12,7 @@
  */
 const sinon = require('sinon')
 const assertCalledWith = sinon.assert.calledWith
-const { ObjectId } = require('../../../../app/src/infrastructure/mongojs')
+const { ObjectId } = require('mongodb')
 const modulePath =
   '../../../../app/src/Features/UserMembership/UserMembershipsHandler'
 const SandboxedModule = require('sandboxed-module')