ahoy_captain 0.77 → 0.82

data/app/controllers/ahoy_captain/stats/views_per_visits_controller.rb

@@ -1,15 +1,19 @@
 module AhoyCaptain
   module Stats
     class ViewsPerVisitsController < BaseController
-      include Rangeable
-
+      # @todo: make me a window func
       def index
-        @stats = AhoyCaptain::Stats::ViewsPerVisitQuery.call(params).group_by_day('views_per_visit_table.started_at').average(:views_per_visit)
-        (range[0]..range[1]).to_a.each do |date|
-          unless @stats.key?(date.to_date)
-            @stats[date.to_date] = 2
+        @stats = AhoyCaptain::Stats::ViewsPerVisitQuery.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)
+              @stats[date.to_date] = 2
+            end
           end
         end
+
+        @label = "Views"
+
       end
     end
   end

data/app/controllers/ahoy_captain/stats/visit_durations_controller.rb

@@ -2,7 +2,8 @@ module AhoyCaptain
   module Stats
     class VisitDurationsController < BaseController
       def index
-        @stats = AhoyCaptain::Stats::VisitDurationQuery.call(params).group('started_at').average(:duration)
+        @stats = AhoyCaptain::Stats::VisitDurationQuery.call(params).group_by_period(selected_interval, 'started_at').average(:duration)
+        @label = "Duration"
       end
     end
   end

data/app/controllers/ahoy_captain/top_pages_controller.rb

@@ -10,17 +10,11 @@ module AhoyCaptain
 
     def index
       results = cached(:top_pages) do
-        event_query.with_routes.select(
-          "#{AhoyCaptain.config.event[:url_column]} as url",
-          "count(*) as count",
-          "sum(count(*)) over() as total_count"
-        )
-                   .group(Arel.sql ("(#{AhoyCaptain.config.event[:url_column]})"))
-                   .order(Arel.sql("count(#{AhoyCaptain.config.event[:url_column]}) desc"))
+        TopPageQuery.call(params)
                    .limit(limit)
       end
 
-      @pages = paginate(results).map { |page| TopPageDecorator.new(page) }
+      @pages = paginate(results).map { |page| TopPageDecorator.new(page, self) }
     end
   end
 end

data/app/decorators/ahoy_captain/application_decorator.rb

@@ -1,15 +1,39 @@
+require 'csv'
+
 module AhoyCaptain
   class ApplicationDecorator
     attr_reader :object
 
-    def initialize(object)
+    def self.to_csv(collection, context)
+      rows = collection.map { |row| new(row, context) }
+      CSV.generate do |csv|
+        csv << csv_map(context.params).keys
+
+        rows.each do |row|
+          items = []
+          csv_map.values.each do |attr|
+            items << row.send(attr)
+          end
+
+          csv << items
+        end
+      end
+    end
+
+    def self.csv_map(params = {})
+      raise NotImplementedError
+    end
+
+    delegate_missing_to :object
+    def initialize(object, context)
       @object = object
+      @context = context
     end
 
     private
 
     def h
-      @h ||= Current.request.view_context
+      @h ||= @context.view_context
     end
 
     def params
@@ -28,7 +52,7 @@ module AhoyCaptain
     end
 
     def request
-      Current.request.request
+      @context.request
     end
   end
 end

data/app/decorators/ahoy_captain/campaign_decorator.rb

@@ -1,5 +1,13 @@
 module AhoyCaptain
   class CampaignDecorator < ApplicationDecorator
+
+    def self.csv_map(params = {})
+      {
+        params[:campaigns_type] => :label,
+        "Total" => :unit_amount
+      }
+    end
+
     def display_name
       if object.label == "Direct/None"
         value = ""

data/app/decorators/ahoy_captain/city_decorator.rb

@@ -1,10 +1,22 @@
 module AhoyCaptain
   class CityDecorator < CountryDecorator
