diff --git a/Sources/Data Model/Holdout.swift b/Sources/Data Model/Holdout.swift index 8a230bc9..2b8ce6af 100644 --- a/Sources/Data Model/Holdout.swift +++ b/Sources/Data Model/Holdout.swift @@ -27,7 +27,6 @@ struct Holdout: Codable, ExperimentCore { var id: String var key: String var status: Status - var layerId: String var variations: [Variation] var trafficAllocation: [TrafficAllocation] var audienceIds: [String] @@ -36,12 +35,14 @@ struct Holdout: Codable, ExperimentCore { var excludedFlags: [String] enum CodingKeys: String, CodingKey { - case id, key, status, layerId, variations, trafficAllocation, audienceIds, audienceConditions, includedFlags, excludedFlags + case id, key, status, variations, trafficAllocation, audienceIds, audienceConditions, includedFlags, excludedFlags } var variationsMap: [String: OptimizelyVariation] = [:] // replace with serialized string representation with audience names when ProjectConfig is ready var audiences: String = "" + // Not necessary for HO + var layerId: String = "" init(from decoder: Decoder) throws { let container = try decoder.container(keyedBy: CodingKeys.self) @@ -49,7 +50,6 @@ struct Holdout: Codable, ExperimentCore { id = try container.decode(String.self, forKey: .id) key = try container.decode(String.self, forKey: .key) status = try container.decode(Status.self, forKey: .status) - layerId = try container.decode(String.self, forKey: .layerId) variations = try container.decode([Variation].self, forKey: .variations) trafficAllocation = try container.decode([TrafficAllocation].self, forKey: .trafficAllocation) audienceIds = try container.decode([String].self, forKey: .audienceIds) @@ -65,7 +65,6 @@ extension Holdout: Equatable { return lhs.id == rhs.id && lhs.key == rhs.key && lhs.status == rhs.status && - lhs.layerId == rhs.layerId && lhs.variations == rhs.variations && lhs.trafficAllocation == rhs.trafficAllocation && lhs.audienceIds == rhs.audienceIds && diff --git a/Tests/OptimizelyTests-Common/BatchEventBuilderTests_Events.swift b/Tests/OptimizelyTests-Common/BatchEventBuilderTests_Events.swift index d46fa280..2d743f2d 100644 --- a/Tests/OptimizelyTests-Common/BatchEventBuilderTests_Events.swift +++ b/Tests/OptimizelyTests-Common/BatchEventBuilderTests_Events.swift @@ -32,7 +32,6 @@ class BatchEventBuilderTests_Events: XCTestCase { "status": "Running", "id": "holdout_4444444", "key": "holdout_key", - "layerId": "10420273888", "trafficAllocation": [ ["entityId": "holdout_variation_a11", "endOfRange": 10000] // 100% traffic allocation ], diff --git a/Tests/OptimizelyTests-Common/DecisionServiceTests_Holdouts.swift b/Tests/OptimizelyTests-Common/DecisionServiceTests_Holdouts.swift index f7476354..2cc96c98 100644 --- a/Tests/OptimizelyTests-Common/DecisionServiceTests_Holdouts.swift +++ b/Tests/OptimizelyTests-Common/DecisionServiceTests_Holdouts.swift @@ -111,7 +111,6 @@ class DecisionServiceTests_Holdouts: XCTestCase { "status": "Running", "id": "holdout_4444444", "key": "holdout_key", - "layerId": "10420273888", "trafficAllocation": [ ["entityId": "holdout_variation_a11", "endOfRange": 1000] // 10% traffic allocation ], @@ -133,7 +132,6 @@ class DecisionServiceTests_Holdouts: XCTestCase { "status": "Running", "id": "holdout_global", "key": "holdout_global", - "layerId": "10420273888", "trafficAllocation": [ ["entityId": "holdout_global_variation", "endOfRange": 500] ], @@ -155,7 +153,6 @@ class DecisionServiceTests_Holdouts: XCTestCase { "status": "Running", "id": "holdout_included", "key": "holdout_included", - "layerId": "10420273889", "trafficAllocation": [ ["entityId": "holdout_included_variation", "endOfRange": 1000] ], @@ -177,7 +174,6 @@ class DecisionServiceTests_Holdouts: XCTestCase { "status": "Running", "id": "holdout_excluded", "key": "holdout_excluded", - "layerId": "10420273890", "trafficAllocation": [ ["entityId": "holdout_excluded_variation", "endOfRange": 1000] ], diff --git a/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_Holdouts.swift b/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_Holdouts.swift index 7f2228e8..edb12f60 100644 --- a/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_Holdouts.swift +++ b/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_Holdouts.swift @@ -29,7 +29,6 @@ class OptimizelyUserContextTests_Decide_Holdouts: XCTestCase { "status": "Running", "id": "id_holdout", "key": "key_holdout", - "layerId": "10420273888", "trafficAllocation": [ ["entityId": "id_holdout_variation", "endOfRange": 500] ], diff --git a/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift b/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift index ff93122f..b4b8e0e3 100644 --- a/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift +++ b/Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift @@ -28,7 +28,6 @@ class OptimizelyUserContextTests_Decide_With_Holdouts_Reasons: XCTestCase { "status": "Running", "id": "id_holdout", "key": "key_holdout", - "layerId": "10420273888", "trafficAllocation": [ ["entityId": "id_holdout_variation", "endOfRange": 500] ], diff --git a/Tests/OptimizelyTests-DataModel/HoldoutTests.swift b/Tests/OptimizelyTests-DataModel/HoldoutTests.swift index df815ce1..da01277f 100644 --- a/Tests/OptimizelyTests-DataModel/HoldoutTests.swift +++ b/Tests/OptimizelyTests-DataModel/HoldoutTests.swift @@ -35,7 +35,6 @@ class HoldoutTests: XCTestCase { static var sampleData: [String: Any] = ["id": "11111", "key": "background", "status": "Running", - "layerId": "22222", "variations": [HoldoutTests.variationData], "trafficAllocation": [HoldoutTests.trafficAllocationData], "audienceIds": ["33333"], @@ -44,7 +43,6 @@ class HoldoutTests: XCTestCase { static var sampleDataWithIncludedFlags: [String: Any] = ["id": "55555", "key": "background", "status": "Running", - "layerId": "22222", "variations": [HoldoutTests.variationData], "trafficAllocation": [HoldoutTests.trafficAllocationData], "audienceIds": ["33333"], @@ -54,7 +52,6 @@ class HoldoutTests: XCTestCase { static var sampleDataWithExcludedFlags: [String: Any] = ["id": "3333", "key": "background", "status": "Running", - "layerId": "22222", "variations": [HoldoutTests.variationData], "trafficAllocation": [HoldoutTests.trafficAllocationData], "audienceIds": ["33333"], @@ -76,7 +73,6 @@ extension HoldoutTests { XCTAssert(model.id == "11111") XCTAssert(model.key == "background") XCTAssert(model.status == .running) - XCTAssert(model.layerId == "22222") XCTAssert(model.variations == [try! OTUtils.model(from: HoldoutTests.variationData)]) XCTAssert(model.trafficAllocation == [try! OTUtils.model(from: HoldoutTests.trafficAllocationData)]) XCTAssert(model.audienceIds == ["33333"]) @@ -91,7 +87,6 @@ extension HoldoutTests { XCTAssert(model.id == "55555") XCTAssert(model.key == "background") XCTAssert(model.status == .running) - XCTAssert(model.layerId == "22222") XCTAssert(model.variations == [try! OTUtils.model(from: HoldoutTests.variationData)]) XCTAssert(model.trafficAllocation == [try! OTUtils.model(from: HoldoutTests.trafficAllocationData)]) XCTAssert(model.audienceIds == ["33333"]) @@ -107,7 +102,6 @@ extension HoldoutTests { XCTAssert(model.id == "3333") XCTAssert(model.key == "background") XCTAssert(model.status == .running) - XCTAssert(model.layerId == "22222") XCTAssert(model.variations == [try! OTUtils.model(from: HoldoutTests.variationData)]) XCTAssert(model.trafficAllocation == [try! OTUtils.model(from: HoldoutTests.trafficAllocationData)]) XCTAssert(model.audienceIds == ["33333"]) @@ -126,7 +120,6 @@ extension HoldoutTests { XCTAssert(model.id == "11111") XCTAssert(model.key == "background") XCTAssert(model.status == .running) - XCTAssert(model.layerId == "22222") XCTAssert(model.variations == [try! OTUtils.model(from: HoldoutTests.variationData)]) XCTAssert(model.trafficAllocation == [try! OTUtils.model(from: HoldoutTests.trafficAllocationData)]) XCTAssert(model.audienceIds == ["33333"]) @@ -156,14 +149,6 @@ extension HoldoutTests { XCTAssertNil(model) } - func testDecodeFailWithMissingLayerId() { - var data: [String: Any] = HoldoutTests.sampleData - data["layerId"] = nil - - let model: Holdout? = try? OTUtils.model(from: data) - XCTAssertNil(model) - } - func testDecodeFailWithMissingVariations() { var data: [String: Any] = HoldoutTests.sampleData data["variations"] = nil @@ -203,7 +188,6 @@ extension HoldoutTests { let commonData: [String: Any] = ["id": "11111", "key": "background", "status": "Running", - "layerId": "22222", "variations": [HoldoutTests.variationData], "trafficAllocation": [HoldoutTests.trafficAllocationData], "audienceIds": [],