Merge pull request #148 from raulriera/callbacks-fix

Callbacks fix to prevent data loss

Author: loganwright

Sources/Fluent/Query/Query.swift

@@ -197,15 +197,14 @@ extension QueryRepresentable {
     */
     public func save(_ model: inout T) throws {
         let query = try makeQuery()
-        let data = try model.makeNode()
-
+        
         if let _ = model.id, model.exists {
             model.willUpdate()
-            try modify(data)
+            try modify(model.makeNode())
             model.didUpdate()
         } else {
             model.willCreate()
-            model.id = try query.create(data)
+            model.id = try query.create(model.makeNode())
             model.didCreate()
         }
         model.exists = true

Tests/FluentTests/CallbackTests.swift

@@ -0,0 +1,69 @@
+import XCTest
+@testable import Fluent
+
+class CallbacksTests: XCTestCase {
+
+    /// Dummy Model implementation for testing.
+    final class DummyModel: Entity {
+        var exists: Bool = false
+        var wasModifiedOnCreate: Bool = false
+        var wasModifiedOnUpdate: Bool = false
+
+        static func prepare(_ database: Database) throws {}
+        static func revert(_ database: Database) throws {}
+
+        var id: Node?
+        
+        init() {
+            
+        }
+        
+        init(node: Node, in context: Context) throws {
+
+        }
+
+        func makeNode(context: Context = EmptyNode) -> Node {
+            return .null
+        }
+        
+        func willCreate() {
+            wasModifiedOnCreate = true
+        }
+        
+        func willUpdate() {
+            wasModifiedOnUpdate = true
+        }
+    }
+
+    static let allTests = [
+        ("testCreateCallbacksCanMutateProperties", testCreateCallbacksCanMutateProperties),
+        ("testUpdateCallbacksCanMutateProperties", testUpdateCallbacksCanMutateProperties)
+    ]
+
+    override func setUp() {
+        database = Database(DummyDriver())
+        Database.default = database
+    }
+
+    var database: Database!
+
+    func testCreateCallbacksCanMutateProperties() {
+        var result = DummyModel()
+        XCTAssertFalse(result.wasModifiedOnCreate, "Result should not have been modified yet")
+        
+        try? result.save()
+        XCTAssertTrue(result.wasModifiedOnCreate, "Result should have been modified by now")
+    }
+    
+    func testUpdateCallbacksCanMutateProperties() {
+        var result = DummyModel()
+        XCTAssertFalse(result.wasModifiedOnUpdate, "Result should not have been modified yet")
+        
+        try? result.save()
+        XCTAssertFalse(result.wasModifiedOnUpdate, "Result should not have been modified yet")
+        
+        // Save the object once more to trigger the update callback
+        try? result.save()
+        XCTAssertTrue(result.wasModifiedOnUpdate, "Result should have been modified by now")
+    }
+}