+    def self.csv_map(params = {})
+      {
+        "Country" => :country,
+        "City" => :city,
+        "Total" => :unit_amount
+      }
+    end
+
     def display_name
       search = search_query(country_eq: object.country, city_eq: object.city)
       frame_link("#{country_emoji(object.country)} #{object.city}", search)
     end
 
+    def country
+      "#{country_emoji(object.country)} #{object.country}"
+    end
+
     def unit_amount
       object.count
     end

data/app/decorators/ahoy_captain/country_decorator.rb

@@ -1,6 +1,16 @@
 module AhoyCaptain
   class CountryDecorator < ApplicationDecorator
     EMOJI_MAP = { "AD": "🇦🇩", "AE": "🇦🇪", "AF": "🇦🇫", "AG": "🇦🇬", "AI": "🇦🇮", "AL": "🇦🇱", "AM": "🇦🇲", "AO": "🇦🇴", "AQ": "🇦🇶", "AR": "🇦🇷", "AS": "🇦🇸", "AT": "🇦🇹", "AU": "🇦🇺", "AW": "🇦🇼", "AX": "🇦🇽", "AZ": "🇦🇿", "BA": "🇧🇦", "BB": "🇧🇧", "BD": "🇧🇩", "BE": "🇧🇪", "BF": "🇧🇫", "BG": "🇧🇬", "BH": "🇧🇭", "BI": "🇧🇮", "BJ": "🇧🇯", "BL": "🇧🇱", "BM": "🇧🇲", "BN": "🇧🇳", "BO": "🇧🇴", "BQ": "🇧🇶", "BR": "🇧🇷", "BS": "🇧🇸", "BT": "🇧🇹", "BV": "🇧🇻", "BW": "🇧🇼", "BY": "🇧🇾", "BZ": "🇧🇿", "CA": "🇨🇦", "CC": "🇨🇨", "CD": "🇨🇩", "CF": "🇨🇫", "CG": "🇨🇬", "CH": "🇨🇭", "CI": "🇨🇮", "CK": "🇨🇰", "CL": "🇨🇱", "CM": "🇨🇲", "CN": "🇨🇳", "CO": "🇨🇴", "CR": "🇨🇷", "CU": "🇨🇺", "CV": "🇨🇻", "CW": "🇨🇼", "CX": "🇨🇽", "CY": "🇨🇾", "CZ": "🇨🇿", "DE": "🇩🇪", "DJ": "🇩🇯", "DK": "🇩🇰", "DM": "🇩🇲", "DO": "🇩🇴", "DZ": "🇩🇿", "EC": "🇪🇨", "EE": "🇪🇪", "EG": "🇪🇬", "EH": "🇪🇭", "ER": "🇪🇷", "ES": "🇪🇸", "ET": "🇪🇹", "FI": "🇫🇮", "FJ": "🇫🇯", "FK": "🇫🇰", "FM": "🇫🇲", "FO": "🇫🇴", "FR": "🇫🇷", "GA": "🇬🇦", "GB": "🇬🇧", "GD": "🇬🇩", "GE": "🇬🇪", "GF": "🇬🇫", "GG": "🇬🇬", "GH": "🇬🇭", "GI": "🇬🇮", "GL": "🇬🇱", "GM": "🇬🇲", "GN": "🇬🇳", "GP": "🇬🇵", "GQ": "🇬🇶", "GR": "🇬🇷", "GS": "🇬🇸", "GT": "🇬🇹", "GU": "🇬🇺", "GW": "🇬🇼", "GY": "🇬🇾", "HK": "🇭🇰", "HM": "🇭🇲", "HN": "🇭🇳", "HR": "🇭🇷", "HT": "🇭🇹", "HU": "🇭🇺", "ID": "🇮🇩", "IE": "🇮🇪", "IL": "🇮🇱", "IM": "🇮🇲", "IN": "🇮🇳", "IO": "🇮🇴", "IQ": "🇮🇶", "IR": "🇮🇷", "IS": "🇮🇸", "IT": "🇮🇹", "JE": "🇯🇪", "JM": "🇯🇲", "JO": "🇯🇴", "JP": "🇯🇵", "KE": "🇰🇪", "KG": "🇰🇬", "KH": "🇰🇭", "KI": "🇰🇮", "KM": "🇰🇲", "KN": "🇰🇳", "KP": "🇰🇵", "KR": "🇰🇷", "KW": "🇰🇼", "KY": "🇰🇾", "KZ": "🇰🇿", "LA": "🇱🇦", "LB": "🇱🇧", "LC": "🇱🇨", "LI": "🇱🇮", "LK": "🇱🇰", "LR": "🇱🇷", "LS": "🇱🇸", "LT": "🇱🇹", "LU": "🇱🇺", "LV": "🇱🇻", "LY": "🇱🇾", "MA": "🇲🇦", "MC": "🇲🇨", "MD": "🇲🇩", "ME": "🇲🇪", "MF": "🇲🇫", "MG": "🇲🇬", "MH": "🇲🇭", "MK": "🇲🇰", "ML": "🇲🇱", "MM": "🇲🇲", "MN": "🇲🇳", "MO": "🇲🇴", "MP": "🇲🇵", "MQ": "🇲🇶", "MR": "🇲🇷", "MS": "🇲🇸", "MT": "🇲🇹", "MU": "🇲🇺", "MV": "🇲🇻", "MW": "🇲🇼", "MX": "🇲🇽", "MY": "🇲🇾", "MZ": "🇲🇿", "NA": "🇳🇦", "NC": "🇳🇨", "NE": "🇳🇪", "NF": "🇳🇫", "NG": "🇳🇬", "NI": "🇳🇮", "NL": "🇳🇱", "NO": "🇳🇴", "NP": "🇳🇵", "NR": "🇳🇷", "NU": "🇳🇺", "NZ": "🇳🇿", "OM": "🇴🇲", "PA": "🇵🇦", "PE": "🇵🇪", "PF": "🇵🇫", "PG": "🇵🇬", "PH": "🇵🇭", "PK": "🇵🇰", "PL": "🇵🇱", "PM": "🇵🇲", "PN": "🇵🇳", "PR": "🇵🇷", "PS": "🇵🇸", "PT": "🇵🇹", "PW": "🇵🇼", "PY": "🇵🇾", "QA": "🇶🇦", "RE": "🇷🇪", "RO": "🇷🇴", "RS": "🇷🇸", "RU": "🇷🇺", "RW": "🇷🇼", "SA": "🇸🇦", "SB": "🇸🇧", "SC": "🇸🇨", "SD": "🇸🇩", "SE": "🇸🇪", "SG": "🇸🇬", "SH": "🇸🇭", "SI": "🇸🇮", "SJ": "🇸🇯", "SK": "🇸🇰", "SL": "🇸🇱", "SM": "🇸🇲", "SN": "🇸🇳", "SO": "🇸🇴", "SR": "🇸🇷", "SS": "🇸🇸", "ST": "🇸🇹", "SV": "🇸🇻", "SX": "🇸🇽", "SY": "🇸🇾", "SZ": "🇸🇿", "TC": "🇹🇨", "TD": "🇹🇩", "TF": "🇹🇫", "TG": "🇹🇬", "TH": "🇹🇭", "TJ": "🇹🇯", "TK": "🇹🇰", "TL": "🇹🇱", "TM": "🇹🇲", "TN": "🇹🇳", "TO": "🇹🇴", "TR": "🇹🇷", "TT": "🇹🇹", "TV": "🇹🇻", "TW": "🇹🇼", "TZ": "🇹🇿", "UA": "🇺🇦", "UG": "🇺🇬", "UM": "🇺🇲", "US": "🇺🇸", "UY": "🇺🇾", "UZ": "🇺🇿", "VA": "🇻🇦", "VC": "🇻🇨", "VE": "🇻🇪", "VG": "🇻🇬", "VI": "🇻🇮", "VN": "🇻🇳", "VU": "🇻🇺", "WF": "🇼🇫", "WS": "🇼🇸", "YE": "🇾🇪", "YT": "🇾🇹", "ZA": "🇿🇦", "ZM": "🇿🇲", "ZW": "🇿🇼" }
