move validate forced decision to decision service (#292)

* move validate forced decision to decision service * Fixed comments Co-authored-by: muhammadnoman <[email protected]>
optimizely · Jan 5, 2022 · 5a6a098 · 5a6a098
1 parent 512d491
commit 5a6a098
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 51 deletions.
diff --git a/OptimizelySDK.Tests/DecisionServiceTest.cs b/OptimizelySDK.Tests/DecisionServiceTest.cs
@@ -71,6 +71,25 @@ public void SetUp()
             Config = DatafileProjectConfig.Create(TestData.Datafile, LoggerMock.Object, ErrorHandlerMock.Object);
         }
 
+        [Test]
+        public void TestFindValidatedForcedDecisionReturnsCorrectDecisionWithNullVariation()
+        {
+            DecisionService decisionService = new DecisionService(BucketerMock.Object, ErrorHandlerMock.Object, null, LoggerMock.Object);
+
+            var optlyObject = new Optimizely(TestData.Datafile, new ValidEventDispatcher(), LoggerMock.Object);
+
+            var decisionReasons = new DecisionReasons();
+            decisionReasons.AddInfo("{0}", "Invalid variation is mapped to flag: flagKey and rule: rule forced decision map.");
+            var expectedResult = Result<Variation>.NullResult(decisionReasons);
+            var user = optlyObject.CreateUserContext(GenericUserId);
+
+            var context = new OptimizelyDecisionContext("flagKey", "ruleKey");
+
+            var result = decisionService.ValidatedForcedDecision(context, Config, user);
+
+            Assertions.AreEqual(expectedResult, result);
+        }
+
         [Test]
         public void TestGetVariationForcedVariationPrecedesAudienceEval()
         {

diff --git a/OptimizelySDK.Tests/OptimizelyUserContextTest.cs b/OptimizelySDK.Tests/OptimizelyUserContextTest.cs
@@ -286,21 +286,6 @@ public void TestGetForcedDecisionReturnsValueWithRuleKey()
             Assertions.AreEqual(decision, result);
         }
 
