fix(query): correctly return full deleteOne(), deleteMany() result

Fix #11211
Automattic · Feb 27, 2022 · 601650a · AbdelrahmanHafez · Feb 27, 2022 · vkarpov15
1 parent dd44992
commit 601650a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/lib/query.js b/lib/query.js
@@ -2980,7 +2980,7 @@ Query.prototype._remove = wrapThunk(function(callback) {
 
   callback = _wrapThunkCallback(this, callback);
 
-  return Query.base.remove.call(this, helpers.handleDeleteWriteOpResult(callback));
+  return Query.base.remove.call(this, callback);
 });
 
 /**
@@ -3066,7 +3066,7 @@ Query.prototype._deleteOne = wrapThunk(function(callback) {
 
   callback = _wrapThunkCallback(this, callback);
 
-  return Query.base.deleteOne.call(this, helpers.handleDeleteWriteOpResult(callback));
+  return Query.base.deleteOne.call(this, callback);
 });
 
 /**
@@ -3152,7 +3152,7 @@ Query.prototype._deleteMany = wrapThunk(function(callback) {
 
   callback = _wrapThunkCallback(this, callback);
 
-  return Query.base.deleteMany.call(this, helpers.handleDeleteWriteOpResult(callback));
+  return Query.base.deleteMany.call(this, callback);
 });
 
 /*!

diff --git a/lib/queryhelpers.js b/lib/queryhelpers.js
@@ -308,23 +308,3 @@ function makeLean(val) {
     option.options.lean = val;
   };
 }
-
-/*!
- * Handle the `WriteOpResult` from the server
- */
-
-exports.handleDeleteWriteOpResult = function handleDeleteWriteOpResult(callback) {
-  return function _handleDeleteWriteOpResult(error, res) {
-    if (error) {
-      return callback(error);
-    }
-    const mongooseResult = Object.assign({}, res.result);
-    if ((res && res.result && res.result.n || null) != null) {
-      mongooseResult.deletedCount = res.result.n;
-    }
-    if (res.deletedCount != null) {
-      mongooseResult.deletedCount = res.deletedCount;
-    }
-    return callback(null, mongooseResult);
-  };
-};