Merge pull request #289 from orlandos-nl/jw-upsert-success-check-fix-6.x

upsert success check fails for empty db
orlandos-nl · Aug 8, 2022 · f2d245e · f2d245e
2 parents 1cc5d76 + 2a2cad7
commit f2d245e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/Sources/Meow/Model.swift b/Sources/Meow/Model.swift
@@ -75,7 +75,7 @@ extension MutableModel {
     public func save(in database: MeowDatabase) -> EventLoopFuture<MeowOperationResult> {
         return database.collection(for: Self.self).upsert(self).map { reply in
             return MeowOperationResult(
-                success: reply.updatedCount == 1,
+                success: reply.updatedCount == 1 || reply.upserted != nil,
                 n: reply.updatedCount,
                 writeErrors: reply.writeErrors
             )

diff --git a/Tests/MongoKittenTests/CRUDTests.swift b/Tests/MongoKittenTests/CRUDTests.swift
@@ -520,11 +520,25 @@ class CrudTests : XCTestCase {
         XCTAssertEqual(result[1].name, "nameIndex")
     }
 
-//    func testBuildIndexes() async throws {
-//        mongo.async["test"].buildIndexes {
-//
-//        }
-//    }
+    func testBuildIndexes() async throws {
+        let async = mongo.async[DummyAccount.collectionName]
+        try await mongo.async[DummyAccount.collectionName].buildIndexes {
+            UniqueIndex(named: "unique-name", field: "name")
+        }
+
+        let dummyAccount1 = DummyAccount(name: "Dum", password: "test1", age: 1337)
+        let dummyAccount2 = DummyAccount(name: "Dum", password: "test2", age: 1338)
+
+        let result1 = try await async.insertEncoded(dummyAccount1)
+        XCTAssertEqual(result1.insertCount, 1)
+
+        let result2 = try await async.insertEncoded(dummyAccount2)
+        XCTAssertEqual(result2.insertCount, 0)
+
+        let count = try await async.count()
+
+        XCTAssertEqual(count, 1)
+    }
 
     // TODO ON ICE: Foreach future
     // TODO ON ICE: Change stream