Refactor: Extract method: tier.includes?(value)

ManageIQ · Jan 3, 2017 · b5d826a · b5d826a
1 parent c5ff669
commit b5d826a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/models/chargeback_rate_detail.rb b/app/models/chargeback_rate_detail.rb
@@ -57,10 +57,7 @@ def fixed?
  def find_rate(value)
  fixed_rate = 0.0
  variable_rate = 0.0
- tier_found, = chargeback_tiers.select do |tier|
- tier.starts_with_zero? && value.zero? ||
- value > (rate_adjustment * tier.start) && value <= (rate_adjustment * tier.finish)
- end
+ tier_found = chargeback_tiers.detect { |tier| tier.includes?(value / rate_adjustment) }
  unless tier_found.nil?
  fixed_rate = tier_found.fixed_rate
  variable_rate = tier_found.variable_rate

diff --git a/app/models/chargeback_tier.rb b/app/models/chargeback_tier.rb
@@ -17,6 +17,10 @@ def self.to_float(s)
  end
  end
 
+ def includes?(value)
+ starts_with_zero? && value.zero? || value > start && value <= finish
+ end
+
  def starts_with_zero?
  start.zero?
  end