-        [Test]
-        public void TestFindValidatedForcedDecisionReturnsCorrectDecisionWithNullVariation()
-        {
-            var decisionReasons = new DecisionReasons();
-            decisionReasons.AddInfo("{0}", "Invalid variation is mapped to flag: flagKey and rule: rule forced decision map.");
-            var expectedResult = Result<Variation>.NullResult(decisionReasons);
-            var user = Optimizely.CreateUserContext(UserID);
-
-            var context = new OptimizelyDecisionContext("flagKey", "ruleKey");
-
-            var result = user.FindValidatedForcedDecision(context, null);
-
-            Assertions.AreEqual(expectedResult, result);
-        }
-
         [Test]
         public void TestRemoveForcedDecisionReturnsFalseForNullFlagKey()
         {

diff --git a/OptimizelySDK/Bucketing/DecisionService.cs b/OptimizelySDK/Bucketing/DecisionService.cs
@@ -461,7 +461,7 @@ public virtual Result<FeatureDecision> GetVariationForFeatureRollout(FeatureFlag
                 //Check forced decision first
                 var rule = rolloutRules[index];
                 var decisionContext = new OptimizelyDecisionContext(featureFlag.Key, rule.Key);
-                var forcedDecisionResponse = user.FindValidatedForcedDecision(decisionContext, config);
+                var forcedDecisionResponse = ValidatedForcedDecision(decisionContext, config, user);
 
                 reasons += forcedDecisionResponse.DecisionReasons;
                 if (forcedDecisionResponse.ResultObject != null)
@@ -550,10 +550,9 @@ public virtual Result<FeatureDecision> GetVariationForFeatureExperiment(FeatureF
 
                 if (string.IsNullOrEmpty(experiment.Key))
                     continue;
-
-                var forcedDecisionResponse = user.FindValidatedForcedDecision(
-                    new OptimizelyDecisionContext(featureFlag.Key, experiment?.Key),
-                    config);
+                var decisionContext = new OptimizelyDecisionContext(featureFlag.Key, experiment?.Key);
+                var forcedDecisionResponse = ValidatedForcedDecision(decisionContext, config, user);
+
                 reasons += forcedDecisionResponse.DecisionReasons;
 
                 if (forcedDecisionResponse?.ResultObject != null) 
@@ -662,5 +661,32 @@ private Result<string> GetBucketingId(string userId, UserAttributes filteredAttr
 
             return Result<string>.NewResult(bucketingId, reasons);
         }
+
+        /// <summary>
+        /// Finds a validated forced decision.
+        /// </summary>
+        /// <param name="context">Object containing flag and rule key of which forced decision is set.</param>
+        /// <param name="config">The Project config.</param>
+        /// <param name="user">Optimizely user context.</param>
+        /// <returns>A result with the variation</returns>
+        public Result<Variation> ValidatedForcedDecision(OptimizelyDecisionContext context, ProjectConfig config, OptimizelyUserContext user)
+        {
+            DecisionReasons reasons = new DecisionReasons();
+            var userId = user.GetUserId();
+            var forcedDecision = user.GetForcedDecision(context);
+            if (config != null && forcedDecision != null) {
+                var loggingKey = context.RuleKey != null ? "flag (" + context.FlagKey + "), rule (" + context.RuleKey + ")" : "flag (" + context.FlagKey + ")";
+                var variationKey = forcedDecision.VariationKey;
+                var variation = config.GetFlagVariationByKey(context.FlagKey, variationKey);
+                if (variation != null) {
+                    reasons.AddInfo("Decided by forced decision.");
+                    reasons.AddInfo("Variation ({0}) is mapped to {1} and user ({2}) in the forced decision map.", variationKey, loggingKey, userId);
+                    return Result<Variation>.NewResult(variation, reasons);
+                } else {
+                    reasons.AddInfo("Invalid variation is mapped to {0} and user ({1}) in the forced decision map.", loggingKey, userId);
+                }
+            }
+            return Result<Variation>.NullResult(reasons);
+        }
     }
 }
diff --git a/OptimizelySDK/Optimizely.cs b/OptimizelySDK/Optimizely.cs
@@ -754,7 +754,7 @@ internal OptimizelyDecision Decide(OptimizelyUserContext user,
             FeatureDecision decision = null;
 
             var decisionContext = new OptimizelyDecisionContext(flag.Key);
-            var forcedDecisionVariation = user.FindValidatedForcedDecision(decisionContext, config);
+            var forcedDecisionVariation = DecisionService.ValidatedForcedDecision(decisionContext, config, user);
             decisionReasons += forcedDecisionVariation.DecisionReasons;
 
             if (forcedDecisionVariation.ResultObject != null)

diff --git a/OptimizelySDK/OptimizelyUserContext.cs b/OptimizelySDK/OptimizelyUserContext.cs
@@ -298,35 +298,5 @@ public bool RemoveAllForcedDecisions()
             }
             return true;
         }
-
-        /// <summary>
-        /// Finds a validated forced decision.
-        /// </summary>
-        /// <param name="context">Object containing flag and rule key of which forced decision is set.</param>
-        /// <param name="config">The Project config.</param>
-        /// <returns>A result with the variation</returns>
-        public Result<Variation> FindValidatedForcedDecision(OptimizelyDecisionContext context, ProjectConfig config)
-        {
-            DecisionReasons reasons = new DecisionReasons();
-            var forcedDecision = GetForcedDecision(context);
-
-            if (config != null && forcedDecision != null)
-            {
-                var loggingKey = context.RuleKey != null ? "flag (" + context.FlagKey + "), rule (" + context.RuleKey + ")" : "flag (" + context.FlagKey + ")";
-                var variationKey = forcedDecision.VariationKey;
-                var variation = config.GetFlagVariationByKey(context.FlagKey, variationKey);
-                if (variation != null)
-                {
-                    reasons.AddInfo("Decided by forced decision.");
-                    reasons.AddInfo("Variation ({0}) is mapped to {1} and user ({2}) in the forced decision map.", variationKey, loggingKey, UserId);
-                    return Result<Variation>.NewResult(variation, reasons);
-                }
-                else
-                {
-                    reasons.AddInfo("Invalid variation is mapped to {0} and user ({1}) in the forced decision map.", loggingKey, UserId);
-                }
-            }
-            return Result<Variation>.NullResult(reasons);
-        }
     }
 }