refactor: gloal replacement of bson

src/app/models/__tests__/admin_feedback.server.model.spec.ts

@@ -1,5 +1,5 @@
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { omit } from 'lodash'
 import mongoose from 'mongoose'
 

src/app/models/__tests__/encrypt-submission.server.model.spec.ts

@@ -1,5 +1,5 @@
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { pick, times } from 'lodash'
 import moment from 'moment-timezone'
 import mongoose from 'mongoose'

src/app/models/__tests__/form.server.model.spec.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { generateDefaultField } from '__tests__/unit/backend/helpers/generate-form-data'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { cloneDeep, map, merge, omit, orderBy, pick, range } from 'lodash'
 import mongoose, { Types } from 'mongoose'
 import {

src/app/models/__tests__/form_feedback.server.model.spec.ts

@@ -1,5 +1,5 @@
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { omit } from 'lodash'
 import mongoose from 'mongoose'
 

src/app/models/__tests__/form_issue.server.model.spec.ts

@@ -1,5 +1,5 @@
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { omit } from 'lodash'
 import mongoose from 'mongoose'
 

src/app/models/__tests__/form_statistics_total.server.model.spec.ts

@@ -1,5 +1,5 @@
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import mongoose from 'mongoose'
 
 import getFormStatisticsTotalModel from 'src/app/models/form_statistics_total.server.model'

src/app/models/__tests__/login.server.model.spec.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { omit } from 'lodash'
 import moment from 'moment-timezone'
 import mongoose from 'mongoose'

src/app/modules/admin-feedback/__tests__/admin_feedback.service.spec.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import mongoose from 'mongoose'
 
 import getAdminFeedbackModel from 'src/app/models/admin_feedback.server.model'

src/app/modules/auth/__tests__/auth.service.spec.ts

@@ -1,5 +1,5 @@
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import mongoose from 'mongoose'
 import { err, errAsync, ok, okAsync } from 'neverthrow'
 

src/app/modules/billing/__tests__/billing.controller.spec.ts

@@ -1,5 +1,5 @@
 import expressHandler from '__tests__/unit/backend/helpers/jest-express'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import moment from 'moment-timezone'
 import { errAsync, okAsync } from 'neverthrow'
 

src/app/modules/feedback/__tests__/feedback.service.spec.ts

@@ -1,5 +1,5 @@
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { compareAsc } from 'date-fns'
 import { omit, times } from 'lodash'
 import moment from 'moment-timezone'

src/app/modules/form/__tests__/form.utils.spec.ts

@@ -1,5 +1,5 @@
 import { generateDefaultField } from '__tests__/unit/backend/helpers/generate-form-data'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { Types } from 'mongoose'
 
 import { FormFieldSchema } from 'src/types'

src/app/modules/form/admin-form/__tests__/admin-form.issue.controller.spec.ts

@@ -1,4 +1,4 @@
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { StatusCodes } from 'http-status-codes'
 import { errAsync, okAsync } from 'neverthrow'
 import { PassThrough } from 'stream'

src/app/modules/form/admin-form/__tests__/admin-form.payments.service.spec.ts

@@ -1,4 +1,4 @@
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import mongoose from 'mongoose'
 import {
   PaymentsProductUpdateDto,

src/app/modules/form/admin-form/__tests__/admin-form.service.spec.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { generateDefaultField } from '__tests__/unit/backend/helpers/generate-form-data'
 import { PresignedPost } from 'aws-sdk/clients/s3'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { assignIn, cloneDeep, merge, omit, pick } from 'lodash'
 import mongoose from 'mongoose'
 import { err, errAsync, ok, okAsync } from 'neverthrow'

src/app/modules/form/admin-form/__tests__/admin-form.utils.spec.ts

@@ -1,5 +1,5 @@
 import { generateDefaultField } from '__tests__/unit/backend/helpers/generate-form-data'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { cloneDeep, omit, tail } from 'lodash'
 
 import { EditFieldActions } from 'src/shared/constants'

src/app/modules/form/admin-form/admin-form.controller.ts

@@ -1,6 +1,6 @@
 import JoiDate from '@joi/date'
 import axios from 'axios'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { celebrate, Joi as BaseJoi, Segments } from 'celebrate'
 import { AuthedSessionData } from 'express-session'
 import { StatusCodes } from 'http-status-codes'

src/app/modules/form/public-form/__tests__/public-form.controller.spec.ts

@@ -1,6 +1,6 @@
 import expressHandler from '__tests__/unit/backend/helpers/jest-express'
 import { IPersonResponse } from '@opengovsg/myinfo-gov-client'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { Request } from 'express'
 import { err, errAsync, ok, okAsync } from 'neverthrow'
 

src/app/modules/form/public-form/__tests__/public-form.service.spec.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import mongoose from 'mongoose'
 import type { PartialDeep } from 'type-fest'
 

src/app/modules/issue/__tests__/issue.controller.spec.ts

@@ -1,5 +1,5 @@
 import expressHandler from '__tests__/unit/backend/helpers/jest-express'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { merge, omit } from 'lodash'
 import { err, errAsync, ok, okAsync } from 'neverthrow'
 

src/app/modules/issue/issue.service.ts

@@ -1,4 +1,4 @@
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { isEmpty } from 'lodash'
 import moment from 'moment-timezone'
 import mongoose, { Cursor as QueryCursor, QueryOptions } from 'mongoose'

src/app/modules/myinfo/__tests__/myinfo.service.spec.ts

@@ -2,7 +2,7 @@
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
 import { MyInfoGovClient } from '@opengovsg/myinfo-gov-client'
 import bcrypt from 'bcrypt'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import jwt from 'jsonwebtoken'
 import mongoose from 'mongoose'
 import { v4 as uuidv4 } from 'uuid'

src/app/modules/submission/encrypt-submission/__tests__/encrypt-submission.controller.spec.ts

@@ -1,5 +1,5 @@
 import expressHandler from '__tests__/unit/backend/helpers/jest-express'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { StatusCodes } from 'http-status-codes'
 import { err, errAsync, ok, okAsync } from 'neverthrow'
 

src/app/modules/submission/encrypt-submission/__tests__/encrypt-submission.service.spec.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { clone, omit } from 'lodash'
 import mongoose from 'mongoose'
 import { errAsync, okAsync } from 'neverthrow'

src/app/modules/submission/encrypt-submission/__tests__/encrypt-submission.utils.spec.ts

@@ -1,4 +1,4 @@
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { readFileSync } from 'fs'
 import { cloneDeep } from 'lodash'
 import moment from 'moment-timezone'

src/app/routes/api/v3/admin/forms/__tests__/admin-forms.logic.routes.spec.ts

@@ -1,7 +1,7 @@
 import { createAuthedSession } from '__tests__/integration/helpers/express-auth'
 import { setupApp } from '__tests__/integration/helpers/express-setup'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import mongoose from 'mongoose'
 import supertest, { Session } from 'supertest-session'
 

src/app/routes/api/v3/admin/forms/__tests__/admin-forms.presign.routes.spec.ts

@@ -3,7 +3,7 @@ import { createAuthedSession } from '__tests__/integration/helpers/express-auth'
 import { setupApp } from '__tests__/integration/helpers/express-setup'
 import { buildCelebrateError } from '__tests__/unit/backend/helpers/celebrate'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import mongoose from 'mongoose'
 import SparkMD5 from 'spark-md5'
 import supertest, { Session } from 'supertest-session'

src/app/routes/api/v3/admin/forms/__tests__/admin-forms.preview.routes.spec.ts

@@ -11,7 +11,7 @@ import {
 } from '__tests__/unit/backend/helpers/generate-form-data'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
 import { jsonParseStringify } from '__tests__/unit/backend/helpers/serialize-data'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { omit } from 'lodash'
 import mongoose from 'mongoose'
 import supertest, { Session } from 'supertest-session'

src/app/routes/api/v3/admin/forms/__tests__/admin-forms.twilio.routes.spec.ts

@@ -4,7 +4,7 @@ import {
 } from '__tests__/integration/helpers/express-auth'
 import { setupApp } from '__tests__/integration/helpers/express-setup'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import mongoose from 'mongoose'
 import { errAsync } from 'neverthrow'
 import supertest, { Session } from 'supertest-session'

src/app/routes/api/v3/corppass/__tests__/corppass.routes.spec.ts

@@ -1,5 +1,5 @@
 import { setupApp } from '__tests__/integration/helpers/express-setup'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import fs from 'fs'
 import { JWTVerifyResult } from 'jose'
 import mongoose from 'mongoose'

src/app/routes/api/v3/forms/__tests__/public-forms.auth.routes.spec.ts

@@ -2,7 +2,7 @@ import { setupApp } from '__tests__/integration/helpers/express-setup'
 import { buildCelebrateError } from '__tests__/unit/backend/helpers/celebrate'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
 import { jsonParseStringify } from '__tests__/unit/backend/helpers/serialize-data'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { StatusCodes } from 'http-status-codes'
 import { err, errAsync } from 'neverthrow'
 import supertest, { Session } from 'supertest-session'

src/app/routes/api/v3/forms/__tests__/public-forms.form.routes.spec.ts

@@ -1,7 +1,7 @@
 import { setupApp } from '__tests__/integration/helpers/express-setup'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
 import MyInfoClient, { IMyInfoConfig } from '@opengovsg/myinfo-gov-client'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import jwt from 'jsonwebtoken'
 import { errAsync } from 'neverthrow'
 import supertest, { Session } from 'supertest-session'

src/app/routes/api/v3/forms/__tests__/public-forms.verification.routes.spec.ts

@@ -4,7 +4,7 @@ import MockTwilio from '__tests__/integration/helpers/twilio'
 import { generateDefaultField } from '__tests__/unit/backend/helpers/generate-form-data'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
 import bcrypt from 'bcrypt'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { subMinutes, subYears } from 'date-fns'
 import { StatusCodes } from 'http-status-codes'
 import _ from 'lodash'

src/app/routes/api/v3/singpass/__tests/singpass.routes.spec.ts

@@ -1,5 +1,5 @@
 import { setupApp } from '__tests__/integration/helpers/express-setup'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { JWTVerifyResult } from 'jose'
 import mongoose from 'mongoose'
 import session, { Session } from 'supertest-session'

src/app/routes/api/v3/user/__tests__/user.routes.spec.ts

@@ -2,7 +2,7 @@ import { createAuthedSession } from '__tests__/integration/helpers/express-auth'
 import { setupApp } from '__tests__/integration/helpers/express-setup'
 import { buildCelebrateError } from '__tests__/unit/backend/helpers/celebrate'
 import dbHandler from '__tests__/unit/backend/helpers/jest-db'
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 import { pick } from 'lodash'
 import mongoose from 'mongoose'
 import { errAsync, okAsync } from 'neverthrow'

src/shared/util/__tests__/logic.spec.ts

@@ -1,4 +1,4 @@
-import { ObjectId } from 'bson-ext'
+import { ObjectId } from 'bson'
 
 import {
   getApplicableIfFields,