-
Notifications
You must be signed in to change notification settings - Fork 32
[FSSDK-11372] assign holdoutIds to feature flags #578
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 18 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
f5e60a7
wip: Holdout Model created
muzahidul-opti 38386cd
wip: add holdout model test cases
muzahidul-opti a732fdb
Merge branch 'master' into muzahid/holdout-FSSDK-11371
muzahidul-opti 99eea3d
wip: assging holdoutids to feature flags
muzahidul-opti 326adce
wip: included and excluded flags updated to required
muzahidul-opti d1cc64d
wip: move OptimizelyExperiment compliance to OptmizelyConfig file
muzahidul-opti 247d0eb
Merge branch 'muzahid/holdout-FSSDK-11371' into muzahid/FSSDK-11372
muzahidul-opti 01f3cd7
wip: fix uint test
muzahidul-opti 5404d97
Merge branch 'master' into muzahid/FSSDK-11372
muzahidul-opti 3560de9
wip: make holdouts array empty if no key presented
muzahidul-opti 51ba12a
wip: add id and key to experiement core
muzahidul-opti 2c29e82
wip: clean up
muzahidul-opti 16920c7
wip: clean up
muzahidul-opti 7bad66d
clean up
muzahidul-opti b337b35
wip: address review request
muzahidul-opti c694a57
wip: Update holdout sample data
muzahidul-opti fd6535a
wip: update flag to holdout mapping approach
muzahidul-opti 987ff6c
wip: holdout config struct added
muzahidul-opti 528aa0d
wip: unit tests updated
muzahidul-opti c868c29
wip: HoldoutConfig test cases added
muzahidul-opti e876960
wip: fix holdout config tests
muzahidul-opti 9e1669c
clean up: fix test cases
muzahidul-opti f310734
cleanup: add unit test cases
muzahidul-opti 0ce7aa3
Update Sources/Data Model/HoldoutConfig.swift
muzahidul-opti 05ed9f0
cleanup: address review changes
muzahidul-opti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| // | ||
| // Copyright 2022, Optimizely, Inc. and contributors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct HoldoutConfig { | ||
| var allHoldouts: [Holdout] { | ||
| didSet { | ||
| updateHoldoutProperties() | ||
| } | ||
| } | ||
| private(set) var holdoutIdMap: [String: Holdout] = [:] | ||
| private(set) var global: [Holdout] = [] | ||
| private(set) var others: [Holdout] = [] | ||
| private(set) var includedHoldouts: [String: [Holdout]] = [:] | ||
| private(set) var excludedHoldouts: [String: [Holdout]] = [:] | ||
| private(set) var flagHoldoutsMap: [String: [Holdout]] = [:] | ||
|
|
||
| init(allholdouts: [Holdout] = []) { | ||
| self.allHoldouts = allholdouts | ||
| updateHoldoutProperties() | ||
| } | ||
|
|
||
| mutating func updateHoldoutProperties() { | ||
muzahidul-opti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| holdoutIdMap = { | ||
| var map = [String: Holdout]() | ||
| allHoldouts.forEach { map[$0.id] = $0 } | ||
| return map | ||
| }() | ||
| flagHoldoutsMap = [:] | ||
| global = [] | ||
| others = [] | ||
| includedHoldouts = [:] | ||
| excludedHoldouts = [:] | ||
|
|
||
| for holdout in allHoldouts { | ||
| switch (holdout.includedFlags.isEmpty, holdout.excludedFlags.isEmpty) { | ||
| case (true, true): | ||
| global.append(holdout) | ||
| case (false, _): | ||
| holdout.includedFlags.forEach { flagId in | ||
| if var existing = includedHoldouts[flagId] { | ||
| existing.append(holdout) | ||
| includedHoldouts[flagId] = existing | ||
| } else { | ||
| includedHoldouts[flagId] = [holdout] | ||
| } | ||
| } | ||
| case (_, false): | ||
muzahidul-opti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| others.append(holdout) | ||
muzahidul-opti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| holdout.excludedFlags.forEach { flagId in | ||
| if var existing = excludedHoldouts[flagId] { | ||
| existing.append(holdout) | ||
| excludedHoldouts[flagId] = existing | ||
| } else { | ||
| excludedHoldouts[flagId] = [holdout] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| mutating func getHoldoutForFlag(id: String) -> [Holdout] { | ||
| guard !allHoldouts.isEmpty else { return [] } | ||
|
|
||
| if let holdouts = flagHoldoutsMap[id] { | ||
| return holdouts | ||
| } | ||
muzahidul-opti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if let included = includedHoldouts[id], !included.isEmpty { | ||
| flagHoldoutsMap[id] = global + included | ||
muzahidul-opti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } else { | ||
| let excluded = excludedHoldouts[id] ?? [] | ||
| let filteredHoldouts = others.filter { holdout in | ||
| return !excluded.contains(holdout) | ||
| } | ||
| flagHoldoutsMap[id] = global + filteredHoldouts | ||
muzahidul-opti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| return flagHoldoutsMap[id] ?? [] | ||
| } | ||
|
|
||
| func getHoldout(id: String) -> Holdout? { | ||
| return holdoutIdMap[id] | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.