[FSSDK-11546] type adjustment

Author: junaed-optimizely

OptimizelySDK/Entity/Experiment.cs

@@ -27,11 +27,6 @@ public class Experiment : ExperimentCore
         /// </summary>
         public string GroupId { get; set; }
 
-        /// <summary>
-        /// Layer ID for the experiment
-        /// </summary>
-        public string LayerId { get; set; }
-
         /// <summary>
         /// ForcedVariations for the experiment
         /// </summary>
@@ -53,12 +48,6 @@ public class Experiment : ExperimentCore
         public bool IsInMutexGroup =>
             !string.IsNullOrEmpty(GroupPolicy) && GroupPolicy == MUTEX_GROUP_POLICY;
 
-        /// <summary>
-        /// Determine if experiment is running or not
-        /// </summary>
-        public bool IsExperimentRunning =>
-            !string.IsNullOrEmpty(Status) && Status == STATUS_RUNNING;
-
         /// <summary>
         /// Determin if user is forced variation of experiment
         /// </summary>
@@ -68,10 +57,5 @@ public bool IsUserInForcedVariation(string userId)
         {
             return ForcedVariations != null && ForcedVariations.ContainsKey(userId);
         }
-
-        /// <summary>
-        /// Determine if experiment is currently activated/running (implementation of abstract property)
-        /// </summary>
-        public override bool IsActivated => IsExperimentRunning;
     }
 }

OptimizelySDK/Entity/ExperimentCore.cs

@@ -35,6 +35,11 @@ public abstract class ExperimentCore : IdKeyEntity
         /// </summary>
         public string Status { get; set; }
 
+        /// <summary>
+        /// Layer ID for the experiment
+        /// </summary>
+        public virtual string LayerId { get; set; }
+
         /// <summary>
         /// Variations for the experiment/holdout
         /// </summary>
@@ -269,8 +274,11 @@ public virtual Variation GetVariationByKey(string key)
         #endregion
 
         /// <summary>
-        /// Determine if experiment/holdout is currently activated/running
+        /// Determine if experiment is currently activated/running 
         /// </summary>
-        public abstract bool IsActivated { get; }
+        public bool IsExperimentRunning =>
+            !string.IsNullOrEmpty(Status) && Status == STATUS_RUNNING;
+
+        public bool IsActivated => IsExperimentRunning;
     }
 }

OptimizelySDK/Entity/Holdout.cs

@@ -45,10 +45,12 @@ public enum HoldoutStatus
         public string[] ExcludedFlags { get; set; } = new string[0];
 
         /// <summary>
-        /// Determine if holdout is currently activated/running
+        /// Layer ID is always empty for holdouts as they don't belong to any layer
         /// </summary>
-        public override bool IsActivated =>
-            !string.IsNullOrEmpty(Status) && Status == STATUS_RUNNING;
-
+        public override string LayerId 
+        { 
+            get => string.Empty; 
+            set { /* Holdouts don't have layer IDs, ignore any assignment */ } 
+        }
     }
 }

OptimizelySDK/Event/Entity/ImpressionEvent.cs

@@ -28,7 +28,7 @@ public class ImpressionEvent : UserEvent
         public string UserId { get; private set; }
         public VisitorAttribute[] VisitorAttributes { get; private set; }
 
-        public Experiment Experiment { get; set; }
+        public ExperimentCore Experiment { get; set; }
         public DecisionMetadata Metadata { get; set; }
         public Variation Variation { get; set; }
         public bool? BotFiltering { get; set; }
@@ -42,7 +42,7 @@ public class Builder
             private EventContext EventContext;
 
             public VisitorAttribute[] VisitorAttributes;
-            private Experiment Experiment;
+            private ExperimentCore Experiment;
             private Variation Variation;
             private DecisionMetadata Metadata;
             private bool? BotFiltering;
@@ -61,7 +61,7 @@ public Builder WithEventContext(EventContext eventContext)
                 return this;
             }
 
-            public Builder WithExperiment(Experiment experiment)
+            public Builder WithExperiment(ExperimentCore experiment)
             {
                 Experiment = experiment;
 

OptimizelySDK/Event/UserEventFactory.cs

@@ -61,7 +61,7 @@ public static ImpressionEvent CreateImpressionEvent(ProjectConfig projectConfig,
         /// <param name="ruleType">experiment or featureDecision source </param>
         /// <returns>ImpressionEvent instance</returns>
         public static ImpressionEvent CreateImpressionEvent(ProjectConfig projectConfig,
-            Experiment activatedExperiment,
+            ExperimentCore activatedExperiment,
             Variation variation,
             string userId,
             UserAttributes userAttributes,

OptimizelySDK/Optimizely.cs

@@ -1154,7 +1154,7 @@ private void SendImpressionEvent(Experiment experiment, Variation variation, str
         /// <param name="userAttributes">The user's attributes</param>
         /// <param name="flagKey">It can either be experiment key in case if ruleType is experiment or it's feature key in case ruleType is feature-test or rollout</param>
         /// <param name="ruleType">It can either be experiment in case impression event is sent from activate or it's feature-test or rollout</param>
-        private bool SendImpressionEvent(Experiment experiment, Variation variation, string userId,
+        private bool SendImpressionEvent(ExperimentCore experiment, Variation variation, string userId,
             UserAttributes userAttributes, ProjectConfig config,
             string flagKey, string ruleType, bool enabled
         )