feat(API): Upgrade to the Mongo 3 Node.js Driver (LLC-473) (#326)

Author: PrinceWaune

package-lock.json

@@ -44,7 +44,7 @@
     "fs-extra": "^5.0.0",
     "jscommons": "^2.4.14",
     "lodash": "^4.17.4",
-    "mongodb": "^2.2.26",
+    "mongodb": "^3.6.2",
     "node-fetch": "^1.6.3",
     "promise-retry": "^1.1.1",
     "rulr": "^4.0.0",
@@ -64,7 +64,7 @@
     "@types/fs-extra": "5.1.0",
     "@types/lodash": "4.14.157",
     "@types/mocha": "5.2.7",
-    "@types/mongodb": "2.2.26",
+    "@types/mongodb": "^3.5.27",
     "@types/node": "9.6.56",
     "@types/node-fetch": "1.6.9",
     "@types/source-map-support": "0.5.2",
@@ -84,7 +84,7 @@
     "tslint": "5.20.1",
     "tslint-consistent-codestyle": "1.16.0",
     "tslint-immutable": "4.9.1",
-    "typescript": "2.8.4"
+    "typescript": "^4.0.3"
   },
   "publishConfig": {
     "access": "public"

package.json

@@ -6,13 +6,20 @@ import getBooleanOption from 'jscommons/dist/config/getBooleanOption';
 import getNumberOption from 'jscommons/dist/config/getNumberOption';
 import getStringOption from 'jscommons/dist/config/getStringOption';
 import { defaultTo } from 'lodash';
-import { MongoClientOptions, ReadPreference } from 'mongodb';
+import {
+  MongoClientOptions,
+  ReadPreference,
+  ReadPreferenceMode,
+} from 'mongodb';
 import * as os from 'os';
 
 const DEFAULT_TIMEOUT_MS = 300000; // 5 minutes.
 
 const getMongoReadPreference = (readPrefMode = 'primary'): ReadPreference => {
-  const mode = ReadPreference.isValid(readPrefMode) ? readPrefMode : 'primary';
+  const mode = (
+    ReadPreference.isValid(readPrefMode) ? readPrefMode : 'primary'
+  ) as ReadPreferenceMode;
+
   return new ReadPreference(mode, []);
 };
 

src/config.ts

@@ -11,12 +11,11 @@ import {
 
 export default (config: Config) => {
   return async ({personaId, organisation}: DeletePersonaOptions): Promise<void> => {
+    const db = await config.db;
 
-    const collection = (await config.db).collection(PERSONAS_COLLECTION);
-    const personaIdentifiersCollection = (await config.db)
-    .collection(PERSONA_IDENTIFIERS_COLLECTION);
-    const personaAttributesCollection = (await config.db)
-    .collection(PERSONA_ATTRIBUTES_COLLECTION);
+    const collection = db.collection(PERSONAS_COLLECTION);
+    const personaIdentifiersCollection = db.collection(PERSONA_IDENTIFIERS_COLLECTION);
+    const personaAttributesCollection = db.collection(PERSONA_ATTRIBUTES_COLLECTION);
 
     const orgFilter = {
       organisation: new ObjectID(organisation),

src/mongoModelsRepo/deletePersona.ts

@@ -1,8 +1,6 @@
 import { ObjectID } from 'mongodb';
 import NoModelWithId from '../errors/NoModelWithId';
 import DeletePersonaAttributeOptions from '../repoFactory/options/DeletePersonaAttributeOptions';
-import _DeletePersonaAttributeOptions from // tslint:disable-line:no-unused import-spacing
-  '../serviceFactory/options/DeletePersonaAttributeOptions';
 import Config from './Config';
 import { PERSONA_ATTRIBUTES_COLLECTION } from './utils/constants/collections';
 

src/mongoModelsRepo/deletePersonaAttribute.ts

@@ -1,8 +1,6 @@
 import { ObjectID } from 'mongodb';
 import NoModelWithId from '../errors/NoModelWithId';
 import DeletePersonaIdentifierOptions from '../repoFactory/options/DeletePersonaIdentifierOptions';
-import _DeletePersonaIdentifierOptions from // tslint:disable-line:no-unused import-spacing
-  '../serviceFactory/options/DeletePersonaIdentifierOptions';
 import Config from './Config';
 import { PERSONA_IDENTIFIERS_COLLECTION } from './utils/constants/collections';
 

src/mongoModelsRepo/deletePersonaIdentifier.ts

@@ -2,10 +2,6 @@ import NoModel from 'jscommons/dist/errors/NoModel';
 import { ObjectID } from 'mongodb';
 import GetAttributeOptions from '../repoFactory/options/GetAttributeOptions';
 import GetAttributeResult from '../repoFactory/results/GetAttributeResult';
-import _GetAttributeOptions from // tslint:disable-line:import-spacing no-unused
-  '../serviceFactory/options/GetAttributeOptions';
-import _GetAttributeResult from // tslint:disable-line:import-spacing no-unused
-  '../serviceFactory/results/GetAttributeResult';
 import Config from './Config';
 import { PERSONA_ATTRIBUTES_COLLECTION } from './utils/constants/collections';
 

src/mongoModelsRepo/getAttribute.ts

@@ -1,10 +1,6 @@
 import Attribute from '../models/Attribute';
 import GetAttributesOptions from '../repoFactory/options/GetAttributesOptions';
 import GetAttributesResult from '../repoFactory/results/GetAttributesResult';
-// tslint:disable-next-line:no-unused
-import GetOptions, { CursorDirection } from '../serviceFactory/utils/GetOptions';
-// tslint:disable-next-line:no-unused
-import PaginationResult from '../serviceFactory/utils/PaginationResult';
 import Config from './Config';
 import pagination from './utils/pagination';
 

src/mongoModelsRepo/getAttributes.ts

@@ -1,10 +1,6 @@
 import Identifier from '../models/Identifier';
 import GetIdentifiersOptions from '../repoFactory/options/GetIdentifiersOptions';
 import GetIdentifiersResult from '../repoFactory/results/GetIdentifiersResult';
-// tslint:disable-next-line:no-unused
-import GetOptions, { CursorDirection } from '../serviceFactory/utils/GetOptions';
-// tslint:disable-next-line:no-unused
-import PaginationResult from '../serviceFactory/utils/PaginationResult';
 import Config from './Config';
 import pagination from './utils/pagination';
 

src/mongoModelsRepo/getIdentifiers.ts

@@ -3,12 +3,6 @@ import GetPersonaAttributeCountOptions from // tslint:disable-line:import-spacin
   '../repoFactory/options/GetPersonaAttributeCountOptions';
 import GetPersonaAttributeCountResult from // tslint:disable-line:import-spacing
   '../repoFactory/results/GetPersonaAttributeCountResult';
-// tslint:disable-next-line:no-unused import-spacing
-import _GetPersonaAttributeCountOptions from
-  '../serviceFactory/options/GetPersonaAttributeCountOptions';
-// tslint:disable-next-line:no-unused import-spacing
-import _GetPersonaAttributeCountResult from
-  '../serviceFactory/results/GetPersonaAttributeCountResult';
 import Config from './Config';
 import { PERSONA_ATTRIBUTES_COLLECTION } from './utils/constants/collections';