Data Archival Changes

app/models/spree/product_decorator.rb

@@ -1,3 +1,4 @@
 Spree::Product.class_eval do
   has_many :page_view_events, -> { viewed }, class_name: 'Spree::PageEvent', foreign_key: :target_id
+  has_many :archived_page_view_events, -> { viewed }, class_name: 'Spree::ArchivedPageEvent', foreign_key: :target_id
 end

app/reports/spree/cart_additions_report.rb

@@ -18,7 +18,7 @@ def sku
     end
 
     def report_query
-      Spree::CartEvent
+        report_source
         .added
         .joins(variant: :product)
         .where(created_at: reporting_period)
@@ -28,8 +28,17 @@ def report_query
           'spree_products.slug             as product_slug',
           'spree_variants.sku              as sku',
           'count(spree_products.name)      as additions',
-          'sum(spree_cart_events.quantity) as quantity_change'
+          "sum(#{report_source_table}.quantity) as quantity_change"
         )
     end
+
+    private def report_source
+      Spree::Config.events_tracker_archive_data ? Spree::ArchivedCartEvent : Spree::CartEvent
+    end
+
+    private def report_source_table
+      Spree::Config.events_tracker_archive_data ? 'spree_archived_cart_events' : 'spree_cart_events'
+    end
+
   end
 end

app/reports/spree/cart_removals_report.rb

@@ -18,7 +18,7 @@ def sku
     end
 
     def report_query
-      Spree::CartEvent
+      report_source
         .removed
         .joins(variant: :product)
         .where(created_at: reporting_period)
@@ -28,8 +28,17 @@ def report_query
           'spree_products.slug             as product_slug',
           'spree_variants.sku              as sku',
           'count(spree_products.name)      as removals',
-          'sum(spree_cart_events.quantity) as quantity_change'
+          "sum(#{report_source_table}.quantity) as quantity_change"
         )
     end
+
+    private def report_source
+      Spree::Config.events_tracker_archive_data ? Spree::ArchivedCartEvent : Spree::CartEvent
+    end
+
+    private def report_source_table
+      Spree::Config.events_tracker_archive_data ? 'spree_archived_cart_events' : 'spree_cart_events'
+    end
+
   end
 end

app/reports/spree/cart_updations_report.rb

@@ -18,10 +18,10 @@ def sku
     end
 
     def report_query
-      quantity_increase_sql = "CASE WHEN quantity > 0 then spree_cart_events.quantity ELSE 0 END"
-      quantity_decrease_sql = "CASE WHEN quantity < 0 then spree_cart_events.quantity ELSE 0 END"
+      quantity_increase_sql = "CASE WHEN quantity > 0 then #{report_source_table}.quantity ELSE 0 END"
+      quantity_decrease_sql = "CASE WHEN quantity < 0 then #{report_source_table}.quantity ELSE 0 END"
 
-      Spree::CartEvent
+      report_source
         .updated
         .joins(variant: :product)
         .where(created_at: reporting_period)
@@ -35,5 +35,14 @@ def report_query
           "SUM(#{ quantity_decrease_sql })  as quantity_decrease"
         )
     end
+
+    private def report_source
+      Spree::Config.events_tracker_archive_data ? Spree::ArchivedCartEvent : Spree::CartEvent
+    end
+
+    private def report_source_table
+      Spree::Config.events_tracker_archive_data ? 'spree_archived_cart_events' : 'spree_cart_events'
+    end
+
   end
 end

app/reports/spree/product_views_report.rb

@@ -17,15 +17,15 @@ def report_query
       viewed_events =
         Spree::Product
           .where(Spree::Product.arel_table[:name].matches(search_name))
-          .joins(:page_view_events)
-          .where(spree_page_events: { created_at: reporting_period })
-          .group('product_name', 'product_slug', 'spree_page_events.actor_id', 'spree_page_events.session_id')
+          .joins(event_scope)
+          .where(report_source_table.to_sym => { created_at: reporting_period })
+          .group('product_name', 'product_slug', "#{report_source_table}.actor_id", "#{report_source_table}.session_id")
           .select(
             'spree_products.name           as product_name',
             'spree_products.slug           as product_slug',
             'COUNT(*)                      as total_views_per_session',
-            'spree_page_events.session_id  as session_id',
-            'spree_page_events.actor_id    as actor_id'
+            "#{report_source_table}.session_id  as session_id",
+            "#{report_source_table}.actor_id    as actor_id"
           )
       Spree::Report::QueryFragments
         .from_subquery(viewed_events)