+    def self.csv_map(params = {})
+      {
+        "Country" => :label,
+        "Total" => :unit_amount
+      }
+    end
+
+    def label
+      "#{country_emoji(country)} #{country}"
+    end
 
     def display_name
       search = search_query(country_eq: object.label)

data/app/decorators/ahoy_captain/device_decorator.rb

@@ -1,8 +1,19 @@
 module AhoyCaptain
   class DeviceDecorator < ApplicationDecorator
+    def self.csv_map(params = {})
+      {
+        "#{params[:devices_type]}" => :label,
+        "Total" => :unit_amount
+      }
+    end
+
     def display_name
-      search = search_query("#{params[:devices_type]}_eq" => object.label)
-      frame_link(object.label, search)
+      search = search_query("#{params[:devices_type]}_eq" => label)
+      frame_link(label, search)
+    end
+
+    def label
+      object.label
     end
 
     def unit_amount

data/app/decorators/ahoy_captain/page_decorator.rb

@@ -1,5 +1,16 @@
 module AhoyCaptain
   class PageDecorator < ApplicationDecorator
+    def self.csv_map(params = {})
+      {
+        "URL" => :label,
+        "Total" => :unit_amount
+      }
+    end
+
+    def label
+      object.url
+    end
+
     def display_name
       search = search_query(type => object.url)
       frame_link(object.url, search)

