refactor: remove not-useful castDoc() helper re: #11559

Automattic · Apr 10, 2022 · 888f116 · 888f116
1 parent 6611203
commit 888f116
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 24 deletions.
diff --git a/lib/helpers/query/castUpdate.js b/lib/helpers/query/castUpdate.js
@@ -47,7 +47,7 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
   } else if (!options.overwriteDiscriminatorKey) {
     delete obj[schema.options.discriminatorKey];
   }
-  if (options.upsert) {
+  if (options.upsert && !options.overwrite) {
     moveImmutableProperties(schema, obj, context);
   }
 
@@ -217,6 +217,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
       }
 
       if (op !== '$setOnInsert' &&
+          !options.overwrite &&
           handleImmutable(schematype, strict, obj, key, prefix + key, context)) {
         continue;
       }
@@ -311,6 +312,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
 
       // You can use `$setOnInsert` with immutable keys
       if (op !== '$setOnInsert' &&
+          !options.overwrite &&
           handleImmutable(schematype, strict, obj, key, prefix + key, context)) {
         continue;
       }

diff --git a/lib/helpers/update/applyTimestampsToChildren.js b/lib/helpers/update/applyTimestampsToChildren.js
@@ -15,7 +15,7 @@ function applyTimestampsToChildren(now, update, schema) {
   }
 
   const keys = Object.keys(update);
-  const hasDollarKey = keys.some(key => key.startsWith('$'));
+  const hasDollarKey = keys.some(key => key[0] === '$');
 
   if (hasDollarKey) {
     if (update.$push) {
@@ -38,7 +38,7 @@ function applyTimestampsToChildren(now, update, schema) {
     }
   }
 
-  const updateKeys = Object.keys(update).filter(key => !key.startsWith('$'));
+  const updateKeys = Object.keys(update).filter(key => key[0] !== '$');
   for (const key of updateKeys) {
     applyTimestampsToUpdateKey(schema, key, update, now);
   }

diff --git a/lib/helpers/update/applyTimestampsToUpdate.js b/lib/helpers/update/applyTimestampsToUpdate.js
@@ -80,7 +80,6 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
   }
 
   if (!skipCreatedAt && createdAt) {
-
     if (currentUpdate[createdAt]) {
       delete currentUpdate[createdAt];
     }

diff --git a/lib/query.js b/lib/query.js
@@ -3737,15 +3737,15 @@ Query.prototype._findOneAndReplace = wrapThunk(function(callback) {
   const runValidators = _getOption(this, 'runValidators', false);
   if (runValidators === false) {
     try {
-      this._castUpdate(this._update, true);
+      this._update = this._castUpdate(this._update, true);
     } catch (err) {
       const validationError = new ValidationError();
       validationError.errors[err.path] = err;
       callback(validationError);
       return null;
     }
 
-    this._collection.collection.findOneAndReplace(filter, this._update, options, _wrapThunkCallback(this, (err, res) => {
+    this._collection.collection.findOneAndReplace(filter, this._update || {}, options, _wrapThunkCallback(this, (err, res) => {
       if (err) {
         return callback(err);
       }
@@ -3884,7 +3884,11 @@ Query.prototype._findAndModify = function(type, callback) {
     }
 
     if (!isOverwriting) {
-      this._update = castDoc(this, opts.overwrite);
+      try {
+        this._update = this._castUpdate(this._update, opts.overwrite);
+      } catch (err) {
+        return callback(err);
+      }
       const _opts = Object.assign({}, opts, {
         setDefaultsOnInsert: this._mongooseOptions.setDefaultsOnInsert
       });
@@ -4079,10 +4083,10 @@ function _updateThunk(op, callback) {
     }
     this._update = new this.model(this._update, null, true);
   } else {
-    this._update = castDoc(this, options.overwrite);
-
-    if (this._update instanceof Error) {
-      callback(this._update);
+    try {
+      this._update = this._castUpdate(this._update, options.overwrite);
+    } catch (err) {
+      callback(err);
       return null;
     }
 
@@ -4921,19 +4925,6 @@ function castQuery(query) {
   }
 }
 
-/*!
- * castDoc
- * @api private
- */
-
-function castDoc(query, overwrite) {
-  try {
-    return query._castUpdate(query._update, overwrite);
-  } catch (err) {
-    return err;
-  }
-}
-
 /**
  * Specifies paths which should be populated with other documents.
  *