Skip to content

Commit 6fd56c3

Browse files
muzahidul-optimuzahidul-opti
authored
[FSSDK-11690] chore: remove layer id from holdout (#604)
* Remove layer id from holdout
1 parent 765206b commit 6fd56c3

File tree

6 files changed

+3
-27
lines changed

6 files changed

+3
-27
lines changed

‎Sources/Data Model/Holdout.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ struct Holdout: Codable, ExperimentCore {
2727
var id: String
2828
var key: String
2929
var status: Status
30-
var layerId: String
3130
var variations: [Variation]
3231
var trafficAllocation: [TrafficAllocation]
3332
var audienceIds: [String]
@@ -36,20 +35,21 @@ struct Holdout: Codable, ExperimentCore {
3635
var excludedFlags: [String]
3736

3837
enum CodingKeys: String, CodingKey {
39-
case id, key, status, layerId, variations, trafficAllocation, audienceIds, audienceConditions, includedFlags, excludedFlags
38+
case id, key, status, variations, trafficAllocation, audienceIds, audienceConditions, includedFlags, excludedFlags
4039
}
4140

4241
var variationsMap: [String: OptimizelyVariation] = [:]
4342
// replace with serialized string representation with audience names when ProjectConfig is ready
4443
var audiences: String = ""
44+
// Not necessary for HO
45+
var layerId: String = ""
4546

4647
init(from decoder: Decoder) throws {
4748
let container = try decoder.container(keyedBy: CodingKeys.self)
4849

4950
id = try container.decode(String.self, forKey: .id)
5051
key = try container.decode(String.self, forKey: .key)
5152
status = try container.decode(Status.self, forKey: .status)
52-
layerId = try container.decode(String.self, forKey: .layerId)
5353
variations = try container.decode([Variation].self, forKey: .variations)
5454
trafficAllocation = try container.decode([TrafficAllocation].self, forKey: .trafficAllocation)
5555
audienceIds = try container.decode([String].self, forKey: .audienceIds)
@@ -65,7 +65,6 @@ extension Holdout: Equatable {
6565
return lhs.id == rhs.id &&
6666
lhs.key == rhs.key &&
6767
lhs.status == rhs.status &&
68-
lhs.layerId == rhs.layerId &&
6968
lhs.variations == rhs.variations &&
7069
lhs.trafficAllocation == rhs.trafficAllocation &&
7170
lhs.audienceIds == rhs.audienceIds &&

‎Tests/OptimizelyTests-Common/BatchEventBuilderTests_Events.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class BatchEventBuilderTests_Events: XCTestCase {
3232
"status": "Running",
3333
"id": "holdout_4444444",
3434
"key": "holdout_key",
35-
"layerId": "10420273888",
3635
"trafficAllocation": [
3736
["entityId": "holdout_variation_a11", "endOfRange": 10000] // 100% traffic allocation
3837
],

‎Tests/OptimizelyTests-Common/DecisionServiceTests_Holdouts.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ class DecisionServiceTests_Holdouts: XCTestCase {
111111
"status": "Running",
112112
"id": "holdout_4444444",
113113
"key": "holdout_key",
114-
"layerId": "10420273888",
115114
"trafficAllocation": [
116115
["entityId": "holdout_variation_a11", "endOfRange": 1000] // 10% traffic allocation
117116
],
@@ -133,7 +132,6 @@ class DecisionServiceTests_Holdouts: XCTestCase {
133132
"status": "Running",
134133
"id": "holdout_global",
135134
"key": "holdout_global",
136-
"layerId": "10420273888",
137135
"trafficAllocation": [
138136
["entityId": "holdout_global_variation", "endOfRange": 500]
139137
],
@@ -155,7 +153,6 @@ class DecisionServiceTests_Holdouts: XCTestCase {
155153
"status": "Running",
156154
"id": "holdout_included",
157155
"key": "holdout_included",
158-
"layerId": "10420273889",
159156
"trafficAllocation": [
160157
["entityId": "holdout_included_variation", "endOfRange": 1000]
161158
],
@@ -177,7 +174,6 @@ class DecisionServiceTests_Holdouts: XCTestCase {
177174
"status": "Running",
178175
"id": "holdout_excluded",
179176
"key": "holdout_excluded",
180-
"layerId": "10420273890",
181177
"trafficAllocation": [
182178
["entityId": "holdout_excluded_variation", "endOfRange": 1000]
183179
],

‎Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_Holdouts.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class OptimizelyUserContextTests_Decide_Holdouts: XCTestCase {
2929
"status": "Running",
3030
"id": "id_holdout",
3131
"key": "key_holdout",
32-
"layerId": "10420273888",
3332
"trafficAllocation": [
3433
["entityId": "id_holdout_variation", "endOfRange": 500]
3534
],

‎Tests/OptimizelyTests-Common/OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class OptimizelyUserContextTests_Decide_With_Holdouts_Reasons: XCTestCase {
2828
"status": "Running",
2929
"id": "id_holdout",
3030
"key": "key_holdout",
31-
"layerId": "10420273888",
3231
"trafficAllocation": [
3332
["entityId": "id_holdout_variation", "endOfRange": 500]
3433
],

‎Tests/OptimizelyTests-DataModel/HoldoutTests.swift‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class HoldoutTests: XCTestCase {
3535
static var sampleData: [String: Any] = ["id": "11111",
3636
"key": "background",
3737
"status": "Running",
38-
"layerId": "22222",
3938
"variations": [HoldoutTests.variationData],
4039
"trafficAllocation": [HoldoutTests.trafficAllocationData],
4140
"audienceIds": ["33333"],
@@ -44,7 +43,6 @@ class HoldoutTests: XCTestCase {
4443
static var sampleDataWithIncludedFlags: [String: Any] = ["id": "55555",
4544
"key": "background",
4645
"status": "Running",
47-
"layerId": "22222",
4846
"variations": [HoldoutTests.variationData],
4947
"trafficAllocation": [HoldoutTests.trafficAllocationData],
5048
"audienceIds": ["33333"],
@@ -54,7 +52,6 @@ class HoldoutTests: XCTestCase {
5452
static var sampleDataWithExcludedFlags: [String: Any] = ["id": "3333",
5553
"key": "background",
5654
"status": "Running",
57-
"layerId": "22222",
5855
"variations": [HoldoutTests.variationData],
5956
"trafficAllocation": [HoldoutTests.trafficAllocationData],
6057
"audienceIds": ["33333"],
@@ -76,7 +73,6 @@ extension HoldoutTests {
7673
XCTAssert(model.id == "11111")
7774
XCTAssert(model.key == "background")
7875
XCTAssert(model.status == .running)
79-
XCTAssert(model.layerId == "22222")
8076
XCTAssert(model.variations == [try! OTUtils.model(from: HoldoutTests.variationData)])
8177
XCTAssert(model.trafficAllocation == [try! OTUtils.model(from: HoldoutTests.trafficAllocationData)])
8278
XCTAssert(model.audienceIds == ["33333"])
@@ -91,7 +87,6 @@ extension HoldoutTests {
9187
XCTAssert(model.id == "55555")
9288
XCTAssert(model.key == "background")
9389
XCTAssert(model.status == .running)
94-
XCTAssert(model.layerId == "22222")
9590
XCTAssert(model.variations == [try! OTUtils.model(from: HoldoutTests.variationData)])
9691
XCTAssert(model.trafficAllocation == [try! OTUtils.model(from: HoldoutTests.trafficAllocationData)])
9792
XCTAssert(model.audienceIds == ["33333"])
@@ -107,7 +102,6 @@ extension HoldoutTests {
107102
XCTAssert(model.id == "3333")
108103
XCTAssert(model.key == "background")
109104
XCTAssert(model.status == .running)
110-
XCTAssert(model.layerId == "22222")
111105
XCTAssert(model.variations == [try! OTUtils.model(from: HoldoutTests.variationData)])
112106
XCTAssert(model.trafficAllocation == [try! OTUtils.model(from: HoldoutTests.trafficAllocationData)])
113107
XCTAssert(model.audienceIds == ["33333"])
@@ -126,7 +120,6 @@ extension HoldoutTests {
126120
XCTAssert(model.id == "11111")
127121
XCTAssert(model.key == "background")
128122
XCTAssert(model.status == .running)
129-
XCTAssert(model.layerId == "22222")
130123
XCTAssert(model.variations == [try! OTUtils.model(from: HoldoutTests.variationData)])
131124
XCTAssert(model.trafficAllocation == [try! OTUtils.model(from: HoldoutTests.trafficAllocationData)])
132125
XCTAssert(model.audienceIds == ["33333"])
@@ -156,14 +149,6 @@ extension HoldoutTests {
156149
XCTAssertNil(model)
157150
}
158151

159-
func testDecodeFailWithMissingLayerId() {
160-
var data: [String: Any] = HoldoutTests.sampleData
161-
data["layerId"] = nil
162-
163-
let model: Holdout? = try? OTUtils.model(from: data)
164-
XCTAssertNil(model)
165-
}
166-
167152
func testDecodeFailWithMissingVariations() {
168153
var data: [String: Any] = HoldoutTests.sampleData
169154
data["variations"] = nil
@@ -203,7 +188,6 @@ extension HoldoutTests {
203188
let commonData: [String: Any] = ["id": "11111",
204189
"key": "background",
205190
"status": "Running",
206-
"layerId": "22222",
207191
"variations": [HoldoutTests.variationData],
208192
"trafficAllocation": [HoldoutTests.trafficAllocationData],
209193
"audienceIds": [],

0 commit comments

Comments
 (0)