sentiero-rails 1.0.0.alpha1 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ce313521ddbc812513032b99f9167f18888958bce23cae2ca040910fd9a16e
-  data.tar.gz: 3395c38e3db3cc713116c59963509bafc619f30ce83701aca67e051daa50a6a5
+  metadata.gz: f0f5a8e4a39699bb20d9dda091a89f17f638cc10eb8fb3d26fdde59814a8e22e
+  data.tar.gz: 5f7c1f9aee0fc818757789474a8ca40cc47fd8b7b40fe45185dbf388615cdd84
 SHA512:
-  metadata.gz: 77e8e9577a6428b5ec1c913755ffa0a7410349ad87f0bdd0bfc38246aafc2d1cdd9b38a4d1609331ad2e0e649818e3e04cc30b46d0f23118cd1ade7e25c28ad4
-  data.tar.gz: 4a9a082240b101a0466cf36bca3a28535e895937926045e53ddf1956edf23e883f9cf1bdf3667dc866be961f1fa0fab3c704e746866f568b17e7c9bedc283d5f
+  metadata.gz: 9b996051bfb56885f7a411b2edb75eda5606e32a3f5ddcbdd360bfbdbc8a7fb6ba16be9c9f36c918c37e5c4ef686224db8d9745a2edaf7b26c1ce41883dc21e0
+  data.tar.gz: 064e76cdd2bfa871b9370c504ac6b59dd657a9887bc1a71e7f6b9f25ff19d13f57102ac7289ba72274e408245397cc10ee202af771e3d46df426a6d9e540f115

data/lib/sentiero/rails/store.rb

@@ -44,8 +44,10 @@ module Sentiero
 
       # Batched scan: one events query for the whole session page instead of the
       # base's get_session + get_events per window.
-      def each_session_events(limit: nil, since: nil, until_time: nil)
-        return enum_for(:each_session_events, limit: limit, since: since, until_time: until_time) unless block_given?
+      def each_session_events(limit: nil, since: nil, until_time: nil, types: nil)
+        unless block_given?
+          return enum_for(:each_session_events, limit: limit, since: since, until_time: until_time, types: types)
+        end
 
         cap = limit || limits.analytics_max_scan_sessions
         summaries = list_sessions(limit: cap, since: since, until_time: until_time)
@@ -53,14 +55,29 @@ module Sentiero
 
         events = events_by_session_window(summaries.map { |summary| summary[:session_id] })
         summaries.each do |summary|
-          (events[summary[:session_id]] || {}).each do |window_id, window_events|
+          windows = events[summary[:session_id]] || {}
+          summary = summary.merge(
+            window_starts: windows.transform_values { |window_events| window_events.first&.fetch("timestamp", nil) }
+          )
+          windows.each do |window_id, window_events|
+            window_events = window_events.select { |event| types.include?(event["type"]) } if types
             yield summary, window_id, window_events
           end
         end
       end
 
-      def list_sessions(limit:, offset: 0, since: nil, until_time: nil, sort_by: nil, search: nil)
+      def list_sessions(limit:, offset: 0, since: nil, until_time: nil, sort_by: nil, search: nil,
+        min_duration_ms: nil, min_events: nil)
         scope = filtered_session_scope(since:, until_time:, search:)
+        if sort_by == "event_count" || min_duration_ms || min_events
+          scope = with_event_aggregates(scope)
+        end
+        if min_events
+          scope = scope.having("COUNT(#{Event.table_name}.id) >= ?", min_events)
+        end
+        if min_duration_ms
+          scope = scope.having("MAX(#{Event.table_name}.timestamp) - MIN(#{Event.table_name}.timestamp) >= ?", min_duration_ms)
+        end
         scope = ordered_session_scope(scope, sort_by)
 
         sessions = scope.offset(offset).limit(limit).to_a
@@ -370,22 +387,22 @@ module Sentiero
 
         if search && !search.empty?
           pattern = "%#{search}%"
+          table = Session.table_name
           scope = if metadata_column?
-            scope.where("session_id LIKE ? OR CAST(metadata AS TEXT) LIKE ?", pattern, pattern)
+            scope.where("#{table}.session_id LIKE ? OR CAST(#{table}.metadata AS TEXT) LIKE ?", pattern, pattern)
           else
-            scope.where("session_id LIKE ?", pattern)
+            scope.where("#{table}.session_id LIKE ?", pattern)
           end
         end
 
         scope
       end
 
+      # The COUNT ordering relies on the events join/group that list_sessions
+      # applies via with_event_aggregates.
       def ordered_session_scope(scope, sort_by)
         if sort_by == "event_count"
-          scope
-            .joins("LEFT JOIN #{Event.table_name} ON #{Event.table_name}.session_id = #{Session.table_name}.session_id")
-            .group("#{Session.table_name}.id")
-            .order(Arel.sql("COUNT(#{Event.table_name}.id) DESC"))
+          scope.order(Arel.sql("COUNT(#{Event.table_name}.id) DESC"))
         else
           sort_column = case sort_by
           when "created_at" then :created_at
@@ -395,6 +412,12 @@ module Sentiero
         end
       end
 
+      def with_event_aggregates(scope)
+        scope
+          .joins("LEFT JOIN #{Event.table_name} ON #{Event.table_name}.session_id = #{Session.table_name}.session_id")
+          .group("#{Session.table_name}.id")
+      end
+
       def window_ids_for(session_ids)
         Event.where(session_id: session_ids)
           .distinct.pluck(:session_id, :window_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentiero-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Stephen Ierodiaconou
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha1
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha1
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement