Merge branch 'master' into jae/dispatcher2

Author: jaeopt

OptimizelySDK/Data Model/Audience/AttributeValue.swift

@@ -41,12 +41,16 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
         }
 
         // NOTE: keep {Double, Float} before Int checking for testing consistency
-        if let doubleValue = Utils.getDoubleValue(value) {
+        if let doubleValue = Utils.getDoubleValue(value),
+            AttributeValue.isValueValidRange(num: doubleValue)
+        {
             self = .double(doubleValue)
             return
         }
 
-        if let int64Value = Utils.getInt64Value(value) {
+        if let int64Value = Utils.getInt64Value(value),
+            AttributeValue.isValueValidRange(num: Double(int64Value))
+        {
             self = .int(int64Value)
             return
         }
@@ -110,8 +114,6 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
 extension AttributeValue {
 
     func isExactMatch(with target: Any) throws -> Bool {
-        try checkValidAttributeNumber(target)
-
         guard let targetValue = AttributeValue(value: target) else {
             throw OptimizelyError.conditionInvalidValueType(prettySrc(#function, target: target))
         }
@@ -146,38 +148,28 @@ extension AttributeValue {
     }
 
     func isGreater(than target: Any) throws -> Bool {
-        try checkValidAttributeNumber(target)
-
         guard let targetValue = AttributeValue(value: target) else {
             throw OptimizelyError.conditionInvalidValueType(prettySrc(#function, target: target))
         }
 
-        guard let currentDouble = self.doubleValue else {
-            throw OptimizelyError.conditionInvalidValueType(prettySrc(#function, target: target))
-        }
-        
-        guard let targetDouble = targetValue.doubleValue else {
+        guard let currentDouble = self.doubleValue,
+            let targetDouble = targetValue.doubleValue else {
             throw OptimizelyError.conditionInvalidValueType(prettySrc(#function, target: target))
         }
 
         return currentDouble > targetDouble
     }
 
     func isLess(than target: Any) throws -> Bool {
-        try checkValidAttributeNumber(target)
-
         guard let targetValue = AttributeValue(value: target) else {
             throw OptimizelyError.conditionInvalidValueType(prettySrc(#function, target: target))
         }
 
-        guard let currentDouble = self.doubleValue else {
-            throw OptimizelyError.conditionInvalidValueType(prettySrc(#function, target: target))
-        }
-        
-        guard let targetDouble = targetValue.doubleValue else {
-            throw OptimizelyError.conditionInvalidValueType(prettySrc(#function, target: target))
+        guard let currentDouble = self.doubleValue,
+            let targetDouble = targetValue.doubleValue else {
+                throw OptimizelyError.conditionInvalidValueType(prettySrc(#function, target: target))
         }
-        
+
         return currentDouble < targetDouble
     }
 
@@ -201,22 +193,9 @@ extension AttributeValue {
         }
     }
 
-    func checkValidAttributeNumber(_ number: Any) throws {        
-        var num: Double
-        
-        if let number = Utils.getInt64Value(number) {
-            num = Double(number)
-        } else if let number = Utils.getDoubleValue(number) {
-            num = number
-        } else {
-            // do not check range if it's not a number
-            return
-        }
-        
+    static func isValueValidRange(num: Double) -> Bool {
         // valid range: [-2^53, 2^53] i
-        if abs(num) > pow(2, 53) {
-            throw OptimizelyError.attributeValueInvalid
-        }
+        return abs(num) <= pow(2, 53)
     }
 
     func prettySrc(_ src: String, target: Any? = nil) -> String {

OptimizelySDK/Data Model/Audience/UserAttribute.swift

@@ -106,33 +106,33 @@ extension UserAttribute {
 
         let attributes = attributes ?? OptimizelyAttributes()
 
-        let attributeValue = attributes[nameFinal] ?? nil  // default to nil to avoid warning "coerced from 'Any??' to 'Any?'"
+        let rawAttributeValue = attributes[nameFinal] ?? nil  // default to nil to avoid warning "coerced from 'Any??' to 'Any?'"
 
         if matchFinal != .exists {
             if value == nil {
                 throw OptimizelyError.conditionInvalidFormat("missing value (\(nameFinal)) in condition)")
             }
 
-            if attributeValue == nil {
+            if rawAttributeValue == nil {
                 throw OptimizelyError.conditionNoAttributeValue("no attribute value for (\(nameFinal))")
             }
         }
 
         switch matchFinal {
         case .exists:
-            return !(attributeValue is NSNull || attributeValue == nil)
+            return !(rawAttributeValue is NSNull || rawAttributeValue == nil)
         case .exact:
-            return try value!.isExactMatch(with: attributeValue!)
+            return try value!.isExactMatch(with: rawAttributeValue!)
         case .substring:
-            return try value!.isSubstring(of: attributeValue!)
+            return try value!.isSubstring(of: rawAttributeValue!)
         case .lt:
             // user attribute "less than" this condition value
             // so evaluate if this condition value "isGreater" than the user attribute value
-            return try value!.isGreater(than: attributeValue!)
+            return try value!.isGreater(than: rawAttributeValue!)
         case .gt:
             // user attribute "greater than" this condition value
             // so evaluate if this condition value "isLess" than the user attribute value
-            return try value!.isLess(than: attributeValue!)
+            return try value!.isLess(than: rawAttributeValue!)
         }
     }
 

OptimizelySDK/Data Model/DispatchEvents/BatchEvent.swift

@@ -28,6 +28,16 @@ struct BatchEvent: Codable, Equatable {
         case anonymizeIP = "anonymize_ip"
         case enrichDecisions = "enrich_decisions"
     }
+    
+    func getEventAttribute(key: String) -> EventAttribute? {
+        for visitor in visitors {
+            if let attribute = visitor.attributes.filter({ $0.key == key }).first {
+                return attribute
+            }
+        }
+        
+        return nil
+    }
 }
 
 struct Visitor: Codable, Equatable {
@@ -103,7 +113,7 @@ struct DispatchEvent: Codable, Equatable {
          key: String,
          entityID: String,
          uuid: String,
-         tags: Dictionary<String,AttributeValue>? = [:],
+         tags: [String: AttributeValue]? = [:],
          value: AttributeValue? = nil,
          revenue: AttributeValue? = nil)
     {