COMPASS-4345: Add findOneAndUpdate

lib/data-service.js

@@ -324,6 +324,19 @@ class DataService extends EventEmitter {
     this.client.findOneAndReplace(ns, filter, replacement, options, callback);
   }
 
+  /**
+   * Find one document and update it with the update operations.
+   *
+   * @param {String} ns - The namespace to search on.
+   * @param {Object} filter - The filter.
+   * @param {Object} update - The update operations doc.
+   * @param {Object} options - The query options.
+   * @param {Function} callback - The callback.
+   */
+  findOneAndUpdate(ns, filter, update, options, callback) {
+    this.client.findOneAndUpdate(ns, filter, update, options, callback);
+  }
+
   /**
    * Returns explain plan for the provided filter and options on the collection.
    *

lib/native-client.js

@@ -629,6 +629,29 @@ class NativeClient extends EventEmitter {
     );
   }
 
+  /**
+   * Find one document and update it with the update operations.
+   *
+   * @param {String} ns - The namespace to search on.
+   * @param {Object} filter - The filter.
+   * @param {Object} update - The update operations doc.
+   * @param {Object} options - The query options.
+   * @param {Function} callback - The callback.
+   */
+  findOneAndUpdate(ns, filter, update, options, callback) {
+    this._collection(ns).findOneAndUpdate(
+      filter,
+      update,
+      options,
+      (error, result) => {
+        if (error) {
+          return callback(this._translateMessage(error));
+        }
+        callback(null, result.value);
+      }
+    );
+  }
+
   /**
    * Returns explain plan for the provided filter and options on the collection.
    *

test/data-service.test.js

@@ -317,6 +317,51 @@ describe('DataService', function() {
     });
   });
 
+  describe('#findOneAndUpdate', function() {
+    after(function(done) {
+      helper.deleteTestDocuments(service.client, function() {
+        done();
+      });
+    });
+
+    var id = new ObjectId();
+
+    it('returns the updated document', function(done) {
+      service.insertOne(
+        'data-service.test',
+        {
+          _id: id,
+          a: 500
+        },
+        {},
+        function(err) {
+          assert.equal(null, err);
+          service.findOneAndUpdate(
+            'data-service.test',
+            {
+              _id: id
+            },
+            {
+              $set: {
+                b: 5
+              }
+            },
+            {
+              returnOriginal: false
+            },
+            function(error, result) {
+              expect(error).to.equal(null);
+              expect(result._id.toString()).to.deep.equal(id.toString());
+              expect(result.b).to.equal(5);
+              expect(result.hasOwnProperty('a')).to.equal(true);
+              done();
+            }
+          );
+        }
+      );
+    });
+  });
+
   describe('#collection', function() {
     it('returns the collection details', function(done) {
       service.collection('data-service.test', {}, function(err, coll) {