From edb6431b42772a6ee91258b23c71e6421d262614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Luka=C5=A1=C3=ADk?= <isimluk@fedoraproject.org>
Date: Thu, 20 Oct 2016 14:52:18 +0200
Subject: [PATCH] Refactor: move and rename method: duration_of_report_step

It is only dependent on ReportOptions and shall be part of it.
---
 app/models/chargeback.rb                | 13 +------------
 app/models/chargeback/report_options.rb |  8 ++++++++
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/models/chargeback.rb b/app/models/chargeback.rb
index 74aecefcfc8..022ba4b2f6d 100644
--- 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
index 9ea580365ad..105d1d1fc1d 100644
--- 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