fixed decision service

mnoman09 · mnoman09 · commit 3bd0bb04bb3a · 2021-11-12T21:06:25.000+05:00
diff --git a/OptimizelySDK.Tests/DecisionServiceTest.cs b/OptimizelySDK.Tests/DecisionServiceTest.cs
@@ -845,7 +845,7 @@ public void TestGetVariationForFeatureRolloutAudienceAndTrafficeAllocationCheck(
             actualDecision = decisionService.GetVariationForFeatureRollout(featureFlag, optimizelyUserContext4, ProjectConfig);
 
             // Returned decision entity should be null because bucket value exceeds traffic allocation of everyone else rule.
-            Assert.Null(actualDecision.ResultObject);
+            Assert.Null(actualDecision.ResultObject?.Variation?.Key);
         }
 
         [Test]
diff --git a/OptimizelySDK/Bucketing/DecisionService.cs b/OptimizelySDK/Bucketing/DecisionService.cs
@@ -455,7 +455,7 @@ public virtual Result<FeatureDecision> GetVariationForFeatureRollout(FeatureFlag
                 var decisionResult = GetVariationFromDeliveryRule(config, featureFlag.Key, rolloutRules, index, user);
                 reasons += decisionResult.DecisionReasons;
 
-                if (decisionResult.ResultObject?.Variation != null)
+                if (decisionResult.ResultObject?.Variation?.Key != null)
                 {
                     return Result<FeatureDecision>.NewResult(new FeatureDecision(rolloutRules[index], decisionResult.ResultObject.Variation, FeatureDecision.DECISION_SOURCE_ROLLOUT), reasons);
                 }
@@ -577,7 +577,7 @@ private Result<FeatureDecision> GetVariationFromDeliveryRule(ProjectConfig confi
             Result<Variation> bucketedVariation = null;
 
             // Evaluate if user meets the audience condition of this rollout rule
-            var doesUserMeetAudienceConditionsResult = ExperimentUtils.DoesUserMeetAudienceConditions(config, rule, attributes, LOGGING_KEY_TYPE_EXPERIMENT, rule.Key, Logger);
+            var doesUserMeetAudienceConditionsResult = ExperimentUtils.DoesUserMeetAudienceConditions(config, rule, attributes, LOGGING_KEY_TYPE_RULE, rule.Key, Logger);
             reasons += doesUserMeetAudienceConditionsResult.DecisionReasons;
             if (doesUserMeetAudienceConditionsResult.ResultObject)
             {
@@ -599,7 +599,7 @@ private Result<FeatureDecision> GetVariationFromDeliveryRule(ProjectConfig confi
             }
             else
             {
-                Logger.Log(LogLevel.DEBUG, reasons.AddInfo($"User \"{userId}\" does not meet conditions for targeting rule \"{loggingKey}\"."));
+                Logger.Log(LogLevel.DEBUG, reasons.AddInfo($"User \"{userId}\" does not meet the conditions for targeting rule \"{loggingKey}\"."));
             }
 
             return Result<FeatureDecision>.NewResult(new FeatureDecision(rule, bucketedVariation?.ResultObject, null), skipToEveryoneElse, reasons);
@@ -676,11 +676,11 @@ public virtual Result<FeatureDecision> GetVariationForFeature(FeatureFlag featur
 
             if (decisionResult.ResultObject != null)
             {
-                Logger.Log(LogLevel.INFO, reasons.AddInfo($"User \"{userId}\" is bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));
+                Logger.Log(LogLevel.INFO, reasons.AddInfo($"The user \"{userId}\" is bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));
                 return Result<FeatureDecision>.NewResult(decisionResult.ResultObject, reasons);
             }
 
-            Logger.Log(LogLevel.INFO, reasons.AddInfo($"User \"{userId}\" is not bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));
+            Logger.Log(LogLevel.INFO, reasons.AddInfo($"The user \"{userId}\" is not bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));
             return Result<FeatureDecision>.NullResult(reasons);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ public void TestGetVariationForFeatureRolloutAudienceAndTrafficeAllocationCheck(`
`845`	`845`	`actualDecision = decisionService.GetVariationForFeatureRollout(featureFlag, optimizelyUserContext4, ProjectConfig);`
`846`	`846`
`847`	`847`	`// Returned decision entity should be null because bucket value exceeds traffic allocation of everyone else rule.`
`848`		`- Assert.Null(actualDecision.ResultObject);`
	`848`	`+ Assert.Null(actualDecision.ResultObject?.Variation?.Key);`
`849`	`849`	`}`
`850`	`850`
`851`	`851`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ public virtual Result<FeatureDecision> GetVariationForFeatureRollout(FeatureFlag`
`455`	`455`	`var decisionResult = GetVariationFromDeliveryRule(config, featureFlag.Key, rolloutRules, index, user);`
`456`	`456`	`reasons += decisionResult.DecisionReasons;`
`457`	`457`
`458`		`- if (decisionResult.ResultObject?.Variation != null)`
	`458`	`+ if (decisionResult.ResultObject?.Variation?.Key != null)`
`459`	`459`	`{`
`460`	`460`	`return Result<FeatureDecision>.NewResult(new FeatureDecision(rolloutRules[index], decisionResult.ResultObject.Variation, FeatureDecision.DECISION_SOURCE_ROLLOUT), reasons);`
`461`	`461`	`}`
`@@ -577,7 +577,7 @@ private Result<FeatureDecision> GetVariationFromDeliveryRule(ProjectConfig confi`
`577`	`577`	`Result<Variation> bucketedVariation = null;`
`578`	`578`
`579`	`579`	`// Evaluate if user meets the audience condition of this rollout rule`
`580`		`- var doesUserMeetAudienceConditionsResult = ExperimentUtils.DoesUserMeetAudienceConditions(config, rule, attributes, LOGGING_KEY_TYPE_EXPERIMENT, rule.Key, Logger);`
	`580`	`+ var doesUserMeetAudienceConditionsResult = ExperimentUtils.DoesUserMeetAudienceConditions(config, rule, attributes, LOGGING_KEY_TYPE_RULE, rule.Key, Logger);`
`581`	`581`	`reasons += doesUserMeetAudienceConditionsResult.DecisionReasons;`
`582`	`582`	`if (doesUserMeetAudienceConditionsResult.ResultObject)`
`583`	`583`	`{`
`@@ -599,7 +599,7 @@ private Result<FeatureDecision> GetVariationFromDeliveryRule(ProjectConfig confi`
`599`	`599`	`}`
`600`	`600`	`else`
`601`	`601`	`{`
`602`		`- Logger.Log(LogLevel.DEBUG, reasons.AddInfo($"User \"{userId}\" does not meet conditions for targeting rule \"{loggingKey}\"."));`
	`602`	`+ Logger.Log(LogLevel.DEBUG, reasons.AddInfo($"User \"{userId}\" does not meet the conditions for targeting rule \"{loggingKey}\"."));`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	`return Result<FeatureDecision>.NewResult(new FeatureDecision(rule, bucketedVariation?.ResultObject, null), skipToEveryoneElse, reasons);`
`@@ -676,11 +676,11 @@ public virtual Result<FeatureDecision> GetVariationForFeature(FeatureFlag featur`
`676`	`676`
`677`	`677`	`if (decisionResult.ResultObject != null)`
`678`	`678`	`{`
`679`		`- Logger.Log(LogLevel.INFO, reasons.AddInfo($"User \"{userId}\" is bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));`
	`679`	`+ Logger.Log(LogLevel.INFO, reasons.AddInfo($"The user \"{userId}\" is bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));`
`680`	`680`	`return Result<FeatureDecision>.NewResult(decisionResult.ResultObject, reasons);`
`681`	`681`	`}`
`682`	`682`
`683`		`- Logger.Log(LogLevel.INFO, reasons.AddInfo($"User \"{userId}\" is not bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));`
	`683`	`+ Logger.Log(LogLevel.INFO, reasons.AddInfo($"The user \"{userId}\" is not bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));`
`684`	`684`	`return Result<FeatureDecision>.NullResult(reasons);`
`685`	`685`	`}`
`686`	`686`