From 20b29c3efb6efc27507d9bbffd4bc48d0be02637 Mon Sep 17 00:00:00 2001
From: Diana Perez Afanador <dianaafanador3@gmail.com>
Date: Tue, 11 Jul 2023 19:44:16 +0200
Subject: [PATCH] Fix Observation notification not triggering on nested
 properties

---
 RealmSwift/Projection.swift               |  2 +-
 RealmSwift/Tests/ProjectionTests.swift    | 21 +++++++++++++++++++++
 Test.xcworkspace/contents.xcworkspacedata | 10 ++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 Test.xcworkspace/contents.xcworkspacedata

diff --git a/RealmSwift/Projection.swift b/RealmSwift/Projection.swift
index b3afd977b1f..3f29f51634f 100644
--- a/RealmSwift/Projection.swift
+++ b/RealmSwift/Projection.swift
@@ -321,7 +321,7 @@ extension ProjectionObservable {
 
             var projectedChanges = [PropertyChange]()
             for i in 0..<newValues.count {
-                for property in schema.filter({ $0.originPropertyKeyPathString == names[i] }) {
+                for property in schema.filter({ $0.originPropertyKeyPathString.components(separatedBy: ".").dropLast().joined(separator: "") == names[i] }) {
                     var changeOldValue: Any?
                     if oldValues != nil {
                         changeOldValue = unmanagedRoot![keyPath: property.projectedKeyPath]
diff --git a/RealmSwift/Tests/ProjectionTests.swift b/RealmSwift/Tests/ProjectionTests.swift
index 5c30d3dd8b2..96c22d27551 100644
--- a/RealmSwift/Tests/ProjectionTests.swift
+++ b/RealmSwift/Tests/ProjectionTests.swift
@@ -945,6 +945,27 @@ class ProjectionTests: TestCase {
         token.invalidate()
     }
 
+    func testObserveNestedProjection() {
+        let realm = populatedRealm()
+        let johnProjection = realm.objects(PersonProjection.self).first!
+
+        let ex = expectation(description: "testProjectionNotification")
+        let token = johnProjection.observe { changes in
+            if case .change(_, _) = changes {
+                ex.fulfill()
+            } else {
+                XCTFail("expected .change, got \(changes)")
+            }
+
+        }
+        try! realm.write {
+            let johnObject = realm.objects(CommonPerson.self).filter("lastName == 'Snow'").first!
+            johnObject.address?.city = "Barranquilla"
+        }
+        waitForExpectations(timeout: 1000.0, handler: nil)
+        token.invalidate()
+    }
+
     var changeDictionary: [NSKeyValueChangeKey: Any]?
     override func observeValue(forKeyPath keyPath: String?, of object: Any?,
                                change: [NSKeyValueChangeKey: Any]?,
diff --git a/Test.xcworkspace/contents.xcworkspacedata b/Test.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000000..ba96ce56502
--- /dev/null
+++ b/Test.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "container:">
+   </FileRef>
+   <FileRef
+      location = "group:../../Core/realm-core">
+   </FileRef>
+</Workspace>