Merge pull request #364 from sarkistlt/patch-1

update '_remove' method

Author: marshallswain

lib/service.js

@@ -304,33 +304,32 @@ class Service extends AdapterService {
       query.collation = params.collation;
     }
 
-    if (id !== null) {
-      query.$and = (query.$and || []).concat({ [this.id]: id });
-
-      return this.Model.findOneAndDelete(query, params.mongoose).lean(this.lean)
-        .exec().then(result => {
-          if (result === null) {
-            throw new errors.NotFound(`No record found for id '${id}'`, query);
-          }
-
-          return result;
-        }).then(select(params, this.id)).catch(errorHandler);
-    }
-
     const findParams = Object.assign({}, params, {
       paginate: false,
       query
     });
 
+    if (id !== null) {
+      query.$and = (query.$and || []).concat({ [this.id]: id });
+    }
+
     // NOTE (EK): First fetch the record(s) so that we can return
     // it/them when we delete it/them.
-    return this._getOrFind(id, findParams).then(data =>
-      this.Model.deleteMany(query, params.mongoose)
+    return this._getOrFind(id, findParams).then((data) => {
+      if (id !== null) {
+        return this.Model.deleteOne(query, params.mongoose)
+          .lean(this.lean)
+          .exec()
+          .then(() => data)
+          .then(select(params, this.id));
+      }
+
+      return this.Model.deleteMany(query, params.mongoose)
         .lean(this.lean)
         .exec()
         .then(() => data)
-        .then(select(params, this.id))
-    ).catch(errorHandler);
+        .then(select(params, this.id));
+    }).catch(errorHandler);
   }
 }