[FSSDK-11578] Ruby: Update impression event handling and send notification for global holdout

Author: esrakartalOpt

lib/optimizely.rb

@@ -633,7 +633,7 @@ def is_feature_enabled(feature_flag_key, user_id, attributes = nil)
       if decision.is_a?(Optimizely::DecisionService::Decision)
         variation = decision['variation']
         feature_enabled = variation['featureEnabled']
-        if decision.source == Optimizely::DecisionService::DECISION_SOURCES['FEATURE_TEST']
+        if decision.source == Optimizely::DecisionService::DECISION_SOURCES['FEATURE_TEST'] || decision.source == Optimizely::DecisionService::DECISION_SOURCES['HOLDOUT']
           source_string = Optimizely::DecisionService::DECISION_SOURCES['FEATURE_TEST']
           source_info = {
             experiment_key: decision.experiment['key'],

lib/optimizely/config/datafile_project_config.rb

@@ -212,6 +212,8 @@ def initialize(datafile, logger, error_handler)
       return unless @holdouts && !@holdouts.empty?
 
       @holdouts.each do |holdout|
+        next unless holdout['status'] == 'Running'
+
         holdout_key = holdout['key']
         holdout_id = holdout['id']
 
@@ -633,16 +635,16 @@ def rollout_experiment?(experiment_id)
       @rollout_experiment_id_map.key?(experiment_id)
     end
 
-    def get_holdouts_for_flag(flag_key)
+    def get_holdouts_for_flag(flag_id)
       # Helper method to get holdouts from an applied feature flag
       #
-      # flag_key - Key of the feature flag
+      # flag_id - ID of the feature flag
       #
       # Returns the holdouts that apply for a specific flag
 
       return [] if @holdouts.nil? || @holdouts.empty?
 
-      @flag_holdouts_map[flag_key] || []
+      @flag_holdouts_map[flag_id] || []
     end
 
     def get_holdout(holdout_id)

lib/optimizely/decision_service.rb

@@ -167,7 +167,7 @@ def get_variation_for_feature(project_config, feature_flag, user_context, decide
       # user_context - Optimizely user context instance
       #
       # Returns DecisionResult struct.
-      holdouts = project_config.get_holdouts_for_flag(feature_flag['key'])
+      holdouts = project_config.get_holdouts_for_flag(feature_flag['id'])
 
       if holdouts && !holdouts.empty?
         # Has holdouts - use get_decision_for_flag which checks holdouts first
@@ -194,7 +194,7 @@ def get_decision_for_flag(feature_flag, user_context, project_config, decide_opt
       user_id = user_context.user_id
 
       # Check holdouts
-      holdouts = project_config.get_holdouts_for_flag(feature_flag['key'])
+      holdouts = project_config.get_holdouts_for_flag(feature_flag['id'])
       holdouts.each do |holdout|
         holdout_decision = get_variation_for_holdout(holdout, user_context, project_config)
         reasons.push(*holdout_decision.reasons)
@@ -275,7 +275,7 @@ def get_variation_for_holdout(holdout, user_context, project_config)
       variation, bucket_reasons = @bucketer.bucket(project_config, holdout, bucketing_id, user_id)
       decide_reasons.push(*bucket_reasons)
 
-      if variation
+      if variation && !variation['key'].nil? && !variation['key'].empty?
         message = "The user '#{user_id}' is bucketed into variation '#{variation['key']}' of holdout '#{holdout['key']}'."
         @logger.log(Logger::INFO, message)
         decide_reasons.push(message)