fix: match updates to java PR

Author: mikechu-optimizely

OptimizelySDK/Bucketing/DecisionService.cs

@@ -41,8 +41,8 @@ public class DecisionService
         public const string LOGGING_KEY_TYPE_RULE = "rule";
 
         private Bucketer Bucketer;
-        private IErrorHandler ErrorHandler;
-        private UserProfileService UserProfileService;
+        private static IErrorHandler ErrorHandler;
+        private static UserProfileService UserProfileService;
         private static ILogger Logger;
 
         /// <summary>
@@ -118,8 +118,8 @@ OptimizelyDecideOption[] options
 
             if (UserProfileService != null && !ignoreUps)
             {
-                var userProfile = GetUserProfile(user.GetUserId(), reasons);
-                userProfileTracker = new UserProfileTracker(userProfile, false);
+                userProfileTracker = new UserProfileTracker(user.GetUserId());
+                userProfileTracker.LoadUserProfile(reasons);
             }
 
             var response = GetVariation(experiment, user, config, options, userProfileTracker,
@@ -128,7 +128,7 @@ OptimizelyDecideOption[] options
             if (UserProfileService != null && !ignoreUps &&
                 userProfileTracker?.ProfileUpdated == true)
             {
-                SaveUserProfile(userProfileTracker.UserProfile);
+                userProfileTracker.SaveUserProfile();
             }
 
             return response;
@@ -166,7 +166,6 @@ public virtual Result<Variation> GetVariation(Experiment experiment,
 
             var userId = user.GetUserId();
 
-            // check if a forced variation is set
             var decisionVariationResult = GetForcedVariation(experiment.Key, userId, config);
             reasons += decisionVariationResult.DecisionReasons;
             var variation = decisionVariationResult.ResultObject;
@@ -733,75 +732,52 @@ public virtual Result<FeatureDecision> GetVariationForFeature(FeatureFlag featur
                 new OptimizelyDecideOption[] { });
         }
 
-        void SaveUserProfile(UserProfile userProfile)
+        public class UserProfileTracker
         {
-            if (UserProfileService == null)
-            {
-                return;
-            }
+            public UserProfile UserProfile { get; private set; }
+            public bool ProfileUpdated { get; private set; }
+            private string UserId { get; set; }
 
-            try
+            public UserProfileTracker(string userId)
             {
-                UserProfileService.Save(userProfile.ToMap());
-                Logger.Log(LogLevel.INFO,
-                    $"Saved user profile of user \"{userProfile.UserId}\".");
+                UserId = userId;
+                ProfileUpdated = false;
+                UserProfile = null;
             }
-            catch (Exception exception)
+            
+            public void LoadUserProfile(DecisionReasons reasons)
             {
-                Logger.Log(LogLevel.WARN,
-                    $"Failed to save user profile of user \"{userProfile.UserId}\".");
-                ErrorHandler.HandleError(new Exceptions.OptimizelyRuntimeException(exception.Message));
-            }
-        }
-
-        private UserProfile GetUserProfile(String userId, DecisionReasons reasons)
-        {
-            UserProfile userProfile = null;
-
-            try
-            {
-                var userProfileMap = UserProfileService.Lookup(userId);
-                if (userProfileMap == null)
+                try
                 {
-                    Logger.Log(LogLevel.INFO,
-                        reasons.AddInfo(
-                            "We were unable to get a user profile map from the UserProfileService."));
+                    var userProfileMap = UserProfileService.Lookup(UserId);
+                    if (userProfileMap == null)
+                    {
+                        Logger.Log(LogLevel.INFO,
+                            reasons.AddInfo(
+                                "We were unable to get a user profile map from the UserProfileService."));
+                    }
+                    else if (UserProfileUtil.IsValidUserProfileMap(userProfileMap))
+                    {
+                        UserProfile = UserProfileUtil.ConvertMapToUserProfile(userProfileMap);
+                    }
+                    else
+                    {
+                        Logger.Log(LogLevel.WARN,
+                            reasons.AddInfo("The UserProfileService returned an invalid map."));
+                    }
                 }
-                else if (UserProfileUtil.IsValidUserProfileMap(userProfileMap))
+                catch (Exception exception)
                 {
-                    userProfile = UserProfileUtil.ConvertMapToUserProfile(userProfileMap);
+                    Logger.Log(LogLevel.ERROR, reasons.AddInfo(exception.Message));
+                    ErrorHandler.HandleError(
+                        new Exceptions.OptimizelyRuntimeException(exception.Message));
                 }
-                else
+                
+                if (UserProfile == null)
                 {
-                    Logger.Log(LogLevel.WARN,
-                        reasons.AddInfo("The UserProfileService returned an invalid map."));
+                    UserProfile = new UserProfile(UserId, new Dictionary<string, Decision>());
                 }
             }
-            catch (Exception exception)
-            {
-                Logger.Log(LogLevel.ERROR, reasons.AddInfo(exception.Message));
-                ErrorHandler.HandleError(
-                    new Exceptions.OptimizelyRuntimeException(exception.Message));
-            }
-
-            if (userProfile == null)
-            {
-                userProfile = new UserProfile(userId, new Dictionary<string, Decision>());
-            }
-
-            return userProfile;
-        }
-
-        public class UserProfileTracker
-        {
-            public UserProfile UserProfile { get; set; }
-            public bool ProfileUpdated { get; set; }
-
-            public UserProfileTracker(UserProfile userProfile, bool profileUpdated)
-            {
-                UserProfile = userProfile;
-                ProfileUpdated = profileUpdated;
-            }
 
             public void UpdateUserProfile(Experiment experiment, Variation variation)
             {
@@ -824,6 +800,27 @@ public void UpdateUserProfile(Experiment experiment, Variation variation)
                 Logger.Log(LogLevel.INFO,
                     $"Updated variation \"{variationId}\" of experiment \"{experimentId}\" for user \"{UserProfile.UserId}\".");
             }
+            
+            public void SaveUserProfile() 
+            {
+                if (!ProfileUpdated)
+                {
+                    return;
+                }
+
+                try
+                {
+                    UserProfileService.Save(UserProfile.ToMap());
+                    Logger.Log(LogLevel.INFO,
+                        $"Saved user profile of user \"{UserProfile.UserId}\".");
+                }
+                catch (Exception exception)
+                {
+                    Logger.Log(LogLevel.WARN,
+                        $"Failed to save user profile of user \"{UserProfile.UserId}\".");
+                    ErrorHandler.HandleError(new Exceptions.OptimizelyRuntimeException(exception.Message));
+                }
+            }
         }
 
         public virtual List<Result<FeatureDecision>> GetVariationsForFeatureList(
@@ -836,13 +833,13 @@ OptimizelyDecideOption[] options
         {
             var upsReasons = new DecisionReasons();
 
-            var ignoreUPS = options.Contains(OptimizelyDecideOption.IGNORE_USER_PROFILE_SERVICE);
+            var ignoreUps = options.Contains(OptimizelyDecideOption.IGNORE_USER_PROFILE_SERVICE);
             UserProfileTracker userProfileTracker = null;
 
-            if (UserProfileService != null && !ignoreUPS)
+            if (UserProfileService != null && !ignoreUps)
             {
-                var userProfile = GetUserProfile(user.GetUserId(), upsReasons);
-                userProfileTracker = new UserProfileTracker(userProfile, false);
+                userProfileTracker = new UserProfileTracker(user.GetUserId());
+                userProfileTracker.LoadUserProfile(upsReasons);
             }
 
             var userId = user.GetUserId();
@@ -888,9 +885,9 @@ OptimizelyDecideOption[] options
                 }
             }
 
-            if (UserProfileService != null && !ignoreUPS && userProfileTracker?.ProfileUpdated == true)
+            if (UserProfileService != null && !ignoreUps && userProfileTracker?.ProfileUpdated == true)
             {
-                SaveUserProfile(userProfileTracker.UserProfile);
+                userProfileTracker.SaveUserProfile();
             }
 
             return decisions;

OptimizelySDK/Optimizely.cs

@@ -855,31 +855,6 @@ private OptimizelyUserContext CreateUserContextCopy(string userId,
             );
         }
 
