Fixed matcher

Author: chillaq

splitio/models/grammar/matchers/rule_based_segment.py

@@ -63,9 +63,12 @@ def _match_dep_rb_segments(self, excluded_rb_segments, key, attributes, context)
             else:
                 excluded_segment = context['ec'].rbs_segments.get(excluded_rb_segment.name)
                 if key in excluded_segment.excluded.get_excluded_keys():
-                    return False
+                    return True
 
                 if self._match_dep_rb_segments(excluded_segment.excluded.get_excluded_segments(), key, attributes, context):
                     return True
+
+                if self._match_conditions(excluded_segment.conditions, key, attributes, context):
+                    return True
 
-        return self._match_conditions(excluded_segment.conditions, key, attributes, context)
+        return False

tests/engine/files/rule_base_segments2.json

@@ -19,7 +19,7 @@
                 "trafficType": "user",
                 "attribute": "email"
               },
-              "matcherType": "START_WITH",
+              "matcherType": "STARTS_WITH",
               "negate": false,
               "whitelistMatcherData": {
                 "whitelist": [

tests/engine/test_evaluator.py

@@ -314,7 +314,7 @@ def test_using_rbs_in_excluded(self):
         ctx = evaluation_facctory.context_for('bilal', ['some'])
         assert e.eval_with_context('bilal', 'bilal', 'some', {'email': 'bilal'}, ctx)['treatment'] == "on"
         ctx = evaluation_facctory.context_for('bilal2@split.io', ['some'])
-        assert e.eval_with_context('bilal2@split.io', 'bilal2@split.io', 'some', {'email': 'bilal2@split.io'}, ctx)['treatment'] == "on"
+        assert e.eval_with_context('bilal2@split.io', 'bilal2@split.io', 'some', {'email': 'bilal2@split.io'}, ctx)['treatment'] == "off"
 
     @pytest.mark.asyncio
     async def test_evaluate_treatment_with_rbs_in_condition_async(self):
@@ -386,7 +386,7 @@ async def test_using_rbs_in_excluded_async(self):
         ctx = await evaluation_facctory.context_for('bilal', ['some'])
         assert e.eval_with_context('bilal', 'bilal', 'some', {'email': 'bilal'}, ctx)['treatment'] == "on"
         ctx = await evaluation_facctory.context_for('bilal2@split.io', ['some'])
-        assert e.eval_with_context('bilal2@split.io', 'bilal2@split.io', 'some', {'email': 'bilal2@split.io'}, ctx)['treatment'] == "on"
+        assert e.eval_with_context('bilal2@split.io', 'bilal2@split.io', 'some', {'email': 'bilal2@split.io'}, ctx)['treatment'] == "off"
 
 class EvaluationDataFactoryTests(object):
     """Test evaluation factory class."""