Kotlin class support for findOneAndUpdate in CoroutineCollection

kmongo-coroutine-core-tests/src/main/kotlin/org/litote/kmongo/coroutine/ReactiveStreamsFindOneAndModifyTest.kt

@@ -24,6 +24,7 @@ import org.bson.Document
 import org.bson.types.ObjectId
 import org.junit.Test
 import org.litote.kmongo.MongoOperator
+import org.litote.kmongo.eq
 import org.litote.kmongo.json
 import org.litote.kmongo.model.ExposableFriend
 import org.litote.kmongo.model.Friend
@@ -57,6 +58,28 @@ class ReactiveStreamsFindOneAndModifyTest : KMongoReactiveStreamsCoroutineBaseTe
         }
     }
 
+    @Test
+    fun `can find and update with kotlin class`() = runBlocking {
+        col.insertOne(Friend("John", "22 Wall Street Avenue"))
+        col.findOneAndUpdate(Friend::name eq "John", Friend("John", "A better place"))
+            ?: throw AssertionError("Value cannot null!")
+        val savedFriend = col.findOne("{name:'John'}") ?: throw AssertionError("Value cannot null!")
+        assertEquals("John", savedFriend.name)
+        assertEquals("A better place", savedFriend.address)
+    }
+
+    @Test
+    fun `can find and update with kotlin class in ClientSession`() = runBlocking {
+        mongoClient.startSession().use {
+            col.insertOne(it, Friend("John", "22 Wall Street Avenue"))
+            col.findOneAndUpdate(it, Friend::name eq "John", Friend("John", "A better place"))
+                ?: throw AssertionError("Value cannot null!")
+            val savedFriend = col.findOne(it, "{name:'John'}") ?: throw AssertionError("Value cannot null!")
+            assertEquals("John", savedFriend.name)
+            assertEquals("A better place", savedFriend.address)
+        }
+    }
+
     @Test
     fun canFindAndUpdateWithNullValue() = runBlocking {
         col.insertOne(Friend("John", "22 Wall Street Avenue"))
@@ -145,4 +168,4 @@ class ReactiveStreamsFindOneAndModifyTest : KMongoReactiveStreamsCoroutineBaseTe
             assertEquals(1, countBobs)
         }
     }
-}
+}

kmongo-coroutine-core/src/main/kotlin/org/litote/kmongo/coroutine/CoroutineCollection.kt

@@ -764,6 +764,42 @@ class CoroutineCollection<T : Any>(val collection: MongoCollection<T>) {
         options: FindOneAndUpdateOptions = FindOneAndUpdateOptions()
     ): T? = collection.findOneAndUpdate(clientSession, filter, update, options).awaitFirstOrNull()
 
+    /**
+     * Atomically find a document and update it.
+     *
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param update  a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param options the options to apply to the operation
+     * @return the document that was updated.  Depending on the value of the `returnOriginal`
+     * property, this will either be the document as it was before the update or as it is after the update.  If no documents matched the
+     * query filter, then null will be returned
+     */
+    suspend fun findOneAndUpdate(
+        filter: Bson,
+        update: T,
+        options: FindOneAndUpdateOptions = FindOneAndUpdateOptions()
+    ): T? = collection.findOneAndUpdate(filter, toBsonModifier(update), options).awaitFirstOrNull()
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param update  a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param options the options to apply to the operation
+     * @return a publisher with a single element the document that was updated.  Depending on the value of the `returnOriginal`
+     * property, this will either be the document as it was before the update or as it is after the update.  If no documents matched the
+     * query filter, then null will be returned
+     * @mongodb.server.release 3.6
+     * @since 1.7
+     */
+    suspend fun findOneAndUpdate(
+        clientSession: ClientSession,
+        filter: Bson,
+        update: T,
+        options: FindOneAndUpdateOptions = FindOneAndUpdateOptions()
+    ): T? = collection.findOneAndUpdate(clientSession, filter, toBsonModifier(update), options).awaitFirstOrNull()
+
     /**
      * Drops this collection from the Database.
      *