Refactor: move and rename method: duration_of_report_step

It is only dependent on ReportOptions and shall be part of it.
isimluk · Oct 24, 2016 · edb6431 · edb6431
1 parent f5df793
commit edb6431
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/app/models/chargeback.rb b/app/models/chargeback.rb
@@ -36,7 +36,7 @@ def self.build_results_for_report_chargeback(options)
     timerange = options.report_time_range
     data = {}
 
-    interval_duration = interval_to_duration(options.interval)
+    interval_duration = options.duration_of_report_step
 
     timerange.step_value(interval_duration).each_cons(2) do |query_start_time, query_end_time|
       records = base_rollup.where(:timestamp => query_start_time...query_end_time, :capture_interval_name => "hourly")
@@ -86,17 +86,6 @@ def self.hours_in_interval(query_start_time, query_end_time, interval)
     (query_end_time - query_start_time) / 1.hour
   end
 
-  def self.interval_to_duration(interval)
-    case interval
-    when "daily"
-      1.day
-    when "weekly"
-      1.week
-    when "monthly"
-      1.month
-    end
-  end
-
   def self.key_and_fields(metric_rollup_record, interval)
     ts_key = get_group_key_ts(metric_rollup_record, interval)
 

diff --git a/app/models/chargeback/report_options.rb b/app/models/chargeback/report_options.rb
@@ -52,5 +52,13 @@ def report_time_range
 
       start_time..end_time
     end
+
+    def duration_of_report_step
+      case interval
+      when 'daily'   then 1.day
+      when 'weekly'  then 1.week
+      when 'monthly' then 1.month
+      end
+    end
   end
 end