@@ -42,5 +42,14 @@ def report_query
     private def search_name
       search[:name].present? ? "%#{ search[:name] }%" : '%'
     end
+
+    private def report_source_table
+      Spree::Config.events_tracker_archive_data ? 'spree_archived_page_events' : 'spree_page_events'
+    end
+
+    private def event_scope
+      Spree::Config.events_tracker_archive_data ? :archived_page_view_events : :page_view_events
+    end
+
   end
 end

app/reports/spree/product_views_to_cart_additions_report.rb

@@ -19,19 +19,19 @@ def cart_to_view_ratio
 
     def report_query
       cart_additions =
-        Spree::CartEvent
+        report_source
           .added
           .joins(variant: :product)
           .where(created_at: reporting_period)
           .group('spree_products.name', 'spree_products.slug')
           .select(
             'spree_products.name              as product_name',
             'spree_products.slug              as product_slug',
-            'SUM(spree_cart_events.quantity)  as cart_additions'
+            "SUM(#{report_source_table}.quantity)  as cart_additions"
           )
       total_views =
         Spree::Product
-          .joins(:page_view_events)
+          .joins(event_scope)
           .group(:name)
           .select(
             'spree_products.name  as product_name',
@@ -48,5 +48,17 @@ def report_query
         )
     end
 
+    private def report_source
+      Spree::Config.events_tracker_archive_data ? Spree::ArchivedCartEvent : Spree::CartEvent
+    end
+
+    private def report_source_table
+      Spree::Config.events_tracker_archive_data ? 'spree_archived_cart_events' : 'spree_cart_events'
+    end
+
+    private def event_scope
+      Spree::Config.events_tracker_archive_data ? :archived_page_view_events : :page_view_events
+    end
+
   end
 end

app/reports/spree/product_views_to_purchases_report.rb

@@ -18,7 +18,7 @@ def purchase_to_view_ratio # This is inconsistent across postgres and mysql
     deeplink product_name: { template: %Q{<a href="/admin/products/{%# o.product_slug %}" target="_blank">{%# o.product_name %}</a>} }
 
     def report_query
-      page_events_ar         = Arel::Table.new(:spree_page_events)
+      page_events_ar         = Arel::Table.new(report_source_table)
       purchase_line_items_ar = Arel::Table.new(:purchase_line_items)
 
       Spree::Report::QueryFragments.from_subquery(purchase_line_items, as: :purchase_line_items)
@@ -50,5 +50,10 @@ def report_query
           'spree_products.id    as product_id'
         )
     end
+
+    private def report_source_table
+      Spree::Config.events_tracker_archive_data ? :spree_archived_page_events : :spree_page_events
+    end
+
   end
 end

app/reports/spree/trending_search_report.rb

@@ -36,15 +36,20 @@ def report_query
     end
 
     private def searches
-      Spree::PageEvent
+      report_source
         .where(activity: 'search')
         .where(created_at: reporting_period)
-        .where(Spree::PageEvent.arel_table[:search_keywords].matches(keyword_search))
+        .where(report_source.arel_table[:search_keywords].matches(keyword_search))
         .select("search_keywords as searched_term")
     end
 
     private def keyword_search
       search[:keywords_cont].present? ? "%#{ search[:keywords_cont] }%" : '%'
     end
+
+    private def report_source
+      Spree::Config.events_tracker_archive_data ? Spree::ArchivedPageEvent : Spree::PageEvent
+    end
+
   end
 end

app/reports/spree/user_pool_report.rb

@@ -52,7 +52,7 @@ def report_query
     end
 
     private def visitors
-      Spree::PageEvent
+      report_source
         .where(created_at: reporting_period)
         .select(
           *time_scale_selects,
@@ -73,7 +73,7 @@ def report_query
     end
 
     private def registered_users_visited
-      Spree::PageEvent
+      report_source
         .where(created_at: reporting_period)
         .where.not(actor_id: nil)
         .group(:session_id, :actor_id, *time_scale_columns)
@@ -83,5 +83,9 @@ def report_query
         )
     end
 
+    private def report_source
+      Spree::Config.events_tracker_archive_data ? Spree::ArchivedPageEvent : Spree::PageEvent
+    end
+
   end
 end