workarea-core 3.4.44 → 3.5.0.beta.1

data/app/queries/workarea/product_primary_navigation.rb

@@ -34,8 +34,19 @@ module Workarea
     private
 
     def categories
-      @categories ||= @options[:categories] ||
-        Categorization.new(@product).to_models
+      @categories ||=
+        (@options[:categories] || Categorization.new(@product).to_models)
+          .tap(&method(:load_taxons))
+    end
+
+    def load_taxons(categories)
+      taxons = Navigation::Taxon
+        .where(navigable_type: Catalog::Category.name)
+        .in(navigable_id: categories.map(&:id))
+        .map { |taxon| [taxon.navigable_id, taxon] }
+        .to_h
+
+      categories.each { |cat| cat.set_relation(:taxon, taxons[cat.id]) }
     end
   end
 end

data/app/queries/workarea/product_releases.rb

@@ -0,0 +1,38 @@
+module Workarea
+  class ProductReleases
+    attr_reader :product
+
+    def initialize(product)
+      @product = product
+    end
+
+    def releases
+      changesets
+        .uniq(&:release)
+        .reject { |cs| cs.release.blank? }
+        .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
+        .uniq
+    end
+
+    # All {Releasable}s that could affect the product's Elasticsearch document
+    # should add their changesets to this method.
+    #
+    # @example Add to the changesets affecting a product in a decorator
+    #   def changesets
+    #     super.merge(SomeReleasable.for_product(product.id).changesets_with_children)
+    #   end
+    #
+    # @return [Mongoid::Criteria]
+    #
+    def changesets
+      criteria = product.changesets_with_children
+      pricing_skus.each { |ps| criteria.merge!(ps.changesets_with_children) }
+      criteria.merge!(FeaturedProducts.changesets(product.id))
+      criteria.includes(:release)
+    end
+
+    def pricing_skus
+      Pricing::Sku.in(id: product.skus).to_a
+    end
+  end
+end

data/app/queries/workarea/recommendation/user_activity_based.rb

@@ -1,12 +1,12 @@
 module Workarea
   module Recommendation
     class UserActivityBased
-      def initialize(user_activity)
-        @user_activity = user_activity
+      def initialize(metrics)
+        @metrics = metrics
       end
 
       def results
-        if @user_activity.product_ids.blank? && @user_activity.category_ids.blank?
+        if recent_product_ids.blank? && recent_category_ids.blank?
           popular_product_ids.take(max_results)
         else
           related_product_ids.take(max_results)
@@ -18,6 +18,14 @@ module Workarea
         Workarea.config.per_page
       end
 
+      def recent_product_ids
+        @metrics.viewed.recent_product_ids(unique: true)
+      end
+
+      def recent_category_ids
+        @metrics.viewed.recent_category_ids(unique: true)
+      end
+
       def popular_product_ids
         Insights::TopProducts
           .current
@@ -28,9 +36,9 @@ module Workarea
 
       def related_product_ids
         query = Workarea::Search::RelatedProducts.new(
-          product_ids: @user_activity.product_ids,
-          category_ids: @user_activity.category_ids,
-          exclude_product_ids: @user_activity.product_ids
+          product_ids: recent_product_ids,
+          category_ids: recent_category_ids,
+          exclude_product_ids: recent_product_ids
         )
 
         query.results.map { |r| r[:catalog_id] }

data/app/queries/workarea/reports/average_order_value.rb

@@ -14,7 +14,7 @@ module Workarea
       def filter_date_range_and_zeroes
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             'orders' => { '$gt' => 0 },
             'revenue' => { '$gt' => 0 }
           }

data/app/queries/workarea/reports/customers.rb

@@ -4,13 +4,14 @@ module Workarea
       include Report
 
       self.reporting_class = Metrics::User
-      self.sort_fields = %w(revenue first_order_at last_order_at orders average_order_value)
+      self.sort_fields = %w(revenue refund first_order_at last_order_at orders average_order_value cancellations)
 
       def aggregation
-        result = [add_returning]
-        result << filter_to_returning if params[:results_filter] == 'returning'
-        result << filter_to_one_time if params[:results_filter] == 'one_time'
-        result + [project_fields]
+        [filter_orders, add_returning, filter_returning, project_fields].compact
+      end
+
+      def filter_orders
+        { '$match' => { 'orders' => { '$gt' => 0 } } }
       end
 
       def add_returning
@@ -21,12 +22,12 @@ module Workarea
         }
       end
 
-      def filter_to_returning
-        { '$match' => { 'returning' => true } }
-      end
-
-      def filter_to_one_time
-        { '$match' => { 'returning' => false } }
+      def filter_returning
+        if params[:results_filter] == 'returning'
+          { '$match' => { 'returning' => true } }
+        elsif params[:results_filter] == 'one_time'
+          { '$match' => { 'returning' => false } }
+        end
       end
 
       def project_fields
