refactor: less movement of code as the ref implementation

mikechu-optimizely · mikechu-optimizely · commit dfe13678fdeb · 2024-10-08T15:15:02.000-04:00
diff --git a/OptimizelySDK/Bucketing/DecisionService.cs b/OptimizelySDK/Bucketing/DecisionService.cs
@@ -56,6 +56,7 @@ public bool DecisionBatchInProgress
                 {
                     SaveToUserProfileService();
                 }
+
                 _decisionBatchInProgress = value;
             }
         }
@@ -168,6 +169,13 @@ OptimizelyDecideOption[] options
                             UserProfileUtil.IsValidUserProfileMap(userProfileMap))
                         {
                             _userProfile = UserProfileUtil.ConvertMapToUserProfile(userProfileMap);
+                            decisionVariationResult =
+                                GetStoredVariation(experiment, _userProfile, config);
+                            reasons += decisionVariationResult.DecisionReasons;
+                            if (decisionVariationResult.ResultObject != null)
+                            {
+                                return decisionVariationResult.SetReasons(reasons);
+                            }
                         }
                         else if (userProfileMap == null)
                         {
@@ -181,17 +189,6 @@ OptimizelyDecideOption[] options
                                 reasons.AddInfo("The UserProfileService returned an invalid map."));
                         }
                     }
-
-                    if (_userProfile != null)
-                    {
-                        decisionVariationResult =
-                            GetStoredVariation(experiment, _userProfile, config);
-                        reasons += decisionVariationResult.DecisionReasons;
-                        if (decisionVariationResult.ResultObject != null)
-                        {
-                            return decisionVariationResult.SetReasons(reasons);
-                        }
-                    }
                 }
                 catch (Exception exception)
                 {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public bool DecisionBatchInProgress`
`56`	`56`	`{`
`57`	`57`	`SaveToUserProfileService();`
`58`	`58`	`}`
	`59`	`+`
`59`	`60`	`_decisionBatchInProgress = value;`
`60`	`61`	`}`
`61`	`62`	`}`
`@@ -168,6 +169,13 @@ OptimizelyDecideOption[] options`
`168`	`169`	`UserProfileUtil.IsValidUserProfileMap(userProfileMap))`
`169`	`170`	`{`
`170`	`171`	`_userProfile = UserProfileUtil.ConvertMapToUserProfile(userProfileMap);`
	`172`	`+ decisionVariationResult =`
	`173`	`+ GetStoredVariation(experiment, _userProfile, config);`
	`174`	`+ reasons += decisionVariationResult.DecisionReasons;`
	`175`	`+ if (decisionVariationResult.ResultObject != null)`
	`176`	`+ {`
	`177`	`+ return decisionVariationResult.SetReasons(reasons);`
	`178`	`+ }`
`171`	`179`	`}`
`172`	`180`	`else if (userProfileMap == null)`
`173`	`181`	`{`
`@@ -181,17 +189,6 @@ OptimizelyDecideOption[] options`
`181`	`189`	`reasons.AddInfo("The UserProfileService returned an invalid map."));`
`182`	`190`	`}`
`183`	`191`	`}`
`184`		`-`
`185`		`- if (_userProfile != null)`
`186`		`- {`
`187`		`- decisionVariationResult =`
`188`		`- GetStoredVariation(experiment, _userProfile, config);`
`189`		`- reasons += decisionVariationResult.DecisionReasons;`
`190`		`- if (decisionVariationResult.ResultObject != null)`
`191`		`- {`
`192`		`- return decisionVariationResult.SetReasons(reasons);`
`193`		`- }`
`194`		`- }`
`195`	`192`	`}`
`196`	`193`	`catch (Exception exception)`
`197`	`194`	`{`