optimizely · msohailhussain · Oct 22, 2021 · Sep 23, 2021 · Sep 30, 2021 · Oct 3, 2021
diff --git a/lib/optimizely.rb b/lib/optimizely.rb
@@ -199,13 +199,20 @@ def decide(user_context, key, decide_options = [])
       experiment = nil
       decision_source = Optimizely::DecisionService::DECISION_SOURCES['ROLLOUT']
 
-      decision, reasons_received = @decision_service.get_variation_for_feature(config, feature_flag, user_id, attributes, decide_options)
+      variation, reasons_received = user_context.find_validated_forced_decision(key, nil)
       reasons.push(*reasons_received)
 
+      if variation
+        decision = Optimizely::DecisionService::Decision.new(nil, variation, Optimizely::DecisionService::DECISION_SOURCES['FEATURE_TEST'])
+      else
+        decision, reasons_received = @decision_service.get_variation_for_feature(config, feature_flag, user_context, decide_options)
+        reasons.push(*reasons_received)
+      end
+
       # Send impression event if Decision came from a feature test and decide options doesn't include disableDecisionEvent
       if decision.is_a?(Optimizely::DecisionService::Decision)
         experiment = decision.experiment
-        rule_key = experiment['key']
+        rule_key = experiment ? experiment['key'] : nil
         variation = decision['variation']
         variation_key = variation['key']
         feature_enabled = variation['featureEnabled']
@@ -291,6 +298,10 @@ def decide_for_keys(user_context, keys, decide_options = [])
       decisions
     end
 
+    def get_flag_variation_by_key(flag_key, variation_key)
+      project_config.get_variation_from_flag(flag_key, variation_key)
+    end
+
     # Buckets visitor and sends impression event to Optimizely.
     #
     # @param experiment_key - Experiment which needs to be activated.
@@ -490,7 +501,8 @@ def is_feature_enabled(feature_flag_key, user_id, attributes = nil)
         return false
       end
 
-      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_id, attributes)
+      user_context = create_user_context(user_id, attributes)
+      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_context)
 
       feature_enabled = false
       source_string = Optimizely::DecisionService::DECISION_SOURCES['ROLLOUT']
@@ -739,7 +751,8 @@ def get_all_feature_variables(feature_flag_key, user_id, attributes = nil)
         return nil
       end
 
-      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_id, attributes)
+      user_context = create_user_context(user_id, attributes)
+      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_context)
       variation = decision ? decision['variation'] : nil
       feature_enabled = variation ? variation['featureEnabled'] : false
       all_variables = {}
@@ -881,7 +894,8 @@ def get_variation_with_config(experiment_key, user_id, attributes, config)
 
       return nil unless user_inputs_valid?(attributes)
 
-      variation_id, = @decision_service.get_variation(config, experiment_id, user_id, attributes)
+      user_context = create_user_context(user_id, attributes)
+      variation_id, = @decision_service.get_variation(config, experiment_id, user_context)
       variation = config.get_variation_from_id(experiment_key, variation_id) unless variation_id.nil?
       variation_key = variation['key'] if variation
       decision_notification_type = if config.feature_experiment?(experiment_id)
@@ -947,7 +961,8 @@ def get_feature_variable_for_type(feature_flag_key, variable_key, variable_type,
         return nil
       end
 
-      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_id, attributes)
+      user_context = create_user_context(user_id, attributes)
+      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_context)
       variation = decision ? decision['variation'] : nil
       feature_enabled = variation ? variation['featureEnabled'] : false
 
@@ -1083,8 +1098,12 @@ def send_impression(config, experiment, variation_key, flag_key, rule_key, enabl
       experiment_id = experiment['id']
       experiment_key = experiment['key']
 
-      variation_id = ''
-      variation_id = config.get_variation_id_from_key_by_experiment_id(experiment_id, variation_key) if experiment_id != ''
+      if experiment_id != ''
+        variation_id = config.get_variation_id_from_key_by_experiment_id(experiment_id, variation_key)
+      else
+        varaition = get_flag_variation_by_key(flag_key, variation_key)
+        variation_id = varaition ? varaition['id'] : ''
+      end
 
       metadata = {
         flag_key: flag_key,

diff --git a/lib/optimizely/config/datafile_project_config.rb b/lib/optimizely/config/datafile_project_config.rb
@@ -60,6 +60,7 @@ class DatafileProjectConfig < ProjectConfig
     attr_reader :variation_key_map
     attr_reader :variation_id_map_by_experiment_id
     attr_reader :variation_key_map_by_experiment_id
+    attr_reader :flag_variation_map
 
     def initialize(datafile, logger, error_handler)
       # ProjectConfig init method to fetch and set project config data
@@ -123,6 +124,8 @@ def initialize(datafile, logger, error_handler)
       @variation_key_map_by_experiment_id = {}
       @variation_id_to_variable_usage_map = {}
       @variation_id_to_experiment_map = {}
+      @flag_variation_map = {}
+
       @experiment_id_map.each_value do |exp|
         # Excludes experiments from rollouts
         variations = exp.fetch('variations')
@@ -138,6 +141,8 @@ def initialize(datafile, logger, error_handler)
         exps = rollout.fetch('experiments')
         @rollout_experiment_id_map = @rollout_experiment_id_map.merge(generate_key_map(exps, 'id'))
       end
+
+      @flag_variation_map = generate_feature_variation_map(@feature_flags)
       @all_experiments = @experiment_id_map.merge(@rollout_experiment_id_map)
       @all_experiments.each do |id, exp|
         variations = exp.fetch('variations')
@@ -165,6 +170,24 @@ def initialize(datafile, logger, error_handler)
       end
     end
 
+    def get_rules_for_flag(feature_flag)
+      # Retrieves rules for a given feature flag
+      #
+      # feature_flag - String key representing the feature_flag
+      #
+      # Returns rules in feature flag
+      rules = feature_flag['experimentIds'].map { |exp_id| @experiment_id_map[exp_id] }
+      rollout = feature_flag['rolloutId'].empty? ? nil : @rollout_id_map[feature_flag['rolloutId']]
+
+      if rollout
+        rollout_experiments = rollout.fetch('experiments')
+        rollout_experiments.each do |exp|
+          rules.push(exp)
+        end
+      end
+      rules
+    end
+
     def self.create(datafile, logger, error_handler, skip_json_validation)
       # Looks up and sets datafile and config based on response body.
       #
@@ -279,6 +302,13 @@ def get_audience_from_id(audience_id)
       nil
     end
 
+    def get_variation_from_flag(flag_key, variation_key)
+      variations = @flag_variation_map[flag_key]
+      return variations.select { |variation| variation['key'] == variation_key }.first if variations
+
+      nil
+    end
+
     def get_variation_from_id(experiment_key, variation_id)
       # Get variation given experiment key and variation ID
       #
@@ -494,6 +524,20 @@ def rollout_experiment?(experiment_id)
 
     private
 
+    def generate_feature_variation_map(feature_flags)
+      flag_variation_map = {}
+      feature_flags.each do |flag|
+        variations = []
+        get_rules_for_flag(flag).each do |rule|
+          rule['variations'].each do |rule_variation|
+            variations.push(rule_variation) if variations.select { |variation| variation['id'] == rule_variation['id'] }.empty?
+          end
+        end
+        flag_variation_map[flag['key']] = variations
+      end
+      flag_variation_map
+    end
+
     def generate_key_map(array, key)
       # Helper method to generate map from key to hash in array of hashes
       #