rbs matcher fix

Author: sanzmauro

lib/splitclient-rb/engine/matchers/rule_based_segment_matcher.rb

@@ -30,15 +30,18 @@ def match?(args)
 
       return false unless check_excluded_segments(rule_based_segment, key, args)
 
-      matches = false
+      matched = false
       rule_based_segment[:conditions].each do |c|
         condition = SplitIoClient::Condition.new(c, @config)
         next if condition.empty?
 
-        matches = Helpers::EvaluatorHelper.matcher_type(condition, @segments_repository, @rule_based_segments_repository).match?(args)
+        matched = Helpers::EvaluatorHelper.matcher_type(condition, @segments_repository, @rule_based_segments_repository).match?(args)
+
+        break if matched
       end
-      @logger.debug("[InRuleSegmentMatcher] #{@segment_name} is in rule based segment -> #{matches}")
-      matches
+
+      @logger.debug("[InRuleSegmentMatcher] #{@segment_name} is in rule based segment -> #{matched}")
+      matched
     end
 
     private

spec/engine/matchers/rule_based_segment_matcher_spec.rb

@@ -177,6 +177,61 @@
       matcher = described_class.new(segments_repository, rbs_repositoy, 'sample_rule_based_segment', config)
       expect(matcher.match?(value: 'bilal@split.io', attributes: {'email': 'bilal@split.io'})).to be true
       expect(matcher.match?(value: 'bilal', attributes: {'email': 'bilal'})).to be false
-    end        
+    end
+
+    it 'return true if has multiple conditions' do
+      rbs_repositoy = SplitIoClient::Cache::Repositories::RuleBasedSegmentsRepository.new(config)
+      rbs = {
+        :name => 'sample_rule_based_segment',
+        :trafficTypeName => 'tt_name_1',
+        :conditions => [
+          {
+            :matcherGroup => {
+              :combiner => "AND",
+              :matchers => [
+                {
+                  :matcherType => "WHITELIST",
+                  :negate => false,
+                  :userDefinedSegmentMatcherData => nil,
+                  :whitelistMatcherData => {
+                      :whitelist => [
+                        "bilal"
+                      ]
+                  },
+                  :unaryNumericMatcherData => nil,
+                  :betweenMatcherData => nil
+                }
+              ]
+            }
+          },
+          {
+            :matcherGroup => {
+              :combiner => "AND",
+              :matchers => [
+                {
+                  :matcherType => "WHITELIST",
+                  :negate => false,
+                  :userDefinedSegmentMatcherData => nil,
+                  :whitelistMatcherData => {
+                      :whitelist => [
+                        "mauro"
+                      ]
+                  },
+                  :unaryNumericMatcherData => nil,
+                  :betweenMatcherData => nil
+                }
+              ]
+            }
+          }
+        ],
+        :excluded => {:keys => [], :segments => []}
+      }
+
+      rbs_repositoy.update([rbs], [], -1)
+      matcher = described_class.new(segments_repository, rbs_repositoy, 'sample_rule_based_segment', config)
+      expect(matcher.match?(value: 'mauro', attributes: {})).to be true
+      expect(matcher.match?(value: 'bilal', attributes: {})).to be true
+      expect(matcher.match?(value: 'nicolas', attributes: {})).to be false
+    end
   end
 end

spec/integrations/in_memory_client_spec.rb

@@ -1401,8 +1401,8 @@
       client_rbs = factory_rbs.client
       client_rbs.block_until_ready
 
-      expect(client_rbs.get_treatment('bilal@split.io', 'rbs_feature_flag', {:email => 'bilal@split.io'})).to eq('on')
-      expect(client_rbs.get_treatment('mauro@split.io', 'rbs_feature_flag', {:email => 'mauro@split.io'})).to eq('off')
+      expect(client_rbs.get_treatment('bilal', 'rbs_feature_flag', {:email => 'bilal@split.io'})).to eq('on')
+      expect(client_rbs.get_treatment('mauro', 'rbs_feature_flag', {:email => 'mauro@split.io'})).to eq('off')
     end
   end
 

spec/test_data/rule_based_segments/rule_base_segments.json

@@ -78,7 +78,7 @@
   "name": "dependent_rbs",
   "status": "ACTIVE",
   "trafficTypeName": "user",
-  "excluded":{"keys":["mauro@split.io","gaston@split.io"],"segments":[]},
+  "excluded":{"keys":["mauro","gaston@split.io"],"segments":[]},
   "conditions": [
     {
       "conditionType": "WHITELIST",
@@ -100,6 +100,27 @@
           }
         ]
       }
+    },
+    {
+      "conditionType": "WHITELIST",
+      "matcherGroup": {
+        "combiner": "AND",
+        "matchers": [
+          {
+            "keySelector": {
+              "trafficType": "user",
+              "attribute": "email"
+            },
+            "matcherType": "ENDS_WITH",
+            "negate": false,
+            "whitelistMatcherData": {
+              "whitelist": [
+                "@harness.io"
+              ]
+            }
+          }
+        ]
+      }
     }
   ]},
   {