fix: experiment user equals user property comparison

amplitude · Mar 14, 2024 · 0e66823 · 0e66823
1 parent de347f9
commit 0e66823
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Sources/Experiment/ExperimentUser.swift b/Sources/Experiment/ExperimentUser.swift
@@ -134,7 +134,14 @@ import Foundation
         if let userPropertiesAnyValue = self.userPropertiesAnyValue, let otherUserPropertiesAnyValue = other.userPropertiesAnyValue {
             userPropertiesAnyValueEqual = NSDictionary(dictionary: userPropertiesAnyValue).isEqual(to: otherUserPropertiesAnyValue)
         } else {
-            userPropertiesAnyValueEqual = userProperties == nil && other.userProperties == nil
+            userPropertiesAnyValueEqual = userPropertiesAnyValue == nil && other.userPropertiesAnyValue == nil
+        }
+
+        var userPropertiesEqual = false
+        if let userProperties = self.userProperties, let otherUserProperties = other.userProperties {
+            userPropertiesEqual = NSDictionary(dictionary: userProperties).isEqual(to: otherUserProperties)
+        } else {
+            userPropertiesEqual = userProperties == nil && other.userProperties == nil
         }
 
         var groupPropertiesEqual = false
@@ -159,6 +166,7 @@ import Foundation
             self.carrier == other.carrier &&
             self.library == other.library &&
             userPropertiesAnyValueEqual &&
+            userPropertiesEqual &&
             self.groups == other.groups &&
             groupPropertiesEqual
     }

diff --git a/Tests/ExperimentTests/ExperimentUserTests.swift b/Tests/ExperimentTests/ExperimentUserTests.swift
@@ -176,4 +176,9 @@ class ExperimentUserTests: XCTestCase {
             .build()
         XCTAssert(expected == mergedUser)
     }
+
+    func testEqualsOnlyUserProperties() {
+        let user = ExperimentUserBuilder().userProperty("test", value: "test").build()
+        XCTAssertTrue(user != ExperimentUser())
+    }
 }