Refactor: Extract method: report_step_range

isimluk · Oct 24, 2016 · 814718d · 814718d
1 parent 473d14c
commit 814718d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/app/models/chargeback.rb b/app/models/chargeback.rb
@@ -95,7 +95,7 @@ def self.key_and_fields(metric_rollup_record)
  end
 
  def self.date_fields(metric_rollup_record)
- start_ts, end_ts, display_range = get_time_range(metric_rollup_record)
+ start_ts, end_ts, display_range = @options.report_step_range(metric_rollup_record.timestamp)
 
  {
  'start_date' => start_ts,
@@ -174,24 +174,6 @@ def self.reportable_metric_and_cost_fields(rate_name, rate_group, metric, cost)
  col_hash
  end
 
- def self.get_time_range(perf)
- ts = perf.timestamp.in_time_zone(@options.tz)
- case @options.interval
- when "daily"
- [ts.beginning_of_day, ts.end_of_day, ts.strftime("%m/%d/%Y")]
- when "weekly"
- s_ts = ts.beginning_of_week
- e_ts = ts.end_of_week
- [s_ts, e_ts, "Week of #{s_ts.strftime("%m/%d/%Y")}"]
- when "monthly"
- s_ts = ts.beginning_of_month
- e_ts = ts.end_of_month
- [s_ts, e_ts, s_ts.strftime("%b %Y")]
- else
- raise _("interval '%{interval}' is not supported") % {:interval => interval}
- end
- end
-
  def self.report_cb_model(model)
  model.gsub(/^Chargeback/, "")
  end

diff --git a/app/models/chargeback/report_options.rb b/app/models/chargeback/report_options.rb
@@ -67,6 +67,24 @@ def start_of_report_step(timestamp)
  end
  end
 
+ def report_step_range(timestamp)
+ ts = timestamp.in_time_zone(tz)
+ case interval
+ when 'daily'
+ [ts.beginning_of_day, ts.end_of_day, ts.strftime('%m/%d/%Y')]
+ when 'weekly'
+ s_ts = ts.beginning_of_week
+ e_ts = ts.end_of_week
+ [s_ts, e_ts, "Week of #{s_ts.strftime('%m/%d/%Y')}"]
+ when 'monthly'
+ s_ts = ts.beginning_of_month
+ e_ts = ts.end_of_month
+ [s_ts, e_ts, s_ts.strftime('%b %Y')]
+ else
+ raise _("interval '%{interval}' is not supported") % {:interval => interval}
+ end
+ end
+
  def duration_of_report_step
  case interval
  when 'daily' then 1.day