feat: Datafile parsing + audience evaluation for ODP integration

OptimizelySDK.Tests/AudienceConditionsTests/ConditionEvaluationTest.cs

@@ -659,16 +659,13 @@ public void TestInvalidSemVersions()
 
         #region Qualified Tests
 
-        private const string QUALIFIED = "qualified";
-        private const string CUSTOM_ATTRIBUTE = "custom_attribute";
-
         [Test]
         public void QualifiedConditionWithNonStringValueShouldFail()
         {
             var condition = new BaseCondition()
             {
-                Type = CUSTOM_ATTRIBUTE,
-                Match = QUALIFIED,
+                Type = BaseCondition.THIRD_PARTY_DIMENSION,
+                Match = BaseCondition.QUALIFIED,
                 Value = 100,
             };
 
@@ -690,8 +687,8 @@ public void QualifiedConditionWithMatchingValueShouldBeTrue()
         {
             var condition = new BaseCondition()
             {
-                Type = CUSTOM_ATTRIBUTE,
-                Match = QUALIFIED,
+                Type = BaseCondition.THIRD_PARTY_DIMENSION,
+                Match = BaseCondition.QUALIFIED,
                 Value = QUALIFIED_VALUE,
             };
 
@@ -706,8 +703,8 @@ public void QualifiedConditionWithNonMatchingValueShouldBeFalse()
         {
             var condition = new BaseCondition()
             {
-                Type = CUSTOM_ATTRIBUTE,
-                Match = QUALIFIED,
+                Type = BaseCondition.THIRD_PARTY_DIMENSION,
+                Match = BaseCondition.QUALIFIED,
                 Value = "empire-star-system",
             };
 

OptimizelySDK.Tests/ProjectConfigTest.cs

@@ -873,7 +873,7 @@ public void TestRolloutWithConsistingOfANullRolloutId()
         private const string ZAIUS_PUBLIC_KEY = "W4WzcEs-ABgXorzY7h1LCQ";
 
         [Test]
-        public void TestGetOptimizelyConfigWithOdpIntegration()
+        public void TestProjectConfigWithOdpIntegration()
         {
             var datafileProjectConfig = DatafileProjectConfig.Create(TestData.OdpIntegrationDatafile, new NoOpLogger(), new ErrorHandler.NoOpErrorHandler());
 

OptimizelySDK.Tests/Utils/TestConversionExtensions.cs

@@ -55,8 +55,8 @@ public static OptimizelyUserContext ToUserContext(this List<string> qualifiedSeg
             var configManager = new FallbackProjectConfigManager(config);
             var optimizely = new Optimizely(configManager);
 
-            return new OptimizelyUserContext(optimizely, "any-user", new UserAttributes(), null, errorHandler,
-                mockLogger.Object, qualifiedSegments);
+            return new OptimizelyUserContext(optimizely, "any-user", new UserAttributes(), null, qualifiedSegments, errorHandler,
+                mockLogger.Object);
         }
     }
 }

OptimizelySDK/AudienceConditions/BaseCondition.cs

@@ -30,22 +30,22 @@ public class BaseCondition : ICondition
         /// <summary>
         /// String constant representing custom attribute condition type.
         /// </summary>
-        private const string CUSTOM_ATTRIBUTE = "custom_attribute";
+        public const string CUSTOM_ATTRIBUTE = "custom_attribute";
 
         /// <summary>
         /// String constant representing a third-party condition type.
         /// </summary>
-        private const string THIRD_PARTY_DIMENSION = "third_party_dimension";
+        public const string THIRD_PARTY_DIMENSION = "third_party_dimension";
 
         /// <summary>
         /// String constant to match status of qualified segments.  
         /// </summary>
-        private const string QUALIFIED = "qualified";
+        public const string QUALIFIED = "qualified";
 
         /// <summary>
         /// Valid types allowed for validation
         /// </summary>
-        private static readonly string[] validTypes = {
+        public static readonly string[] ValidTypes = {
             CUSTOM_ATTRIBUTE, THIRD_PARTY_DIMENSION,
         };
 
@@ -63,7 +63,7 @@ public class BaseCondition : ICondition
 
         public bool? Evaluate(ProjectConfig config, OptimizelyUserContext userContext, ILogger logger)
         {
-            if (!validTypes.Contains(Type))
+            if (!ValidTypes.Contains(Type))
             {
                 logger.Log(LogLevel.WARN, $@"Audience condition ""{this}"" uses an unknown condition type. You may need to upgrade to a newer release of the Optimizely SDK.");
                 return null;

OptimizelySDK/OptimizelyUserContext.cs

@@ -19,7 +19,6 @@
 using OptimizelySDK.ErrorHandler;
 using OptimizelySDK.Entity;
 using OptimizelySDK.OptimizelyDecisions;
-using System;
 
 namespace OptimizelySDK
 {
@@ -39,22 +38,17 @@ public class OptimizelyUserContext
         private UserAttributes Attributes;
 
         // set of qualified segments
-        public List<string> QualifiedSegments { get; }
+        private List<string> QualifiedSegments;
 
         // Optimizely object to be used.
         private Optimizely Optimizely;
 
         private ForcedDecisionsStore ForcedDecisionsStore { get; set; }
 
-        public OptimizelyUserContext(Optimizely optimizely, string userId,
-            UserAttributes userAttributes, IErrorHandler errorHandler, ILogger logger
-        ) :
-            this(optimizely, userId, userAttributes, null, errorHandler, logger) { }
+        public OptimizelyUserContext(Optimizely optimizely, string userId, UserAttributes userAttributes, IErrorHandler errorHandler, ILogger logger) :
+            this(optimizely, userId, userAttributes, null, null, errorHandler, logger) { }
 
-        public OptimizelyUserContext(Optimizely optimizely, string userId,
-            UserAttributes userAttributes, ForcedDecisionsStore forcedDecisionsStore,
-            IErrorHandler errorHandler, ILogger logger, List<string> qualifiedSegments = null
-        )
+        public OptimizelyUserContext(Optimizely optimizely, string userId, UserAttributes userAttributes, ForcedDecisionsStore forcedDecisionsStore, List<string> qualifiedSegments, IErrorHandler errorHandler, ILogger logger)
         {
             ErrorHandler = errorHandler;
             Logger = logger;
@@ -65,22 +59,7 @@ public OptimizelyUserContext(Optimizely optimizely, string userId,
             QualifiedSegments = qualifiedSegments ?? new List<string>();
         }
 
-        private OptimizelyUserContext Copy() =>
-            new OptimizelyUserContext(Optimizely, UserId, GetAttributes(),
-                GetForcedDecisionsStore(), ErrorHandler, Logger, QualifiedSegments);
-
-        /// <summary>
-        /// Returns true if the user is qualified for the given segment name
-        /// </summary>
-        /// <param name="segment">A String segment key which will be check in qualified segments list that if it exist then user is qualified.</param>
-        /// <returns>Is user qualified for a segment.</returns>
-        public bool IsQualifiedFor(string segment)
-        {
-            lock (mutex)
-            {
-                return QualifiedSegments.Contains(segment);
-            }
-        }
+        private OptimizelyUserContext Copy() => new OptimizelyUserContext(Optimizely, UserId, GetAttributes(), GetForcedDecisionsStore(), GetQualifiedSegments(), ErrorHandler, Logger);
 
         /// <summary>
         /// Returns Optimizely instance associated with the UserContext.
@@ -100,6 +79,47 @@ public virtual string GetUserId()
             return UserId;
         }
 
+        /// <summary>
+        /// Returns a copy of the current list of qualified segments 
+        /// </summary>
+        /// <returns>List of qualified segments</returns>
+        public List<string> GetQualifiedSegments()
+        {
+            List<string> qualifiedSegmentsCopy;
+            lock (mutex)
+            {
+                qualifiedSegmentsCopy = new List<string>(QualifiedSegments);
+            }
+
+            return qualifiedSegmentsCopy;
+        }
+
+        /// <summary>
+        /// Clears and adds a collection of qualified segments
+        /// </summary>
+        /// <param name="qualifiedSegments">List of segments to replace current segments</param>
+        public void SetQualifiedSegments(List<string> qualifiedSegments)
+        {
+            lock (mutex)
+            {
+                QualifiedSegments.Clear();
+                QualifiedSegments.AddRange(qualifiedSegments);
+            }
+        }
+
+        /// <summary>
+        /// Returns true if the user is qualified for the given segment name
+        /// </summary>
+        /// <param name="segment">A String segment key which will be check in qualified segments list that if it exist then user is qualified.</param>
+        /// <returns>Is user qualified for a segment.</returns>
+        public bool IsQualifiedFor(string segment)
+        {
+            lock (mutex)
+            {
+                return QualifiedSegments.Contains(segment);
+            }
+        }
+
         /// <summary>
         /// Returns copy of UserAttributes associated with UserContext.
         /// </summary>
@@ -127,8 +147,7 @@ public ForcedDecisionsStore GetForcedDecisionsStore()
                 if (ForcedDecisionsStore.Count == 0)
                 {
                     copiedForcedDecisionsStore = ForcedDecisionsStore.NullForcedDecision();
-                }
-                else
+                } else
                 {
                     copiedForcedDecisionsStore = new ForcedDecisionsStore(ForcedDecisionsStore);
                 }
@@ -167,8 +186,7 @@ public void SetAttribute(string key, object value)
         /// <returns>A decision result.</returns>
         public virtual OptimizelyDecision Decide(string key)
         {
-            return Decide(key, new OptimizelyDecideOption[]
-                { });
+            return Decide(key, new OptimizelyDecideOption[] { });
         }
 
         /// <summary>
@@ -181,8 +199,7 @@ public virtual OptimizelyDecision Decide(string key)
         /// <param name="options">A list of options for decision-making.</param>
         /// <returns>A decision result.</returns>
         public virtual OptimizelyDecision Decide(string key,
-            OptimizelyDecideOption[] options
-        )
+            OptimizelyDecideOption[] options)
         {
             var optimizelyUserContext = Copy();
             return Optimizely.Decide(optimizelyUserContext, key, options);
@@ -193,9 +210,7 @@ OptimizelyDecideOption[] options
         /// </summary>
         /// <param name="keys">list of flag keys for which a decision will be made.</param>
         /// <returns>A dictionary of all decision results, mapped by flag keys.</returns>
-        public virtual Dictionary<string, OptimizelyDecision> DecideForKeys(string[] keys,
-            OptimizelyDecideOption[] options
-        )
+        public virtual Dictionary<string, OptimizelyDecision> DecideForKeys(string[] keys, OptimizelyDecideOption[] options)
         {
             var optimizelyUserContext = Copy();
             return Optimizely.DecideForKeys(optimizelyUserContext, keys, options);
@@ -208,8 +223,7 @@ OptimizelyDecideOption[] options
         /// <returns>A dictionary of all decision results, mapped by flag keys.</returns>
         public virtual Dictionary<string, OptimizelyDecision> DecideForKeys(string[] keys)
         {
-            return DecideForKeys(keys, new OptimizelyDecideOption[]
-                { });
+            return DecideForKeys(keys, new OptimizelyDecideOption[] { });
         }
 
         /// <summary>
@@ -218,18 +232,15 @@ public virtual Dictionary<string, OptimizelyDecision> DecideForKeys(string[] key
         /// <returns>A dictionary of all decision results, mapped by flag keys.</returns>
         public virtual Dictionary<string, OptimizelyDecision> DecideAll()
         {
-            return DecideAll(new OptimizelyDecideOption[]
-                { });
+            return DecideAll(new OptimizelyDecideOption[] { });
         }
 
         /// <summary>
         /// Returns a key-map of decision results ({@link OptimizelyDecision}) for all active flag keys.
         /// </summary>
         /// <param name="options">A list of options for decision-making.</param>
         /// <returns>All decision results mapped by flag keys.</returns>
-        public virtual Dictionary<string, OptimizelyDecision> DecideAll(
-            OptimizelyDecideOption[] options
-        )
+        public virtual Dictionary<string, OptimizelyDecision> DecideAll(OptimizelyDecideOption[] options)
         {
             var optimizelyUserContext = Copy();
             return Optimizely.DecideAll(optimizelyUserContext, options);
@@ -250,8 +261,7 @@ public virtual void TrackEvent(string eventName)
         /// <param name="eventName">The event name.</param>
         /// <param name="eventTags">A map of event tag names to event tag values.</param>
         public virtual void TrackEvent(string eventName,
-            EventTags eventTags
-        )
+            EventTags eventTags)
         {
             Optimizely.Track(eventName, UserId, Attributes, eventTags);
         }
@@ -262,9 +272,7 @@ EventTags eventTags
         /// <param name="context">The context object containing flag and rule key.</param>
         /// <param name="decision">OptimizelyForcedDecision object containing variation key.</param>
         /// <returns></returns>
-        public bool SetForcedDecision(OptimizelyDecisionContext context,
-            OptimizelyForcedDecision decision
-        )
+        public bool SetForcedDecision(OptimizelyDecisionContext context, OptimizelyForcedDecision decision)
         {
             lock (mutex)
             {