fix errors on FSC that are valid errors (#354)

Author: thomaszurkan-optimizely

Sources/Data Model/Audience/SemanticVersion.swift

@@ -84,7 +84,7 @@ extension SemanticVersion {
         }
         // Expect a version string of the form x.y.z
         let dotCount = targetPrefix.filter({$0 == "."}).count
-        if dotCount > 3 {
+        if dotCount > 2 {
             throw OptimizelyError.attributeFormatInvalid
         }
         var targetedVersionParts = targetPrefix.split(separator: ".")

Sources/Data Model/Audience/UserAttribute.swift

@@ -157,31 +157,29 @@ extension UserAttribute {
             return try value!.isLessOrEqual(than: rawAttributeValue!, condition: stringRepresentation, name: nameFinal)
         // semantic versioning seems unique.  the comarison is to compare verion but the passed in version is the target version.
         case .semver_eq:
-            guard let targetValue = AttributeValue(value: rawAttributeValue) else {
-                throw OptimizelyError.evaluateAttributeInvalidCondition("attribute value \(nameFinal) invalid type")
-             }
+            let targetValue = try targetAsAttributeValue(value: rawAttributeValue, attribute: value, nameFinal: nameFinal)
             return try targetValue.isSemanticVersionEqual(than: value!.stringValue)
         case .semver_lt:
-            guard let targetValue = AttributeValue(value: rawAttributeValue) else {
-                throw OptimizelyError.evaluateAttributeInvalidCondition("attribute value \(nameFinal) invalid type")
-             }
+            let targetValue = try targetAsAttributeValue(value: rawAttributeValue, attribute: value, nameFinal: nameFinal)
             return try targetValue.isSemanticVersionLess(than: value!.stringValue)
         case .semver_le:
-            guard let targetValue = AttributeValue(value: rawAttributeValue) else {
-                throw OptimizelyError.evaluateAttributeInvalidCondition("attribute value \(nameFinal) invalid type")
-             }
+            let targetValue = try targetAsAttributeValue(value: rawAttributeValue, attribute: value, nameFinal: nameFinal)
             return try targetValue.isSemanticVersionLessOrEqual(than: value!.stringValue)
         case .semver_gt:
-            guard let targetValue = AttributeValue(value: rawAttributeValue) else {
-                throw OptimizelyError.evaluateAttributeInvalidCondition("attribute value \(nameFinal) invalid type")
-             }
+            let targetValue = try targetAsAttributeValue(value: rawAttributeValue, attribute: value, nameFinal: nameFinal)
             return try targetValue.isSemanticVersionGreater(than: value!.stringValue)
         case .semver_ge:
-            guard let targetValue = AttributeValue(value: rawAttributeValue) else {
-                throw OptimizelyError.evaluateAttributeInvalidCondition("attribute value \(nameFinal) invalid type")
-             }
+            let targetValue = try targetAsAttributeValue(value: rawAttributeValue, attribute: value, nameFinal: nameFinal)
             return try targetValue.isSemanticVersionGreaterOrEqual(than: value!.stringValue)
         }
     }
 
+    private func targetAsAttributeValue(value:Any?, attribute:AttributeValue?, nameFinal:String) throws -> AttributeValue {
+        guard let targetValue = AttributeValue(value: value), targetValue.isComparable(with: attribute!) else {
+            throw OptimizelyError.evaluateAttributeInvalidCondition("attribute value \(nameFinal) invalid type")
+         }
+
+        return targetValue
+    }
+    
 }

Tests/OptimizelyTests-DataModel/SemanticVersionTests.swift

@@ -165,7 +165,7 @@ class SemanticVersionTests: XCTestCase {
 
     func testInvalidAttributes() {
         let target = "2.1.0"
-        let versions = ["-", ".", "..", "+", "+test", " ", "2 .3. 0", "2.", ".2.2"]
+        let versions = ["-", ".", "..", "+", "+test", " ", "2 .3. 0", "2.", ".2.2", "3.7.2.2"]
         for (_, version) in versions.enumerated() {
             XCTAssert(((try? (version.compareVersion(targetedVersion: target)) < 0) == nil))
         }

Tests/OptimizelyTests-DataModel/UserAttributeTests_Evaluate.swift

@@ -450,4 +450,13 @@ extension UserAttributeTests_Evaluate {
         XCTAssertFalse(try! model.evaluate(attributes: attributes))
     }
 
+    func testEqualSemanticVersionInvalidType() {
+        let model = UserAttribute(name: "version", type: "custom_attribute", match: "semver_eq", value: .string("2.0"))
+
+        var attributes:[String: Any] = ["version": true]
+        XCTAssertNil(try? model.evaluate(attributes: attributes))
+        attributes["version"] = 37
+        XCTAssertNil(try? model.evaluate(attributes: attributes))
+    }
+
 }