Recommended changes made.

Author: yasirfolio3

Sources/Data Model/FeatureVariable.swift

@@ -21,7 +21,7 @@ struct FeatureVariable: Codable, Equatable {
     var key: String
     var type: String
     var subType: String?
-    // datafile schema rquires this, but test has "null" value case. keep optional for FSC
+    // datafile schema requires this, but test has "null" value case. keep optional for FSC
     var defaultValue: String?
 
     enum CodingKeys: String, CodingKey {
@@ -38,6 +38,7 @@ struct FeatureVariable: Codable, Equatable {
         self.type = type
         self.subType = subType
         self.defaultValue = defaultValue
+        overrideTypeIfJSON()
     }
 
     init(from decoder: Decoder) throws {
@@ -47,7 +48,10 @@ struct FeatureVariable: Codable, Equatable {
         type = try container.decode(String.self, forKey: .type)
         subType = try container.decodeIfPresent(String.self, forKey: .subType)
         defaultValue = try container.decodeIfPresent(String.self, forKey: .defaultValue)
-        
+        overrideTypeIfJSON()
+    }
+    
+    mutating func overrideTypeIfJSON() {
         if type == "string" && subType == "json" {
             type = "json"
         }

Tests/OptimizelyTests-DataModel/FeatureVariableTests.swift

@@ -45,6 +45,16 @@ class FeatureVariableTests: XCTestCase {
         XCTAssert(model.subType == "json")
     }
 
+    func testInitWithJsonSubtypeOverridesType() {
+        let model = FeatureVariable(id: "553339214", key: "price", type: "string", subType: "json", defaultValue: "{}")
+
+        XCTAssert(model.id == "553339214")
+        XCTAssert(model.key == "price")
+        XCTAssert(model.type == "json")
+        XCTAssert(model.defaultValue == "{}")
+        XCTAssert(model.subType == "json")
+    }
+    
     func testDecodeSuccessWithExtraFields() {
         let data = ["id": "553339214", "key": "price", "type": "integer", "defaultValue": "100", "extra": "123"]
         let model: FeatureVariable = try! OTUtils.model(from: data)