[FSSDK-10265] fix: UPS Lookup & Save during batched Decide

.github/workflows/csharp.yml

@@ -7,9 +7,20 @@ on:
     branches: [ master ]
 
 jobs:
+  failOnDraftPullRequest:
+    name: Fail If Draft Pull Request
+    if: github.event.pull_request.draft == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fails Draft pull request.
+        run: |
+          echo "Draft pull requests should not trigger CI. Please mark the pull request as Ready for review to continue."
+          exit 1
+
   lintCodebase:
+    name: Lint Codebase      
+    needs: [ failOnDraftPullRequest ]
     runs-on: ubuntu-latest
-    name: Lint Codebase
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

OptimizelySDK.Tests/DecisionServiceTest.cs

@@ -700,7 +700,7 @@ public void TestGetVariationForFeatureExperimentGivenNonMutexGroupAndUserNotBuck
 
             DecisionServiceMock.
                 Setup(ds => ds.GetVariation(multiVariateExp, OptimizelyUserContextMock.Object,
-                    ProjectConfig, null)).
+                    ProjectConfig, It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
                 Returns<Variation>(null);
             var featureFlag = ProjectConfig.GetFeatureFlagFromKey("multi_variate_feature");
 
@@ -736,7 +736,7 @@ public void TestGetVariationForFeatureExperimentGivenNonMutexGroupAndUserIsBucke
             DecisionServiceMock.Setup(ds => ds.GetVariation(
                     ProjectConfig.GetExperimentFromKey("test_experiment_multivariate"),
                     OptimizelyUserContextMock.Object, ProjectConfig,
-                    It.IsAny<OptimizelyDecideOption[]>())).
+                    It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
                 Returns(variation);
 
             var featureFlag = ProjectConfig.GetFeatureFlagFromKey("multi_variate_feature");
@@ -771,7 +771,7 @@ public void TestGetVariationForFeatureExperimentGivenMutexGroupAndUserIsBucketed
             DecisionServiceMock.
                 Setup(ds =>
                     ds.GetVariation(ProjectConfig.GetExperimentFromKey("group_experiment_1"),
-                        OptimizelyUserContextMock.Object, ProjectConfig)).
+                        OptimizelyUserContextMock.Object, ProjectConfig, It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
                 Returns(variation);
 
             var featureFlag = ProjectConfig.GetFeatureFlagFromKey("boolean_feature");
@@ -795,7 +795,7 @@ public void TestGetVariationForFeatureExperimentGivenMutexGroupAndUserNotBuckete
             DecisionServiceMock.
                 Setup(ds => ds.GetVariation(It.IsAny<Experiment>(),
                     It.IsAny<OptimizelyUserContext>(), ProjectConfig,
-                    It.IsAny<OptimizelyDecideOption[]>())).
+                    It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
                 Returns(Result<Variation>.NullResult(null));
 
             var featureFlag = ProjectConfig.GetFeatureFlagFromKey("boolean_feature");
