query naming

app/controllers/ahoy_captain/stats/views_per_visits_controller.rb

@@ -3,7 +3,7 @@ module Stats
     class ViewsPerVisitsController < BaseController
       # @todo: make me a window func
       def index
-        @stats = AhoyCaptain::Stats::ViewsPerVisitQuery.call(params).group_by_period(selected_interval, 'views_per_visit_table.started_at').average(:views_per_visit)
+        @stats = AhoyCaptain::Stats::CountViewsPerVisitQuery.call(params).group_by_period(selected_interval, 'views_per_visit_table.started_at').average(:views_per_visit)
         if range[1]
           (range[0].to_date..range[1].to_date).to_a.each do |date|
             unless @stats.key?(date.to_date)

app/presenters/ahoy_captain/dashboard_presenter.rb

@@ -29,7 +29,7 @@ def total_pageviews
     def views_per_visit
       cached(:views_per_visit) do
         begin
-          result = Stats::AverageViewsPerVisitQuery.call(params).count(:id)
+          result = Stats::ViewsPerVisitQuery.call(params).count(:id)
           count = (result.values.sum.to_f / result.size).round(2)
           if count.nan?
             return "0"

app/queries/ahoy_captain/stats/count_views_per_visit_query.rb

@@ -0,0 +1,17 @@
+module AhoyCaptain
+  module Stats
+    class CountViewsPerVisitQuery < ApplicationQuery
+      def build
+        events = event_query
+                   .joins(:visit)
+                   .select("#{::AhoyCaptain.visit.table_name}.started_at as started_at, count(#{AhoyCaptain.event.table_name}.name) / count(distinct #{AhoyCaptain.event.table_name}.visit_id) as views_per_visit")
+                   .where(name: AhoyCaptain.config.event[:view_name])
+                   .group("#{AhoyCaptain.visit.table_name}.started_at, #{AhoyCaptain.event.table_name}.visit_id")
+
+        ::Ahoy::Visit
+                     .select("views_per_visit as views_per_visit")
+                     .from(events, :views_per_visit_table)
+      end
+    end
+  end
+end

app/queries/ahoy_captain/stats/views_per_visit_query.rb

@@ -1,16 +1,12 @@
 module AhoyCaptain
   module Stats
+    # pls fix
     class ViewsPerVisitQuery < ApplicationQuery
       def build
-        events = event_query
-                   .joins(:visit)
-                   .select("#{::AhoyCaptain.visit.table_name}.started_at as started_at, count(#{AhoyCaptain.event.table_name}.name) / count(distinct #{AhoyCaptain.event.table_name}.visit_id) as views_per_visit")
-                   .where(name: AhoyCaptain.config.event[:view_name])
-                   .group("#{AhoyCaptain.visit.table_name}.started_at, #{AhoyCaptain.event.table_name}.visit_id")
-
-        ::Ahoy::Visit
-                     .select("views_per_visit as views_per_visit")
-                     .from(events, :views_per_visit_table)
+        event_query
+          .joins(:visit)
+          .where(name: "$view")
+          .group("#{AhoyCaptain.visit.table_name}.id")
       end
     end
   end