@@ -36,7 +37,9 @@ module Workarea
             'first_order_at' => 1,
             'last_order_at' => 1,
             'orders' => 1,
+            'cancellations' => 1,
             'revenue' => 1,
+            'refund' => 1,
             'average_order_value' => { '$divide': ['$revenue', '$orders'] }
           }
         }

data/app/queries/workarea/reports/first_time_vs_returning_sales.rb

@@ -14,7 +14,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/group_by_time.rb

@@ -25,50 +25,46 @@ module Workarea
 
       private
 
-      def reporting_on_in_time_zone
-        { 'date' => '$reporting_on', 'timezone' => Time.zone.tzinfo.name }
-      end
-
       def day_id
         {
-          'year' => { '$year' => reporting_on_in_time_zone },
-          'month' => { '$month' => reporting_on_in_time_zone },
-          'day' => { '$dayOfMonth' => reporting_on_in_time_zone }
+          'year' => { '$year' => '$reporting_on' },
+          'month' => { '$month' => '$reporting_on' },
+          'day' => { '$dayOfMonth' => '$reporting_on' }
         }
       end
 
       def week_id
         {
-          'year' => { '$year' => reporting_on_in_time_zone },
-          'week' => { '$isoWeek' => reporting_on_in_time_zone }
+          'year' => { '$year' => '$reporting_on' },
+          'week' => { '$isoWeek' => '$reporting_on' }
         }
       end
 
       def day_of_week_id
-        { 'day_of_week' => { '$dayOfWeek' => reporting_on_in_time_zone } }
+        { 'day_of_week' => { '$dayOfWeek' => '$reporting_on' } }
       end
 
       def month_id
         {
-          'year' => { '$year' => reporting_on_in_time_zone },
-          'month' => { '$month' => reporting_on_in_time_zone }
+          'year' => { '$year' => '$reporting_on' },
+          'month' => { '$month' => '$reporting_on' }
         }
       end
 
       def quarter_id
         {
-          'year' => { '$year' => reporting_on_in_time_zone },
+          'year' => { '$year' => '$reporting_on' },
           'quarter' => {
             '$cond' => [
-              { '$lte' => [{ '$month' => reporting_on_in_time_zone }, 3] },
+              { '$lte' => [{ '$month' => '$reporting_on' }, 3] },
               1,
               {
                 '$cond' => [
-                  { '$lte' => [{ '$month' => reporting_on_in_time_zone }, 6] },
+                  { '$lte' => [{ '$month' => '$reporting_on' }, 6] },
                   2,
                   {
                     '$cond' => [
-                      { '$lte' => [{ '$month' => reporting_on_in_time_zone }, 9] },
+                      { '$lte' => [{ '$month' => '$reporting_on' }, 9] },
                       3,
                       4
                     ]
@@ -81,7 +77,7 @@ module Workarea
       end
 
       def year_id
-        { 'year' => { '$year' => reporting_on_in_time_zone } }
+        { 'year' => { '$year' => '$reporting_on' } }
       end
     end
   end

data/app/queries/workarea/reports/sales_by_category.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/sales_by_country.rb

@@ -4,7 +4,7 @@ module Workarea
       include Report
 
       self.reporting_class = Metrics::CountryByDay
-      self.sort_fields = %w(orders units_sold merchandise discounts shipping tax revenue)
+      self.sort_fields = %w(orders cancellations units_sold units_canceled merchandise discounts shipping tax refund revenue)
 
       def aggregation
         [filter, project_used_fields, group_by_country]
@@ -13,10 +13,11 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             '$or' => [
               { 'orders' => { '$gt' => 0 } },
-              { 'units_sold' => { '$gt' => 0 } }
+              { 'units_sold' => { '$gt' => 0 } },
+              { 'units_canceled' => { '$gt' => 0 } }
             ]
           }
         }
@@ -27,11 +28,14 @@ module Workarea
           '$project' => {
             'country' => 1,
             'orders' => 1,
+            'cancellations' => 1,
             'units_sold' => 1,
+            'units_canceled' => 1,
             'merchandise' => 1,
             'shipping' => 1,
             'discounts' => 1,
             'tax' => 1,
+            'refund' => 1,
             'revenue' => 1
           }
         }
@@ -42,11 +46,14 @@ module Workarea
           '$group' => {
             '_id' => '$country',
             'orders' => { '$sum' => '$orders' },
+            'cancellations' => { '$sum' => '$cancellations' },
             'units_sold' => { '$sum' => '$units_sold' },
+            'units_canceled' => { '$sum' => '$units_canceled' },
             'merchandise' => { '$sum' => '$merchandise' },
             'shipping' => { '$sum' => '$shipping' },
             'discounts' => { '$sum' => '$discounts' },
             'tax' => { '$sum' => '$tax' },
+            'refund' => { '$sum' => '$refund' },
             'revenue' => { '$sum' => '$revenue' }
           }
         }

data/app/queries/workarea/reports/sales_by_discount.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/sales_by_menu.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/sales_by_product.rb

@@ -4,19 +4,20 @@ module Workarea
       include Report
 
       self.reporting_class = Metrics::ProductByDay
-      self.sort_fields = %w(units_sold orders merchandise discounts tax revenue)
+      self.sort_fields = %w(units_sold units_canceled orders average_price merchandise discounts tax refund revenue)
 
       def aggregation
-        [filter, project_used_fields, group_by_product]
+        [filter, project_used_fields, group_by_product, add_average_price]
       end
 
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             '$or' => [
               { 'orders' => { '$gt' => 0 } },
-              { 'units_sold' => { '$gt' => 0 } }
+              { 'units_sold' => { '$gt' => 0 } },
+              { 'units_canceled' => { '$gt' => 0 } }
             ]
           }
         }