@@ -1311,7 +1311,7 @@ public void TestGetVariationForFeatureWhenTheUserIsBuckedtedInBothExperimentAndR
 
             DecisionServiceMock.Setup(ds => ds.GetVariation(experiment,
                     OptimizelyUserContextMock.Object, ProjectConfig,
-                    It.IsAny<OptimizelyDecideOption[]>())).
+                    It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
                 Returns(variation);
             var actualDecision = DecisionServiceMock.Object.GetVariationForFeatureExperiment(
                 featureFlag, OptimizelyUserContextMock.Object, userAttributes, ProjectConfig,

OptimizelySDK.Tests/OptimizelyTest.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023, Optimizely
+ * Copyright 2017-2024, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1394,19 +1394,19 @@ public void TestForcedVariationPreceedsUserProfile()
             LoggerMock.Verify(
                 l => l.Log(LogLevel.INFO,
                     "No previously activated variation of experiment \"etag1\" for user \"testUser3\" found in user profile."),
-                Times.Exactly(2));
+                Times.Once);
             LoggerMock.Verify(
                 l => l.Log(LogLevel.DEBUG,
                     "Assigned bucket [4969] to user [testUser3] with bucketing ID [testUser3]."),
-                Times.Exactly(2));
+                Times.Once);
             LoggerMock.Verify(
                 l => l.Log(LogLevel.INFO,
                     "User [testUser3] is in variation [vtag2] of experiment [etag1]."),
-                Times.Exactly(2));
+                Times.Once);
             LoggerMock.Verify(
                 l => l.Log(LogLevel.INFO,
                     "Saved variation \"277\" of experiment \"223\" for user \"testUser3\"."),
-                Times.Exactly(2));
+                Times.Once);
             LoggerMock.Verify(
                 l => l.Log(LogLevel.DEBUG,
                     "Set variation \"276\" for experiment \"223\" and user \"testUser3\" in the forced variation map."),
@@ -3395,8 +3395,9 @@ public void TestActivateListener(UserAttributes userAttributes)
             mockUserContext.Setup(ouc => ouc.GetUserId()).Returns(TestUserId);
 
             DecisionServiceMock.Setup(ds => ds.GetVariation(experiment,
-                    It.IsAny<OptimizelyUserContext>(), It.IsAny<ProjectConfig>()))
-                .Returns(variation);
+                    It.IsAny<OptimizelyUserContext>(), It.IsAny<ProjectConfig>(),
+                    It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
+                Returns(variation);
             DecisionServiceMock.Setup(ds => ds.GetVariationForFeature(featureFlag,
                     It.IsAny<OptimizelyUserContext>(), It.IsAny<ProjectConfig>()))
                 .Returns(decision);
@@ -3509,9 +3510,10 @@ public void TestTrackListener(UserAttributes userAttributes, EventTags eventTags
                     ErrorHandlerMock.Object, LoggerMock.Object);
             mockUserContext.Setup(ouc => ouc.GetUserId()).Returns(TestUserId);
 
-            DecisionServiceMock
-                .Setup(ds => ds.GetVariation(experiment, It.IsAny<OptimizelyUserContext>(), Config))
-                .Returns(variation);
+            DecisionServiceMock.Setup(ds => ds.GetVariation(experiment,
+                    It.IsAny<OptimizelyUserContext>(), Config, It.IsAny<OptimizelyDecideOption[]>(),
+                    It.IsAny<bool>())).
+                Returns(variation);
 
             // Adding notification listeners.
             var notificationType = NotificationCenter.NotificationType.Track;
@@ -3565,9 +3567,10 @@ public void TestActivateSendsDecisionNotificationWithActualVariationKey()
                 It.IsAny<string>(),
                 It.IsAny<UserAttributes>(), It.IsAny<Dictionary<string, object>>()));
 
-            DecisionServiceMock
-                .Setup(ds => ds.GetVariation(experiment, It.IsAny<OptimizelyUserContext>(), Config))
-                .Returns(variation);
+            DecisionServiceMock.Setup(ds => ds.GetVariation(experiment,
+                    It.IsAny<OptimizelyUserContext>(), Config, It.IsAny<OptimizelyDecideOption[]>(),
+                    It.IsAny<bool>())).
+                Returns(variation);
 
             var optly = Helper.CreatePrivateOptimizely();
             optly.SetFieldOrProperty("ProjectConfigManager", ConfigManager);
@@ -3622,9 +3625,10 @@ public void
                 It.IsAny<string>(),
                 It.IsAny<UserAttributes>(), It.IsAny<Dictionary<string, object>>()));
 
-            DecisionServiceMock
-                .Setup(ds => ds.GetVariation(experiment, It.IsAny<OptimizelyUserContext>(), Config))
-                .Returns(variation);
+            DecisionServiceMock.Setup(ds => ds.GetVariation(experiment,
+                    It.IsAny<OptimizelyUserContext>(), Config, It.IsAny<OptimizelyDecideOption[]>(),
+                    It.IsAny<bool>())).
+                Returns(variation);
 
             var optly = Helper.CreatePrivateOptimizely();
             optly.SetFieldOrProperty("ProjectConfigManager", ConfigManager);
@@ -3666,8 +3670,9 @@ public void TestActivateSendsDecisionNotificationWithNullVariationKey()
 
             DecisionServiceMock.Setup(ds => ds.GetVariation(experiment,
                     It.IsAny<OptimizelyUserContext>(),
-                    It.IsAny<ProjectConfig>(), null))
-                .Returns(Result<Variation>.NullResult(null));
+                    It.IsAny<ProjectConfig>(), It.IsAny<OptimizelyDecideOption[]>(),
+                    It.IsAny<bool>())).
+                Returns(Result<Variation>.NullResult(null));
 
             optStronglyTyped.NotificationCenter.AddNotification(
                 NotificationCenter.NotificationType.Decision,
@@ -3727,9 +3732,10 @@ public void TestGetVariationSendsDecisionNotificationWithActualVariationKey()
                     ErrorHandlerMock.Object, LoggerMock.Object);
             mockUserContext.Setup(ouc => ouc.GetUserId()).Returns(TestUserId);
 
