refactor: consolidate .mongoose property creation into helper

Re: Automattic#15265

Author: vkarpov15

lib/connection.js

@@ -23,6 +23,7 @@ const CreateCollectionsError = require('./error/createCollectionsError');
 const castBulkWrite = require('./helpers/model/castBulkWrite');
 const { modelSymbol } = require('./helpers/symbols');
 const isPromise = require('./helpers/isPromise');
+const decorateBulkWriteResult = require('./helpers/model/decorateBulkWriteResult');
 
 const arrayAtomicsSymbol = require('./helpers/symbols').arrayAtomicsSymbol;
 const sessionNewDocuments = require('./helpers/symbols').sessionNewDocuments;
@@ -561,27 +562,25 @@ Connection.prototype.bulkWrite = async function bulkWrite(ops, options) {
       }
       const BulkWriteResult = this.base.driver.get().BulkWriteResult;
       const res = new BulkWriteResult(getDefaultBulkwriteResult(), false);
-      res.mongoose = res.mongoose || {};
-      res.mongoose.validationErrors = validationErrors;
-      res.mongoose.results = results;
-      return res;
+      return decorateBulkWriteResult(res, validationErrors, results);
     }
 
     let error;
     [res, error] = await this.client.bulkWrite(validOps, options).
       then(res => ([res, null])).
       catch(err => ([null, err]));
 
+    for (let i = 0; i < validOpIndexes.length; ++i) {
+      results[validOpIndexes[i]] = null;
+    }
     if (error) {
       if (validationErrors.length > 0) {
+        decorateBulkWriteResult(error, validationErrors, results);
         error.mongoose = error.mongoose || {};
         error.mongoose.validationErrors = validationErrors;
       }
     }
 
-    for (let i = 0; i < validOpIndexes.length; ++i) {
-      results[validOpIndexes[i]] = null;
-    }
     if (validationErrors.length > 0) {
       if (options.throwOnValidationError) {
         throw new MongooseBulkWriteError(
@@ -591,9 +590,7 @@ Connection.prototype.bulkWrite = async function bulkWrite(ops, options) {
           'bulkWrite'
         );
       } else {
-        res.mongoose = res.mongoose || {};
-        res.mongoose.validationErrors = validationErrors;
-        res.mongoose.results = results;
+        decorateBulkWriteResult(res, validationErrors, results);
       }
     }
   }

lib/helpers/model/decorateBulkWriteResult.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = function decorateBulkWriteResult(resultOrError, validationErrors, results) {
+  resultOrError.mongoose = resultOrError.mongoose || {};
+  resultOrError.mongoose.validationErrors = validationErrors;
+  resultOrError.mongoose.results = results;
+  return resultOrError;
+};

lib/model.js

@@ -68,6 +68,7 @@ const utils = require('./utils');
 const minimize = require('./helpers/minimize');
 const MongooseBulkSaveIncompleteError = require('./error/bulkSaveIncompleteError');
 const ObjectExpectedError = require('./error/objectExpected');
+const decorateBulkWriteResult = require('./helpers/model/decorateBulkWriteResult');
 
 const modelCollectionSymbol = Symbol('mongoose#Model#collection');
 const modelDbSymbol = Symbol('mongoose#Model#db');
@@ -3401,9 +3402,7 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
     const BulkWriteResult = this.base.driver.get().BulkWriteResult;
     const bulkWriteResult = new BulkWriteResult(getDefaultBulkwriteResult(), false);
     bulkWriteResult.n = 0;
-    bulkWriteResult.mongoose = bulkWriteResult.mongoose || {};
-    bulkWriteResult.mongoose.validationErrors = [];
-    bulkWriteResult.mongoose.results = [];
+    decorateBulkWriteResult(bulkWriteResult, [], []);
     return bulkWriteResult;
   }
 
@@ -3478,9 +3477,7 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
       const BulkWriteResult = this.base.driver.get().BulkWriteResult;
       const bulkWriteResult = new BulkWriteResult(getDefaultBulkwriteResult(), false);
       bulkWriteResult.result = getDefaultBulkwriteResult();
-      bulkWriteResult.mongoose = bulkWriteResult.mongoose || {};
-      bulkWriteResult.mongoose.validationErrors = validationErrors;
-      bulkWriteResult.mongoose.results = results;
+      decorateBulkWriteResult(bulkWriteResult, validationErrors, results);
       return bulkWriteResult;
     }
 
@@ -3489,10 +3486,12 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
       then(res => ([res, null])).
       catch(error => ([null, error]));
 
+    for (let i = 0; i < validOpIndexes.length; ++i) {
+      results[validOpIndexes[i]] = null;
+    }
     if (error) {
       if (validationErrors.length > 0) {
-        error.mongoose = error.mongoose || {};
-        error.mongoose.validationErrors = validationErrors;
+        decorateBulkWriteResult(error, validationErrors, results);
       }
 
       await new Promise((resolve, reject) => {
@@ -3506,9 +3505,6 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
       });
     }
 
-    for (let i = 0; i < validOpIndexes.length; ++i) {
-      results[validOpIndexes[i]] = null;
-    }
     if (validationErrors.length > 0) {
       if (options.throwOnValidationError) {
         throw new MongooseBulkWriteError(
@@ -3518,9 +3514,7 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
           'bulkWrite'
         );
       } else {
-        res.mongoose = res.mongoose || {};
-        res.mongoose.validationErrors = validationErrors;
-        res.mongoose.results = results;
+        decorateBulkWriteResult(res, validationErrors, results);
       }
     }
   }