Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "spec/engine-test-data"]
path = spec/engine-test-data
url = git@github.com:Flagsmith/engine-test-data.git
branch = v3.5.0
branch = v3.7.0
5 changes: 3 additions & 2 deletions lib/flagsmith/engine/segments/evaluator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def traits_match_segment_rule(identity_traits, rule, segment_id, identity_id)
end

matches_conditions &&
rule.rules.all? { |r| traits_match_segment_rule(identity_traits, r, segment_id, identity_id) }
rule.rules.send(rule.matching_function) { |r| traits_match_segment_rule(identity_traits, r, segment_id, identity_id) }
end
# rubocop:enable Metrics/MethodLength

Expand Down Expand Up @@ -137,9 +137,10 @@ def evaluate_conditions_from_context(rule, segment_key, context)
def evaluate_sub_rules_from_context(rule, segment_key, context)
return true if rule[:rules].nil? || rule[:rules].empty?

rule[:rules].all? do |sub_rule|
sub_rule_results = rule[:rules].map do |sub_rule|
traits_match_segment_rule_from_context(sub_rule, segment_key, context)
end
evaluate_rule_conditions(rule[:type], sub_rule_results)
end

# Evaluates a single segment condition using context
Expand Down
Loading