fix: for GetVariation & Activate never use cached user profile

optimizely · Oct 18, 2024 · 9c6e9bb · 9c6e9bb
1 parent d6258f1
commit 9c6e9bb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
@@ -8,6 +8,7 @@ on:
 
 jobs:
   failOnDraftPullRequest:
+    name: Fail If Draft Pull Request
     if: github.event.pull_request.draft == true
     runs-on: ubuntu-latest
     steps:

diff --git a/OptimizelySDK/Bucketing/DecisionService.cs b/OptimizelySDK/Bucketing/DecisionService.cs
@@ -85,35 +85,26 @@ public DecisionService(Bucketer bucketer, IErrorHandler errorHandler,
 #endif
         }
 
-        /// <summary>
-        /// Get a Variation of an Experiment for a user to be allocated into.
-        /// </summary>
-        /// <param name = "experiment" > The Experiment the user will be bucketed into.</param>
-        /// <param name = "user" > Optimizely user context.</param>
-        /// <param name = "config" > Project config.</param>
-        /// <returns>The Variation the user is allocated into.</returns>
-        public virtual Result<Variation> GetVariation(Experiment experiment,
-            OptimizelyUserContext user,
-            ProjectConfig config
-        )
-        {
-            return GetVariation(experiment, user, config, new OptimizelyDecideOption[] { });
-        }
-
         /// <summary>
         /// Get a Variation of an Experiment for a user to be allocated into.
         /// </summary>
         /// <param name="experiment">The Experiment the user will be bucketed into.</param>
         /// <param name="user">optimizely user context.</param>
         /// <param name="config">Project Config.</param>
         /// <param name="options">An array of decision options.</param>
+        /// <param name="forceUserProfileLookup">Whether to force a lookup of the user profile when UPS is enabled.</param>
         /// <returns>The Variation the user is allocated into.</returns>
         public virtual Result<Variation> GetVariation(Experiment experiment,
             OptimizelyUserContext user,
             ProjectConfig config,
-            OptimizelyDecideOption[] options
+            OptimizelyDecideOption[] options = null, 
+            bool forceUserProfileLookup = false
         )
         {
+            if (options == null)
+            {
+                options = new OptimizelyDecideOption[] { };
+            }
             var reasons = new DecisionReasons();
             var userId = user.GetUserId();
             if (!ExperimentUtils.IsExperimentActive(experiment, Logger))
@@ -149,7 +140,7 @@ OptimizelyDecideOption[] options
             {
                 try
                 {
-                    userProfile = _userProfileCache.GetUserProfile(userId);
+                    userProfile = _userProfileCache.GetUserProfile(userId, forceUserProfileLookup);
                     decisionVariationResult = GetStoredVariation(experiment, userProfile, config);
                     reasons += decisionVariationResult.DecisionReasons;
                     if (decisionVariationResult.ResultObject != null)

diff --git a/OptimizelySDK/Bucketing/UserProfileCache.cs b/OptimizelySDK/Bucketing/UserProfileCache.cs
@@ -33,9 +33,9 @@ public UserProfileCache(UserProfileService userProfileService, ILogger logger)
             _logger = logger;
         }
 
-        public UserProfile GetUserProfile(string userId)
+        public UserProfile GetUserProfile(string userId, bool forceLookup = false)
         {
-            if (_cache.TryGetValue(userId, out var userProfile))
+            if (_cache.TryGetValue(userId, out var userProfile) && !forceLookup)
             {
                 return _cache[userId];
             }

diff --git a/OptimizelySDK/Optimizely.cs b/OptimizelySDK/Optimizely.cs
@@ -310,7 +310,8 @@ public Variation Activate(string experimentKey, string userId,
                 return null;
             }
 
-            var variation = GetVariation(experimentKey, userId, config, userAttributes);
+            var variation = GetVariation(experimentKey, userId, config, userAttributes,
+                forceUserProfileLookup: true);
 
             if (variation == null || variation.Key == null)
             {
@@ -404,7 +405,8 @@ public Variation GetVariation(string experimentKey, string userId,
         )
         {
             var config = ProjectConfigManager?.GetConfig();
-            return GetVariation(experimentKey, userId, config, userAttributes);
+            return GetVariation(experimentKey, userId, config, userAttributes,
+                forceUserProfileLookup: true);
         }
 
         /// <summary>
@@ -414,9 +416,10 @@ public Variation GetVariation(string experimentKey, string userId,
         /// <param name="userId">ID for the user</param>
         /// <param name="config">ProjectConfig to be used for variation</param>
         /// <param name="userAttributes">Attributes for the users</param>
+        /// <param name="forceUserProfileLookup">Whether to force a lookup of the user profile when UPS is enabled.</param>
         /// <returns>null|Variation Representing variation</returns>
         private Variation GetVariation(string experimentKey, string userId, ProjectConfig config,
-            UserAttributes userAttributes = null
+            UserAttributes userAttributes = null, bool forceUserProfileLookup = false
         )
         {
             if (config == null)
@@ -442,8 +445,10 @@ private Variation GetVariation(string experimentKey, string userId, ProjectConfi
             userAttributes = userAttributes ?? new UserAttributes();
 
             var userContext = CreateUserContextCopy(userId, userAttributes);
-            var variation = DecisionService.GetVariation(experiment, userContext, config)
-                ?.ResultObject;
+            var variation = DecisionService.
+                GetVariation(experiment, userContext, config,
+                    forceUserProfileLookup: forceUserProfileLookup)?.
+                ResultObject;
             var decisionInfo = new Dictionary<string, object>
             {
                 { "experimentKey", experimentKey }, { "variationKey", variation?.Key },