data/app/decorators/ahoy_captain/region_decorator.rb

@@ -1,10 +1,26 @@
 module AhoyCaptain
   class RegionDecorator < CountryDecorator
+    def self.csv_map(params = {})
+      {
+        "Country" => :country,
+        "Region" => :region,
+        "Total" => :unit_amount
+      }
+    end
+
     def display_name
       search = search_query(region_eq: object.region, country_eq: object.country)
       frame_link("#{country_emoji(object.country)} #{object.region}", search)
     end
 
+    def country
+      "#{country_emoji(object.country)} #{object.country}"
+    end
+
+    def region
+      object.region
+    end
+
     def unit_amount
       object.count
     end

data/app/decorators/ahoy_captain/source_decorator.rb

@@ -1,5 +1,12 @@
 module AhoyCaptain
   class SourceDecorator < ApplicationDecorator
+    def self.csv_map(params = {})
+      {
+        "Domain" => :referring_domain,
+        "Total" => :unit_amount
+      }
+    end
+
     def display_name
       display = %Q(
         <div class='flex justify-start space-x-8 col-span-1 items-center'>

data/app/models/ahoy_captain/export.rb

@@ -0,0 +1,48 @@
+module AhoyCaptain
+  class Export
+    def initialize(params, context)
+      @params = params
+      @context = context
+      @files = {}
+    end
+
+    def build
+      @files["browsers.csv"] = to_csv(DeviceQuery.call(merged_params(devices_type: "browser")), DeviceDecorator)
+      @files["cities.csv"] = to_csv(CityQuery.call(merged_params), CityDecorator)
+      @files["countries.csv"] = to_csv(CountryQuery.call(merged_params), CountryDecorator)
+      @files["devices.csv"] = to_csv(DeviceQuery.call(merged_params(devices_type: :device_type)), DeviceDecorator)
+      @files["entry_pages.csv"] = to_csv(EntryPagesQuery.call(merged_params), EntryPageDecorator)
+      @files["exit_pages.csv"] = to_csv(ExitPagesQuery.call(merged_params), ExitPageDecorator)
+      @files["operating_systems.csv"] = to_csv(DeviceQuery.call(merged_params(devices_type: "os")), DeviceDecorator)
+      @files["top_pages.csv"] = to_csv(TopPageQuery.call(merged_params), TopPageDecorator)
+      @files["regions.csv"] = to_csv(RegionQuery.call(merged_params), RegionDecorator)
+      @files["sources.csv"] = to_csv(SourceQuery.call(merged_params), SourceDecorator)
+      ["campaign", "content", "medium", "source", "term"].each do |utm|
+        @files["utm_#{utm.pluralize}.csv"] = to_csv(CampaignQuery.call(merged_params(campaigns_type: "utm_#{utm}")), CampaignDecorator)
+      end
+      self
+    end
+
+    def to_zip
+      zip_stream = Zip::OutputStream.write_buffer do |zip|
+        @files.each do |filename, csv|
+          zip.put_next_entry(filename)
+          zip.write(csv)
+        end
+      end
+
+      zip_stream.rewind
+      zip_stream
+    end
+
+    private
+
+    def to_csv(query, decorator)
+      decorator.to_csv(query, @context)
+    end
+
+    def merged_params(params_to_merge = {})
+      @params.dup.merge(params_to_merge)
+    end
+  end
+end

data/app/presenters/ahoy_captain/dashboard_presenter.rb

@@ -10,27 +10,32 @@ module AhoyCaptain
 
     def unique_visitors
       cached(:unique_visitors) do
-        Stats::UniqueVisitorsQuery.call(params).count(:ip)
+        Stats::UniqueVisitorsQuery.call(params).count(:visitor_token)
       end
     end
 
     def total_visits
       cached(:total_visits) do
-        Stats::TotalVisitorsQuery.call(params).count
+        Stats::TotalVisitorsQuery.call(params).count(:id)
       end
     end
 
     def total_pageviews
       cached(:total_pageviews) do
-        Stats::TotalPageviewsQuery.call(params).count
+        Stats::TotalPageviewsQuery.call(params).count(:id)
       end
     end
 
     def views_per_visit
       cached(:views_per_visit) do
         begin
-          result = Stats::AverageViewsPerVisitQuery.call(params).count
-          (result.values.sum.to_f / result.size).round(2)
+          result = Stats::AverageViewsPerVisitQuery.call(params).count(:id)
+          count = (result.values.sum.to_f / result.size).round(2)
+          if count.nan?
+            return "0"
+          else
+            return count
+          end
         rescue ::ActiveRecord::StatementInvalid => e
           if e.message.include?("PG::DivisionByZero")
             return "0"
@@ -39,23 +44,26 @@ module AhoyCaptain
           end
         end
       end
-
     end
 
     def bounce_rate
       cached(:bounce_rate) do
         begin
-        result = Stats::BounceRatesQuery.call(params)
-        result[0].bounce_rate.round(2)
+          result = Stats::BounceRatesQuery.call(params)
+          average = result.average("bounce_rate")
+          if average
+            average.round(2)
+          else
+            "0"
+          end
         rescue ::ActiveRecord::StatementInvalid => e
-        if e.message.include?("PG::DivisionByZero")
-          return "0"
-        else
-          raise e
+          if e.message.include?("PG::DivisionByZero")
+            return "0"
+          else
+            raise e
+          end
         end
       end
-
-      end
     end
 
     def visit_duration
@@ -63,7 +71,7 @@ module AhoyCaptain
         result = Stats::AverageVisitDurationQuery.call(params)
         duration = result[0].average_visit_duration
         if duration
-          "#{duration.parts[:minutes]}M #{duration.parts[:seconds].round}S"
+          "#{duration.in_minutes.to_i}M #{duration.parts[:seconds].to_i}S"
         else
           "0M 0S"
         end
@@ -73,7 +81,7 @@ module AhoyCaptain
     private
 
     def cached(*names)
-      AhoyCaptain.cache.fetch("ahoy_captain:#{names.join(":")}:#{params.permit!.except("controller", "action").to_unsafe_h.map { |k,v| "#{k}-#{v}" }.join(":")}", expire_in: AhoyCaptain.config.cache.ttl) do
+      AhoyCaptain.cache.fetch("ahoy_captain:#{names.join(":")}:#{params.permit!.except("controller", "action").to_unsafe_h.map { |k,v| "#{k}-#{v}" }.join(":")}", expire_in: AhoyCaptain.config.cache[:ttl]) do
         yield
       end
     end

data/app/presenters/ahoy_captain/funnel_presenter.rb

@@ -9,44 +9,47 @@ module AhoyCaptain
     end
 
     def build
-      queries = {}
-      prev_goal = nil
-      prev_table = nil
-      selects = []
-      @funnel.goals.each do |goal|
-        if prev_goal
-          query = ::Ahoy::Event
-                    .select("distinct ahoy_events.visit_id")
-                    .from(prev_table.to_s)
-                    .joins("inner join ahoy_events on ahoy_events.visit_id = #{prev_table}.id")
-                    .where("ahoy_events.name = ?", goal.event_name.to_s).to_sql
-          prev_table = "#{goal.id}"
-          selects << ["SELECT '#{prev_goal.title} > #{goal.title}' as step, count(*) from #{prev_table}"]
-          queries[prev_table] = query
-        else
-          prev_table = :visitors
-          prev_goal = goal
+      if AhoyCaptain.config.goals.none?
+        @goals = []
+        return self
+      end
 
-          query = @event_query
-                    .select("distinct(visit_id) as id, min(time) as min_time")
-                    .where(name: goal.event_name.to_s)
-                    .group("1").to_sql
-          selects << ["'#{goal.title}' as step, count(*) from #{prev_table}"]
+      queries = {
+        totals: @event_query.select("count(distinct(#{AhoyCaptain.event.table_name}.visit_id)) as unique_visits, '_internal_total_visits_' as name, count(distinct #{AhoyCaptain.event.table_name}.id) as total_events, 0 as sort_order")
+      }
+      selects = ["SELECT unique_visits, name, total_events, sort_order from totals"]
+      last_goal = nil
+      map = {}.with_indifferent_access
 
-          queries[prev_table] = query
-        end
+      AhoyCaptain.config.goals.each_with_index do |goal, index|
+        queries[goal.id] = @event_query.select("count(distinct(#{AhoyCaptain.event.table_name}.visit_id)) as unique_visits, '#{goal.id}' as name, count(distinct #{AhoyCaptain.event.table_name}.id) as total_events, #{index + 1} as sort_order").merge(goal.event_query.call).group("#{AhoyCaptain.event.table_name}.name")
+        selects << ["SELECT unique_visits, name, total_events, sort_order from #{goal.id}"]
+        map[goal.id] = goal
+        last_goal = goal
       end
 
-      select = selects.join(" UNION ").delete_suffix(" from #{prev_table}")
-
+      # activerecord quirk / with bug
+      select = selects.join(" UNION ").delete_suffix(" from #{last_goal.id}")
+      select = select.delete_prefix("SELECT ")
       steps = ::Ahoy::Event.with(
-        queries
-      ).select(select).from(prev_table).order("count desc")
+        queries,
+        ).select(select).from("#{last_goal.id}").order("sort_order asc")
+
+      items = ::Ahoy::Event.with(steps: steps).select("total_events, unique_visits, name, round((total_events::numeric/lag(total_events, 1) over ()),2) as drop_off").from("steps").order("sort_order asc").index_by(&:name)
+      items.delete("_internal_total_visits_")
+      @steps = []
 
-      @steps = ::Ahoy::Event.with(steps: steps).select("step, count, lag(count, 1) over () as lag, abs(count::numeric - lag(count, 1) over ())::integer as drop_off, round((1.0 - count::numeric/GREATEST(lag(count, 1) over (), 1)),2) as conversion_rate").from("steps")
+      items.values.each do |item|
+        if map[item.name]
+          item.name = map[item.name].title
+        end
+      end
+
+      @steps = items.values
       self
     end
 
+
     def total
       @event_query.distinct(:visitor_token).count
     end

data/app/presenters/ahoy_captain/goals_presenter.rb

@@ -6,44 +6,53 @@ module AhoyCaptain
       @goals = nil
     end
 
+    # this is a dumpster fire
     def build
       if AhoyCaptain.config.goals.none?
         @goals = []
         return self
       end
-      queries = {}
-      selects = []
+
+      queries = {
+        totals: @event_query.select("count(distinct(#{AhoyCaptain.event.table_name}.visit_id)) as unique_visits, '_internal_total_visits_' as name, count(distinct #{AhoyCaptain.event.table_name}.id) as total_events, 0 as sort_order")
+      }
+      selects = ["SELECT unique_visits, name, total_events, sort_order, 0 as cr from totals"]
       last_goal = nil
-      map = {}
-      AhoyCaptain.config.goals.each do |goal|
-        queries[goal.id] = @event_query.select("count(distinct(visit_id)) as uniques, count(name) as total, name").where(name: goal.event_name).group("name")
-        selects << ["SELECT total, uniques, name from #{goal.id}"]
-        map[goal.event_name] = goal
+      map = {}.with_indifferent_access
+
+      AhoyCaptain.config.goals.each_with_index do |goal, index|
+        queries[goal.id] = @event_query.select(
+          [
+            "count(distinct(#{AhoyCaptain.event.table_name}.visit_id)) as unique_visits" ,
+            "'#{goal.id}' as name",
+            "count(distinct #{AhoyCaptain.event.table_name}.id) as total_events",
+            "#{index + 1} as sort_order",
+          ]
+        ).merge(goal.event_query.call).group("#{AhoyCaptain.event.table_name}.name")
+        selects << ["SELECT unique_visits, name, total_events, sort_order, 0::decimal as cr from #{goal.id}"]
+        map[goal.id] = goal
         last_goal = goal
       end
+
+      # activerecord quirk / with bug
       select = selects.join(" UNION ").delete_suffix(" from #{last_goal.id}")
       select = select.delete_prefix("SELECT ")
       steps = ::Ahoy::Event.with(
-        queries
-      ).select(select).from("#{last_goal.id}")
-
-      items = ::Ahoy::Event.with(steps: steps).select("total, uniques, name, 0 as conversion_rate").from("steps").index_by(&:name)
-      @goals = []
-      map.each do |name, _|
-        if items[name]
-          items[name].name = map[name].title
-          items[name].conversion_rate = ((items[name].total / total.to_d) * 100).round(2) * 100
-          @goals << items[name]
-        else
-          @goals << OpenStruct.new(name: map[name].title, uniques: 0, total: 0, conversion_rate: 0)
-        end
-      end
+        queries,
+        ).select(select).from("#{last_goal.id}").order("sort_order asc").index_by(&:name)
+      totals = steps.delete("_internal_total_visits_")
 
+      @goals = steps.keys.collect do |name|
+        step = steps[name]
+        step.name = map[name].title
+        step.cr = ((step.total_events.to_d / totals.total_events.to_d) * 100).round(2)
+        step
+      end
       self
     end
 
-    def total
-      @total ||= @event_query.distinct(:visitor_token).count
+    def total_visitors
+      @total_visitors ||= @event_query.select(:visit_id).distinct.count
     end
 
     def as_json

data/app/queries/ahoy_captain/application_query.rb

@@ -21,6 +21,9 @@ module AhoyCaptain
       @query = query
     end
 
+    def inspect
+      "<#{self.class.name}>"
+    end
     protected
 
     def build
@@ -50,6 +53,7 @@ module AhoyCaptain
       EventQuery.call(params)
     end
 
+    # this could be better
     def ransack_params_for(type)
       ransackable_params = {}
 
@@ -58,12 +62,13 @@ module AhoyCaptain
           visit: (AhoyCaptain.visit.ransackable_attributes + AhoyCaptain.visit.ransackable_scopes).map(&:to_s),
           event: (AhoyCaptain.event.ransackable_attributes + AhoyCaptain.event.ransackable_scopes).map(&:to_s),
         }
