make bulk write error conform to crud spec test expectations

Author: HanaPearlman

src/bulk/common.ts

@@ -668,13 +668,36 @@ function handleMongoWriteConcernError(
 export class MongoBulkWriteError extends MongoError {
   result?: BulkWriteResult;
 
-  /** Creates a new BulkWriteError */
+  /** Number of documents inserted. */
+  insertedCount?: number;
+  /** Number of documents matched for update. */
+  matchedCount?: number;
+  /** Number of documents modified. */
+  modifiedCount?: number;
+  /** Number of documents deleted. */
+  deletedCount?: number;
+  /** Number of documents upserted. */
+  upsertedCount?: number;
+  /** Inserted document generated Id's, hash key is the index of the originating operation */
+  insertedIds?: { [key: number]: ObjectId };
+  /** Upserted document generated Id's, hash key is the index of the originating operation */
+  upsertedIds?: { [key: number]: ObjectId };
+
+  /** Creates a new MongoBulkWriteError */
   constructor(error?: AnyError, result?: BulkWriteResult) {
     super(error as Error);
     Object.assign(this, error);
 
     this.name = 'MongoBulkWriteError';
     this.result = result;
+
+    this.insertedCount = result?.insertedCount;
+    this.matchedCount = result?.matchedCount;
+    this.modifiedCount = result?.modifiedCount || 0;
+    this.deletedCount = result?.deletedCount;
+    this.upsertedCount = result?.upsertedCount;
+    this.insertedIds = result?.insertedIds;
+    this.upsertedIds = result?.upsertedIds;
   }
 }
 

test/functional/crud_spec.test.js

@@ -6,8 +6,6 @@ const chai = require('chai');
 const expect = chai.expect;
 chai.use(require('chai-subset'));
 
-const { MongoBulkWriteError } = require('../../src/bulk/common');
-
 const TestRunnerContext = require('./spec-runner').TestRunnerContext;
 const gatherTestSuites = require('./spec-runner').gatherTestSuites;
 const generateTopologyTests = require('./spec-runner').generateTopologyTests;
@@ -111,36 +109,6 @@ describe('CRUD spec', function () {
     });
   });
 
-  function transformBulkWriteResult(result) {
-    const r = {};
-    r.insertedCount = result.nInserted;
-    r.matchedCount = result.nMatched;
-    r.modifiedCount = result.nModified || 0;
-    r.deletedCount = result.nRemoved;
-    r.upsertedCount = result.getUpsertedIds().length;
-    r.upsertedIds = {};
-    r.insertedIds = {};
-
-    // Update the n
-    r.n = r.insertedCount;
-
-    // Inserted documents
-    const inserted = result.getInsertedIds();
-    // Map inserted ids
-    for (let i = 0; i < inserted.length; i++) {
-      r.insertedIds[inserted[i].index] = inserted[i]._id;
-    }
-
-    // Upserted documents
-    const upserted = result.getUpsertedIds();
-    // Map upserted ids
-    for (let i = 0; i < upserted.length; i++) {
-      r.upsertedIds[upserted[i].index] = upserted[i]._id;
-    }
-
-    return r;
-  }
-
   function invert(promise) {
     return promise.then(
       () => {
@@ -152,11 +120,6 @@ describe('CRUD spec', function () {
 
   function assertWriteExpectations(collection, outcome) {
     return function (result) {
-      // TODO: when we fix our bulk write errors, get rid of this
-      if (result instanceof MongoBulkWriteError) {
-        result = transformBulkWriteResult(result.result);
-      }
-
       Object.keys(outcome.result).forEach(resultName => {
         expect(result).to.have.property(resultName);
         if (resultName === 'upsertedId') {