Merge pull request #9160 from AbdelrahmanHafez/gh-9157

fix(model): fix conflicting $setOnInsert default values with `update` values in bulkWrite

Author: vkarpov15

lib/helpers/setDefaultsOnInsert.js

@@ -1,6 +1,6 @@
 'use strict';
-
 const modifiedPaths = require('./common').modifiedPaths;
+const get = require('./get');
 
 /**
  * Applies defaults to update and findOneAndUpdate operations.
@@ -95,7 +95,9 @@ module.exports = function(filter, schema, castedDoc, options) {
       if (!isModified(modified, path) && typeof def !== 'undefined') {
         castedDoc = castedDoc || {};
         castedDoc.$setOnInsert = castedDoc.$setOnInsert || {};
-        castedDoc.$setOnInsert[path] = def;
+        if (get(castedDoc, path) == null) {
+          castedDoc.$setOnInsert[path] = def;
+        }
         updatedValues[path] = def;
       }
     }

test/model.test.js

@@ -6805,7 +6805,7 @@ describe('Model', function() {
     });
   });
 
-  it('Model#bulkWrite(...) does not throw an error when provided an empty array (gh-9131)', function() {
+  it('Model.bulkWrite(...) does not throw an error when provided an empty array (gh-9131)', function() {
     return co(function*() {
       const userSchema = new Schema();
       const User = db.model('User', userSchema);
@@ -6839,4 +6839,33 @@ describe('Model', function() {
       );
     });
   });
+
+  it('Model.bulkWrite(...) does not throw an error with upsert:true, setDefaultsOnInsert: true (gh-9157)', function() {
+    return co(function*() {
+      const userSchema = new Schema(
+        {
+          friends: [String],
+          age: { type: Number, default: 25 }
+        },
+        { timestamps: true }
+      );
+      const User = db.model('User', userSchema);
+
+      yield User.bulkWrite([
+        {
+          updateOne: {
+            filter: { },
+            update: { friends: ['Sam'] },
+            upsert: true,
+            setDefaultsOnInsert: true
+          }
+        }
+      ]);
+
+      const user = yield User.findOne().sort({ _id: -1 });
+
+      assert.equal(user.age, 25);
+      assert.deepEqual(user.friends, ['Sam']);
+    });
+  });
 });