-        /// <summary>
-        /// Get forced decision for the given flag key.
-        /// </summary>
-        /// <param name="flagKey">Flag key</param>
-        /// <param name="decisionReasons">A collection of decision reasons</param>
-        /// <param name="projectConfig">The project config</param>
-        /// <param name="user">The user context</param>
-        /// <returns>Feature decision</returns>
-        public FeatureDecision GetForcedDecision(string flagKey, DecisionReasons decisionReasons,
-            ProjectConfig projectConfig, OptimizelyUserContext user
-        )
-        {
-            var context = new OptimizelyDecisionContext(flagKey);
-            var forcedDecisionVariation =
-                DecisionService.ValidatedForcedDecision(context, projectConfig, user);
-            decisionReasons += forcedDecisionVariation.DecisionReasons;
-            if (forcedDecisionVariation.ResultObject != null)
-            {
-                return new FeatureDecision(null, forcedDecisionVariation.ResultObject,
-                    FeatureDecision.DECISION_SOURCE_FEATURE_TEST);
-            }
-
-            return null;
-        }
-
         /// <summary>
         /// Returns a decision result ({@link OptimizelyDecision}) for a given flag key and a user context, which contains all data required to deliver the flag.
         /// <ul>
@@ -975,12 +950,18 @@ internal Dictionary<string, OptimizelyDecision> DecideForKeys(OptimizelyUserCont
                 validKeys.Add(key);
 
                 var decisionReasons = new DecisionReasons();
-                var forcedDecision = GetForcedDecision(key, decisionReasons, projectConfig, user);
                 decisionReasonsMap.Add(key, decisionReasons);
-
-                if (forcedDecision != null)
+                
+                var optimizelyDecisionContext = new OptimizelyDecisionContext(key);
+                var forcedDecisionVariation =
+                    DecisionService.ValidatedForcedDecision(optimizelyDecisionContext, projectConfig, user);
+                decisionReasons += forcedDecisionVariation.DecisionReasons;
+                
+                if (forcedDecisionVariation.ResultObject != null)
                 {
-                    flagDecisions.Add(key, forcedDecision);
+                    flagDecisions.Add(key, new FeatureDecision(null,
+                        forcedDecisionVariation.ResultObject,
+                        FeatureDecision.DECISION_SOURCE_FEATURE_TEST));
                 }
                 else
                 {