-            DecisionServiceMock
-                .Setup(ds => ds.GetVariation(experiment, It.IsAny<OptimizelyUserContext>(), Config))
-                .Returns(variation);
+            DecisionServiceMock.Setup(ds => ds.GetVariation(experiment,
+                    It.IsAny<OptimizelyUserContext>(), Config, It.IsAny<OptimizelyDecideOption[]>(),
+                    It.IsAny<bool>())).
+                Returns(variation);
 
             optStronglyTyped.NotificationCenter.AddNotification(
                 NotificationCenter.NotificationType.Decision,
@@ -3788,9 +3794,10 @@ public void
                     ErrorHandlerMock.Object, LoggerMock.Object);
             mockUserContext.Setup(ouc => ouc.GetUserId()).Returns(TestUserId);
 
-            DecisionServiceMock
-                .Setup(ds => ds.GetVariation(experiment, It.IsAny<OptimizelyUserContext>(), Config))
-                .Returns(variation);
+            DecisionServiceMock.
+                Setup(ds => ds.GetVariation(experiment, It.IsAny<OptimizelyUserContext>(), Config
+                    , It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
+                Returns(variation);
 
             optStronglyTyped.NotificationCenter.AddNotification(
                 NotificationCenter.NotificationType.Decision,
@@ -3828,8 +3835,9 @@ public void TestGetVariationSendsDecisionNotificationWithNullVariationKey()
                 It.IsAny<UserAttributes>(), It.IsAny<Dictionary<string, object>>()));
 
             DecisionServiceMock.Setup(ds => ds.GetVariation(It.IsAny<Experiment>(),
-                    It.IsAny<OptimizelyUserContext>(), It.IsAny<ProjectConfig>()))
-                .Returns(Result<Variation>.NullResult(null));
+                    It.IsAny<OptimizelyUserContext>(), It.IsAny<ProjectConfig>()
+                    , It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
+                Returns(Result<Variation>.NullResult(null));
             //DecisionServiceMock.Setup(ds => ds.GetVariation(experiment, TestUserId, Config, null)).Returns(Result<Variation>.NullResult(null));
 
             optStronglyTyped.NotificationCenter.AddNotification(
@@ -3875,8 +3883,9 @@ public void
                 It.IsAny<UserAttributes>(), It.IsAny<Dictionary<string, object>>()));
 
             DecisionServiceMock.Setup(ds => ds.GetVariation(experiment,
-                    It.IsAny<OptimizelyUserContext>(), ConfigManager.GetConfig(), null))
-                .Returns(variation);
+                    It.IsAny<OptimizelyUserContext>(), ConfigManager.GetConfig()
+                    , It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
+                Returns(variation);
 
             var optly = Helper.CreatePrivateOptimizely();
             var optStronglyTyped = optly.GetObject() as Optimizely;
@@ -3936,8 +3945,9 @@ public void
                 It.IsAny<UserAttributes>(), It.IsAny<Dictionary<string, object>>()));
 
             DecisionServiceMock.Setup(ds =>
-                    ds.GetVariation(experiment, It.IsAny<OptimizelyUserContext>(), Config, null))
-                .Returns(variation);
+                    ds.GetVariation(experiment, It.IsAny<OptimizelyUserContext>(), Config
+                        , It.IsAny<OptimizelyDecideOption[]>(), It.IsAny<bool>())).
+                Returns(variation);
 
             var optly = Helper.CreatePrivateOptimizely();
             var optStronglyTyped = optly.GetObject() as Optimizely;
@@ -5322,7 +5332,8 @@ public void TestGetAllFeatureVariablesReturnsNullScenarios()
 
             LoggerMock.Verify(
                 log => log.Log(LogLevel.ERROR,
-                    "Optimizely instance is not valid, failing getAllFeatureVariableValues call. type"),
+                    "Optimizely instance is not valid, failing getAllFeatureVariableValues call. type")
+                ,
                 Times.Once);
         }