introduce MiqReport#get_ar_includes and get_ar_references

includes is references and includes_for_find is includes to confusing

Fixing the names

Author: kbrock

app/models/miq_report/generator.rb

@@ -99,13 +99,13 @@ def polymorphic_includes
     end
   end
 
-  def get_include_for_find_rbac
+  def get_ar_includes
     polymorphic_includes.each_with_object(get_include_for_find.dup) do |key, includes|
       includes.delete(key)
     end
   end
 
-  def get_include_rbac
+  def get_ar_references
     polymorphic_includes.each_with_object(get_include.dup) do |key, includes|
       includes.delete(key)
     end
@@ -290,8 +290,8 @@ def generate_daily_metric_rollup_results(options = {})
                             .where(where_clause)
                             .where(options[:where_clause])
                             .where(:timestamp => performance_report_time_range)
-                            .preload(get_include_for_find)
-                            .eager_load(get_include)
+                            .preload(get_ar_includes)
+                            .eager_load(get_ar_references)
                             .limit(options[:limit])
     results = Rbac.filtered(results, :class        => db,
                                      :filter       => conditions,
@@ -305,8 +305,8 @@ def generate_interval_metric_results(options = {})
     results = db_class.with_interval_and_time_range(interval, performance_report_time_range)
                       .where(where_clause)
                       .where(options[:where_clause])
-                      .preload(get_include_for_find)
-                      .eager_load(get_include)
+                      .preload(get_ar_includes)
+                      .eager_load(get_ar_references)
                       .limit(options[:limit])
 
     # Rbac will only add miq_expression for hourly report. It will not work properly for daily because many values are rolled up from hourly.
@@ -339,8 +339,8 @@ def generate_basic_results(options = {})
     rbac_opts = options.merge(
       :targets          => targets,
       :filter           => conditions,
-      :include_for_find => get_include_for_find_rbac,
-      :references       => get_include_rbac,
+      :include_for_find => get_ar_includes,
+      :references       => get_ar_references,
       :skip_counts      => true
     )
 

app/models/miq_report/search.rb

@@ -86,7 +86,7 @@ def paged_view_search(options = {})
     self.display_filter = options.delete(:display_filter_hash)  if options[:display_filter_hash]
     self.display_filter = options.delete(:display_filter_block) if options[:display_filter_block]
 
-    includes = get_include_for_find
+    includes = get_ar_includes
     self.extras ||= {}
     if extras[:target_ids_for_paging] && db_class.column_names.include?('id')
       return get_cached_page(limited_ids(limit, offset), includes, options)
@@ -97,7 +97,7 @@ def paged_view_search(options = {})
     search_options = options.merge(:class            => db,
                                    :conditions       => conditions,
                                    :include_for_find => includes,
-                                   :references       => get_include
+                                   :references       => get_ar_references
                                   )
     search_options.merge!(:limit => limit, :offset => offset, :order => order) if order
     search_options[:extra_cols] = va_sql_cols if va_sql_cols.present?