@@ -28,9 +29,11 @@ module Workarea
             'product_id' => 1,
             'orders' => 1,
             'units_sold' => 1,
+            'units_canceled' => 1,
             'merchandise' => 1,
             'discounts' => 1,
             'tax' => 1,
+            'refund' => 1,
             'revenue' => 1
           }
         }
@@ -42,13 +45,45 @@ module Workarea
             '_id' => '$product_id',
             'orders' => { '$sum' => '$orders' },
             'units_sold' => { '$sum' => '$units_sold' },
+            'units_canceled' => { '$sum' => '$units_canceled' },
             'merchandise' => { '$sum' => '$merchandise' },
             'discounts' => { '$sum' => '$discounts' },
             'tax' => { '$sum' => '$tax' },
+            'refund' => { '$sum' => '$refund' },
             'revenue' => { '$sum' => '$revenue' }
           }
         }
       end
+
+      def add_average_price
+        {
+          '$addFields' => {
+            'average_price' => {
+              '$cond' => {
+                'if' => { '$lt' => ['$units_sold', 1] },
+                'then' => 0,
+                'else' => {
+                  '$divide' => [
+                    {
+                      '$trunc' => {
+                        '$multiply' => [
+                          { '$divide' => [
+                              { '$sum' => ['$merchandise', '$discounts'] },
+                              '$units_sold'
+                            ]
+                          },
+                          100
+                        ]
+                      }
+                    },
+                    100
+                  ]
+                }
+              }
+            }
+          }
+        }
+      end
     end
   end
 end

data/app/queries/workarea/reports/sales_by_sku.rb

@@ -4,23 +4,24 @@ module Workarea
       include Report
 
       self.reporting_class = Metrics::SkuByDay
-      self.sort_fields = %w(units_sold orders merchandise discounts tax revenue _id)
+      self.sort_fields = %w(units_sold units_canceled orders merchandise discounts tax refund revenue _id average_price)
 
       def skus
         Array.wrap(params[:skus])
       end
 
       def aggregation
-        [filter, project_used_fields, group_by_sku]
+        [filter, project_used_fields, group_by_sku, add_average_price]
       end
 
       def filter
         result = {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             '$or' => [
               { 'orders' => { '$gt' => 0 } },
-              { 'units_sold' => { '$gt' => 0 } }
+              { 'units_sold' => { '$gt' => 0 } },
+              { 'units_canceled' => { '$gt' => 0 } }
             ]
           }
         }
@@ -35,9 +36,11 @@ module Workarea
             'sku' => 1,
             'orders' => 1,
             'units_sold' => 1,
+            'units_canceled' => 1,
             'merchandise' => 1,
             'discounts' => 1,
             'tax' => 1,
+            'refund' => 1,
             'revenue' => 1
           }
         }
@@ -49,13 +52,45 @@ module Workarea
             '_id' => '$sku',
             'orders' => { '$sum' => '$orders' },
             'units_sold' => { '$sum' => '$units_sold' },
+            'units_canceled' => { '$sum' => '$units_canceled' },
             'merchandise' => { '$sum' => '$merchandise' },
             'discounts' => { '$sum' => '$discounts' },
             'tax' => { '$sum' => '$tax' },
+            'refund' => { '$sum' => '$refund' },
             'revenue' => { '$sum' => '$revenue' }
           }
         }
       end
+
+      def add_average_price
+        {
+          '$addFields' => {
+            'average_price' => {
+              '$cond' => {
+                'if' => { '$lt' => ['$units_sold', 1] },
+                'then' => 0,
+                'else' => {
+                  '$divide' => [
+                    {
+                      '$trunc' => {
+                        '$multiply' => [
+                          { '$divide' => [
+                              { '$sum' => ['$merchandise', '$discounts'] },
+                              '$units_sold'
+                            ]
+                          },
+                          100
+                        ]
+                      }
+                    },
+                    100
+                  ]
+                }
+              }
+            }
+          }
+        }
+      end
     end
   end
 end