[FSSDK-11373] add holdout support and refactor decision logic in DefaultDecisionService (#587)

Author: muzahidul-opti

OptimizelySwiftSDK.xcodeproj/project.pbxproj

@@ -35,8 +35,6 @@ struct FeatureFlag: Codable, Equatable, OptimizelyFeature {
         case variables
     }
 
-//    var holdoutIds: [String] = []
-    
     // MARK: - OptimizelyConfig
 
     var experimentsMap: [String: OptimizelyExperiment] = [:]

Sources/Data Model/FeatureFlag.swift

@@ -115,4 +115,3 @@ struct HoldoutConfig {
         return holdoutIdMap[id]
     }
 }
-

Sources/Data Model/HoldoutConfig.swift

@@ -22,7 +22,7 @@ struct DecisionInfo {
     let decisionType: Constants.DecisionType
 
     /// The experiment that the decision variation belongs to.
-    var experiment: Experiment?
+    var experiment: ExperimentCore?
 
     /// The variation selected by the decision.
     var variation: Variation?
@@ -58,7 +58,7 @@ struct DecisionInfo {
     var decisionEventDispatched: Bool
 
     init(decisionType: Constants.DecisionType,
-         experiment: Experiment? = nil,
+         experiment: ExperimentCore? = nil,
          variation: Variation? = nil,
          source: String? = nil,
          feature: FeatureFlag? = nil,

Sources/Implementation/DecisionInfo.swift

@@ -120,7 +120,7 @@ class DefaultBucketer: OPTBucketer {
         return DecisionResponse(result: nil, reasons: reasons)
     }
 
-    func bucketToVariation(experiment: Experiment,
+    func bucketToVariation(experiment: ExperimentCore,
                            bucketingId: String) -> DecisionResponse<Variation> {
         let reasons = DecisionReasons()
 

Sources/Implementation/DefaultBucketer.swift

@@ -22,7 +22,7 @@ class BatchEventBuilder {
     // MARK: - Impression Event
 
     static func createImpressionEvent(config: ProjectConfig,
-                                      experiment: Experiment?,
+                                      experiment: ExperimentCore?,
                                       variation: Variation?,
                                       userId: String,
                                       attributes: OptimizelyAttributes?,

Sources/Implementation/DefaultDecisionService.swift

@@ -804,7 +804,7 @@ extension OptimizelyClient {
         return (source == Constants.DecisionSource.featureTest.rawValue && decision?.variation != nil) || config.sendFlagDecisions
     }
 
-    func sendImpressionEvent(experiment: Experiment?,
+    func sendImpressionEvent(experiment: ExperimentCore?,
                              variation: Variation?,
                              userId: String,
                              attributes: OptimizelyAttributes? = nil,
@@ -892,7 +892,7 @@ extension OptimizelyClient {
 
 extension OptimizelyClient {
 
-    func sendActivateNotification(experiment: Experiment,
+    func sendActivateNotification(experiment: ExperimentCore,
                                   variation: Variation,
                                   userId: String,
                                   attributes: OptimizelyAttributes?,

Sources/Implementation/Events/BatchEventBuilder.swift

@@ -36,7 +36,7 @@ protocol OPTBucketer {
     func bucketExperiment(config: ProjectConfig,
                           experiment: Experiment,
                           bucketingId: String) -> DecisionResponse<Variation>
-
+    
     /**
      Hash the bucketing ID and map it to the range [0, 10000).
      - Parameter bucketingId: The ID for which to generate the hash and bucket values.

Sources/Optimizely/OptimizelyClient.swift

@@ -57,6 +57,7 @@ struct Constants {
         case experiment = "experiment"
         case featureTest = "feature-test"
         case rollout = "rollout"
+        case holdout = "holdout"
     }
 
     struct DecisionInfoKeys {