+
         pattern = /(?:_not_eq|_eq|_in|_not_in|_cont|_not_cont|_i_cont)$/
         params[:q].each do |key, value|
           attribute_name = key.gsub(pattern, '')
-          if type == :event && ransackable_attributes[:visit].include?(attribute_name) || ransackable_attributes[:visit].include?(key)
+          if type == :event && (ransackable_attributes[:visit].include?(attribute_name) || ransackable_attributes[:visit].include?(key))
             ransackable_params["visit_#{key}"] = value
-          elsif type == :visit && ransackable_attributes[:event].include?(attribute_name) || ransackable_attributes[:event].include?(key)
+          elsif type == :visit && (ransackable_attributes[:event].include?(attribute_name) || ransackable_attributes[:event].include?(key))
             ransackable_params["events_#{key}"] = value
           else
             ransackable_params[key] = value
@@ -90,8 +95,8 @@ module AhoyCaptain
           if range.size == 2
             ransackable_params["started_at_gt"] = range[0]
             ransackable_params["started_at_lt"] = range[1]
-            ransackable_params["events_time_gt"] = range[0]
-            ransackable_params["events_time_lt"] = range[1]
+            ransackable_params["events_time_gteq"] = range[0]
+            ransackable_params["events_time_lteq"] = range[1]
           else
             ransackable_params["started_at_gt"] = range[0]
             ransackable_params["events_time_gt"] = range[0]
