fix: nested event tag support added

Author: muzahidul-opti

Sources/Data Model/Audience/AttributeValue.swift

@@ -21,7 +21,7 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
     case int(Int64)         // supported value range [-2^53, 2^53]
     case double(Double)
     case bool(Bool)
-    // not defined in datafile schema, but required for forward compatiblity (see Nikhil's doc)
+    case custom([String : AttributeValue])
     case others
 
     var description: String {
@@ -34,6 +34,8 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
             return "int(\(value))"
         case .bool(let value):
             return "bool(\(value))"
+        case .custom(let value):
+                return "custom(\(value))"
         case .others:
             return "others"
         }
@@ -63,6 +65,12 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
             self = .bool(boolValue)
             return
         }
+        
+        if let custom = value as? [String : Any] {
+            let attr = custom.compactMapValues { AttributeValue(value: $0) }
+            self = .custom(attr)
+            return
+        }
 
         return nil
     }
@@ -87,6 +95,12 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
             return
         }
 
+        if let value = try? container.decode([String: AttributeValue].self) {
+            self = .custom(value)
+            return
+        }
+        
+        
         // accept all other types (null, {}, []) for forward compatibility support
         self = .others
     }
@@ -103,6 +117,8 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
             try container.encode(value)
         case .bool(let value):
             try container.encode(value)
+        case .custom(let value):
+            try container.encode(value.mapValues { $0 })
         case .others:
             return
         }
@@ -135,6 +151,10 @@ extension AttributeValue {
             return true
         }
 
+        if case .custom(let selfDict) = self, case .custom(let targetDict) = targetValue {
+            return selfDict == targetDict
+        }
+        
         return false
     }
 
@@ -227,6 +247,8 @@ extension AttributeValue {
             return String(value)
         case .bool(let value):
             return String(value)
+        case .custom(let value):
+            return String(describing: value)
         case .others:
             return "UNKNOWN"
         }
@@ -240,6 +262,7 @@ extension AttributeValue {
         case (.double, .int): return true
         case (.double, .double): return true
         case (.bool, .bool): return true
+        case (.custom, .custom): return true
         default: return false
         }
     }

Tests/OptimizelyTests-Common/BatchEventBuilderTests_EventTags.swift

@@ -316,6 +316,43 @@ extension BatchEventBuilderTests_EventTags {
         XCTAssertEqual(de["value"] as! Double, 32, "value must be valid for value")
     }
 
+    
+    func testNestedTag() {
+        let properties: [String: Any] = [
+            "category": "shoes",
+            "Text": "value",
+            "nested": [
+                "foot": "value",
+                "mouch": "valuefalsdf"
+            ]
+        ]
+        let eventKey = "event_single_targeted_exp"
+        let eventTags: [String: Any] = ["browser": "chrome",
+                                        "v1": Int8(10),
+                                        "v2": Int16(20),
+                                        "v3": Int32(30),
+                                        "revenue": Int64(40),
+                                        "value": Float(32),
+                                        "$opt_event_properties": properties]
+        
+        try! optimizely.track(eventKey: eventKey, userId: userId, attributes: nil, eventTags: eventTags)
+        
+        let de = getDispatchEvent(dispatcher: eventDispatcher)!
+        let tags = de["tags"] as! [String: Any]
+        
+        XCTAssertEqual(tags["browser"] as! String, "chrome")
+        XCTAssertEqual(tags["v1"] as! Int, 10)
+        XCTAssertEqual(tags["v2"] as! Int, 20)
+        XCTAssertEqual(tags["v3"] as! Int, 30)
+        XCTAssertEqual(tags["revenue"] as! Int, 40)
+        XCTAssertEqual(tags["value"] as! Double, 32)
+        XCTAssertEqual(de["revenue"] as! Int, 40, "value must be valid for revenue")
+        XCTAssertEqual(de["value"] as! Double, 32, "value must be valid for value")
+        
+        
+    }
+    
+    
     func testEventTagsWithRevenueAndValue_toJSON() {
 
         // valid revenue/value types