[FSSDK-11546] decision service adjustmen

Author: junaed-optimizely

OptimizelySDK/Bucketing/Bucketer.cs

@@ -112,7 +112,7 @@ IEnumerable<TrafficAllocation> trafficAllocations
         /// <param name="bucketingId">A customer-assigned value used to create the key for the murmur hash.</param>
         /// <param name="userId">User identifier</param>
         /// <returns>Variation which will be shown to the user</returns>
-        public virtual Result<Variation> Bucket(ProjectConfig config, Experiment experiment,
+        public virtual Result<Variation> Bucket(ProjectConfig config, ExperimentCore experiment,
             string bucketingId, string userId
         )
         {
@@ -127,9 +127,9 @@ public virtual Result<Variation> Bucket(ProjectConfig config, Experiment experim
             }
 
             // Determine if experiment is in a mutually exclusive group.
-            if (experiment.IsInMutexGroup)
+            if (experiment is Experiment exp && exp.IsInMutexGroup)
             {
-                var group = config.GetGroup(experiment.GroupId);
+                var group = config.GetGroup(exp.GroupId);
                 if (string.IsNullOrEmpty(group.Id))
                 {
                     return Result<Variation>.NewResult(new Variation(), reasons);
@@ -147,13 +147,13 @@ public virtual Result<Variation> Bucket(ProjectConfig config, Experiment experim
                 if (userExperimentId != experiment.Id)
                 {
                     message =
-                        $"User [{userId}] is not in experiment [{experiment.Key}] of group [{experiment.GroupId}].";
+                        $"User [{userId}] is not in experiment [{exp.Key}] of group [{exp.GroupId}].";
                     Logger.Log(LogLevel.INFO, reasons.AddInfo(message));
                     return Result<Variation>.NewResult(new Variation(), reasons);
                 }
 
                 message =
-                    $"User [{userId}] is in experiment [{experiment.Key}] of group [{experiment.GroupId}].";
+                    $"User [{userId}] is in experiment [{exp.Key}] of group [{exp.GroupId}].";
                 Logger.Log(LogLevel.INFO, reasons.AddInfo(message));
             }
 

OptimizelySDK/Bucketing/DecisionService.cs

@@ -22,6 +22,7 @@
 using OptimizelySDK.Logger;
 using OptimizelySDK.OptimizelyDecisions;
 using OptimizelySDK.Utils;
+using static OptimizelySDK.Entity.Holdout;
 
 namespace OptimizelySDK.Bucketing
 {
@@ -754,7 +755,22 @@ OptimizelyDecideOption[] options
             {
                 var reasons = new DecisionReasons();
                 reasons += upsReasons;
+                var holdouts = projectConfig.GetHoldoutsForFlag(featureFlag.Key);
+                foreach (var holdout in holdouts)
+                {
+                    var holdoutDecision = GetVariationForHoldout(holdout, user, projectConfig);
+                    reasons += holdoutDecision.DecisionReasons;
 
+                    if (holdoutDecision.ResultObject != null)
+                    {
+                        Logger.Log(LogLevel.INFO,
+                            reasons.AddInfo(
+                                $"The user \"{userId}\" is bucketed into holdout \"{holdout.Key}\" for feature flag \"{featureFlag.Key}\"."));
+                        decisions.Add(Result<FeatureDecision>.NewResult(holdoutDecision.ResultObject,
+                            reasons));
+                        continue;
+                    }
+                }
                 // Check if the feature flag has an experiment and the user is bucketed into that experiment.
                 var decisionResult = GetVariationForFeatureExperiment(featureFlag, user,
                     filteredAttributes, projectConfig, options, userProfileTracker);
@@ -856,6 +872,76 @@ private Result<string> GetBucketingId(string userId, UserAttributes filteredAttr
             return Result<string>.NewResult(bucketingId, reasons);
         }
 
+        private Result<FeatureDecision> GetVariationForHoldout(
+            Holdout holdout,
+            OptimizelyUserContext user,
+            ProjectConfig config
+        )
+        {
+            var userId = user.GetUserId();
+            var reasons = new DecisionReasons();
+
+            if (!holdout.IsActivated)
+            {
+                reasons.AddInfo("Holdout ({0}) is not running.", holdout.Key);
+                return Result<FeatureDecision>.NewResult(
+                    new FeatureDecision(null, null, FeatureDecision.DECISION_SOURCE_HOLDOUT),
+                    reasons
+                );
+            }
+
+            var audienceResult = ExperimentUtils.DoesUserMeetAudienceConditions(
+                config,
+                holdout,
+                user,
+                LOGGING_KEY_TYPE_EXPERIMENT,
+                holdout.Key,
+                Logger
+            );
+            reasons += audienceResult.DecisionReasons;
+
+            if (!audienceResult.ResultObject)
+            {
+                reasons.AddInfo(
+                    "User ({0}) does not meet conditions for holdout ({1}).",
+                    userId,
+                    holdout.Key
+                );
+                return Result<FeatureDecision>.NewResult(
+                    new FeatureDecision(null, null, FeatureDecision.DECISION_SOURCE_HOLDOUT),
+                    reasons
+                );
+            }
+
+            var attributes = user.GetAttributes();
+            var bucketingIdResult = GetBucketingId(userId, attributes);
+            var bucketedVariation = Bucketer.Bucket(config, holdout, bucketingIdResult.ResultObject, userId);
+            reasons += bucketedVariation.DecisionReasons;
+
+            if (bucketedVariation.ResultObject != null)
+            {
+                reasons.AddInfo(
+                    "User ({0}) is bucketed into holdout variation ({1}).",
+                    userId,
+                    bucketedVariation.ResultObject.Key
+                );
+                return Result<FeatureDecision>.NewResult(
+                    new FeatureDecision(holdout, bucketedVariation.ResultObject, FeatureDecision.DECISION_SOURCE_HOLDOUT),
+                    reasons
+                );
+            }
+
+            reasons.AddInfo(
+                "User ({0}) is not bucketed into holdout variation ({1}).",
+                userId,
+                holdout.Key
+            );
+
+            return Result<FeatureDecision>.NewResult(
+                new FeatureDecision(null, null, FeatureDecision.DECISION_SOURCE_HOLDOUT),
+                reasons
+            );
+        }
         /// <summary>
         /// Finds a validated forced decision.
         /// </summary>

OptimizelySDK/Entity/FeatureDecision.cs

@@ -20,12 +20,12 @@ public class FeatureDecision
     {
         public const string DECISION_SOURCE_FEATURE_TEST = "feature-test";
         public const string DECISION_SOURCE_ROLLOUT = "rollout";
-
-        public Experiment Experiment { get; }
+        public const string DECISION_SOURCE_HOLDOUT = "holdout";
+        public ExperimentCore Experiment { get; }
         public Variation Variation { get; }
         public string Source { get; }
 
-        public FeatureDecision(Experiment experiment, Variation variation, string source)
+        public FeatureDecision(ExperimentCore experiment, Variation variation, string source)
         {
             Experiment = experiment;
             Variation = variation;

OptimizelySDK/Utils/ExperimentUtils.cs

@@ -46,7 +46,7 @@ public static bool IsExperimentActive(Experiment experiment, ILogger logger)
         /// <param name="logger">Custom logger implementation to record log outputs</param>
         /// <returns>true if the user meets audience conditions to be in experiment, false otherwise.</returns>
         public static Result<bool> DoesUserMeetAudienceConditions(ProjectConfig config,
-            Experiment experiment,
+            ExperimentCore experiment,
             OptimizelyUserContext user,
             string loggingKeyType,
             string loggingKey,