@@ -99,7 +104,6 @@ module AhoyCaptain
         end
       end
 
-
       ransackable_params
     end
 

data/app/queries/ahoy_captain/campaign_query.rb

@@ -0,0 +1,14 @@
+module AhoyCaptain
+  class CampaignQuery < ApplicationQuery
+    def build
+      visit_query
+        .select(
+          "COALESCE(#{params[:campaigns_type]}, 'Direct/None') as label",
+          "count(COALESCE(#{params[:campaigns_type]}, 'Direct/None')) as count",
+          "sum(count(COALESCE(#{params[:campaigns_type]}, 'Direct/None'))) OVER() as total_count"
+        )
+        .group("COALESCE(#{params[:campaigns_type]}, 'Direct/None')")
+        .order(Arel.sql("count(COALESCE(#{params[:campaigns_type]}, 'Direct/None')) desc"))
+    end
+  end
+end

data/app/queries/ahoy_captain/city_query.rb

@@ -0,0 +1,11 @@
+module AhoyCaptain
+  class CityQuery < ApplicationQuery
+    def build
+      visit_query
+        .select("city, country, count(concat(city, region, country)) as count, sum(count(concat(city, region, country))) over() as total_count")
+        .where.not(city: nil)
+        .group("city, region, country")
+        .order(Arel.sql "count(concat(city, region, country)) desc")
+    end
+  end
+end

data/app/queries/ahoy_captain/country_query.rb

@@ -0,0 +1,10 @@
+module AhoyCaptain
+  class CountryQuery < ApplicationQuery
+    def build
+      visit_query
+        .reselect("country as label, count(country) as count, sum(count(country)) OVER() as total_count")
+        .group("country")
+        .order("count(country) desc")
+    end
+  end
+end

data/app/queries/ahoy_captain/device_query.rb

@@ -0,0 +1,10 @@
+module AhoyCaptain
+  class DeviceQuery < ApplicationQuery
+    def build
+      visit_query
+        .select("#{params[:devices_type]} as label", "count(#{params[:devices_type]}) as count", "sum(count(#{params[:devices_type]})) over() as total_count")
+        .group(params[:devices_type])
+        .order("count(#{params[:devices_type]}) desc")
+    end
+  end
+end