workarea-core 3.4.44 → 3.5.0.beta.1

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

@@ -0,0 +1,42 @@
+module Workarea
+  module Reports
+    class SalesByTender
+      include Report
+
+      self.reporting_class = Metrics::TenderByDay
+      self.sort_fields = %w(orders revenue)
+
+      def aggregation
+        [filter_date_range, project_used_fields, group_by_country]
+      end
+
+      def filter_date_range
+        {
+          '$match' => {
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at }
+          }
+        }
+      end
+
+      def project_used_fields
+        {
+          '$project' => {
+            'tender' => 1,
+            'orders' => 1,
+            'revenue' => 1
+          }
+        }
+      end
+
+      def group_by_country
+        {
+          '$group' => {
+            '_id' => '$tender',
+            'orders' => { '$sum' => '$orders' },
+            'revenue' => { '$sum' => '$revenue' }
+          }
+        }
+      end
+    end
+  end
+end

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

@@ -23,7 +23,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_over_time.rb

@@ -5,7 +5,7 @@ module Workarea
       include GroupByTime
 
       self.reporting_class = Metrics::SalesByDay
-      self.sort_fields = %w(_id units_sold orders customers merchandise discounts shipping tax revenue)
+      self.sort_fields = %w(_id units_sold orders cancellations customers merchandise discounts shipping tax refund revenue)
 
       def aggregation
         [filter, project_used_fields, group_by_time, add_aov]
@@ -14,8 +14,11 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
-            'orders' => { '$gt' => 0 }
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            '$or' => [
+              { 'orders' => { '$gt' => 0 } },
+              { 'cancellations' => { '$gt' => 0 } }
+            ]
           }
         }
       end
@@ -25,6 +28,7 @@ module Workarea
           '$project' => {
             'reporting_on' => 1,
             'orders' => 1,
+            'cancellations' => 1,
             'returning_orders' => 1,
             'customers' => 1,
             'units_sold' => 1,
@@ -32,6 +36,7 @@ module Workarea
             'shipping' => 1,
             'discounts' => 1,
             'tax' => 1,
+            'refund' => 1,
             'revenue' => 1
           }
         }
@@ -43,6 +48,7 @@ module Workarea
             '_id' => time_group_id,
             'starts_at' => { '$min' => '$reporting_on' },
             'orders' => { '$sum' => '$orders' },
+            'cancellations' => { '$sum' => '$cancellations' },
             'returning_orders' => { '$sum' => '$returning_orders' },
             'customers' => { '$sum' => '$customers' },
             'units_sold' => { '$sum' => '$units_sold' },
@@ -50,6 +56,7 @@ module Workarea
             'shipping' => { '$sum' => '$shipping' },
             'discounts' => { '$sum' => '$discounts' },
             'tax' => { '$sum' => '$tax' },
+            'refund' => { '$sum' => '$refund' },
             'revenue' => { '$sum' => '$revenue' }
           }
         }

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

@@ -13,7 +13,7 @@ module Workarea
       def filter_date_range
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
             'total_results' => total_results_query
           }
         }

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

@@ -14,7 +14,7 @@ module Workarea
       def filter_date_range
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc }
+            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at }
           }
         }
       end

data/app/queries/workarea/reports/searches_without_results_over_time.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 },
             'total_results' => 0
           }
         }

data/app/queries/workarea/search/admin_fulfillment_skus.rb

@@ -0,0 +1,20 @@
+module Workarea
+  module Search
+    class AdminFulfillmentSkus
+      include Query
+      include AdminIndexSearch
+      include AdminSorting
+      include Pagination
+
+      document Search::Admin
+
+      def initialize(params = {})
+        super(params.merge(type: 'fulfillment_sku'))
+      end
+
+      def facets
+        super + [TermsFacet.new(self, 'policy')]
+      end
+    end
+  end
+end

data/app/queries/workarea/search/admin_releases.rb

@@ -9,10 +9,7 @@ module Workarea
       document Search::Admin
 
       def self.available_sorts
-        Sort::Collection.new(
-          Sort.published_date,
-          Sort.undo_date
-        )
+        Sort::Collection.new(Sort.published_date)
       end
 
       def initialize(params = {})

data/app/queries/workarea/search/admin_search.rb

@@ -11,10 +11,6 @@ module Workarea
       def self.available_sorts
         AdminSorting.available_sorts
       end
-
-      def default_admin_sort
-        [{ _score: :desc }, { updated_at: :desc }]
-      end
     end
   end
 end

data/app/queries/workarea/search/admin_segments.rb

@@ -0,0 +1,16 @@
+module Workarea
+  module Search
+    class AdminSegments
+      include Query
+      include AdminIndexSearch
+      include AdminSorting
+      include Pagination
+
+      document Search::Admin
+
+      def initialize(params = {})
+        super(params.merge(type: 'segment'))
+      end
+    end
+  end
+end

data/app/queries/workarea/search/admin_sorting.rb

@@ -16,7 +16,7 @@ module Workarea
       end
 
       def default_admin_sort
-        [{ updated_at: :desc }, { _score: :desc }]
+        [{ _score: :desc },  { updated_at: :desc }]
       end
 
       def user_selected_sort

data/app/queries/workarea/search/pagination.rb

@@ -7,10 +7,7 @@ module Workarea
       end
 
       def per_page
-        return Workarea.config.per_page if params[:per_page].blank?
-
-        tmp = params[:per_page].to_i
-        tmp > 0 ? tmp : Workarea.config.per_page
+        params[:per_page].presence || Workarea.config.per_page
       end
 
       def size

data/app/queries/workarea/search/product_display_rules.rb

@@ -1,6 +1,8 @@
 module Workarea
   module Search
     module ProductDisplayRules
+      extend ActiveSupport::Concern
+
       def product_display_query_clauses(allow_displayable_when_out_of_stock: true)
         [
           { term: { type: 'product' } },
@@ -8,7 +10,8 @@ module Workarea
           inventory_display_clause(
             allow_displayable_when_out_of_stock: allow_displayable_when_out_of_stock
           ),
-          active_for_release_clause
+          active_for_segments_clause,
+          preview_current_release_clause
         ]
       end
 
@@ -36,23 +39,52 @@ module Workarea
         result
       end
 
-      def active_for_release_clause
+      def active_for_segments_clause
+        {
+          bool: {
+            must: [
+              { term: { 'active.now' => true } },
+              {
+                bool: {
+                  should: [
+                    { bool: { must_not: { exists: { field: 'active_segment_ids' } } } },
+                    { terms: { 'active_segment_ids' => Segment.current.map(&:id) } }
+                  ]
+                }
+              }
+            ]
+          }
+        }
+      end
+
+      def preview_current_release_clause
         if Release.current.blank?
-          { term: { 'active.now' => true } }
+          {
+            bool: {
+              minimum_should_match: 1,
+              should: [
+                { term: { release_id: 'live' } },
+                { bool: { must_not: { exists: { field: 'release_id' } } } } # for upgrade compatiblity
+              ]
+            }
+          }
         else
           {
             bool: {
+              minimum_should_match: 1,
               should: [
-                { term: { "active.#{Release.current.id}" => true } },
+                { term: { release_id: Release.current.id } },
                 {
                   bool: {
+                    must_not: [{ term: { changeset_release_ids: Release.current.id } }],
                     must: [
-                      { term: { 'active.now' => true } },
                       {
                         bool: {
-                          must_not: {
-                            exists: { field: "active.#{Release.current.id}" }
-                          }
+                          minimum_should_match: 1,
+                          should: [
+                            { term: { release_id: 'live' } },
+                            { bool: { must_not: { exists: { field: 'release_id' } } } } # for upgrade compatiblity
+                          ]
                         }
                       }
                     ]

data/app/queries/workarea/search/product_entries.rb

@@ -13,7 +13,21 @@ module Workarea
       end
 
       def entries
-        @entries ||= @products.flat_map { |p| index_entries_for(p) }
+        @entries ||= live_entries + release_entries
+      end
+
+      def live_entries
+        @live_entries ||= @products.flat_map do |product|
+          index_entries_for(product.without_release)
+        end
+      end
+
+      def release_entries
+        @release_entries ||= @products.flat_map do |product|
+          ProductReleases.new(product).releases.map do |release|
+            index_entries_for(product.in_release(release))
+          end
+        end
       end
 
       def index_entries_for(product)

data/app/queries/workarea/search/product_search.rb

@@ -55,7 +55,10 @@ module Workarea
       end
 
       def customization
-        @customization ||= Customization.active.find_by_query(params[:q])
+        return @customization if defined?(@customization)
+
+        result = Customization.find_by_query(params[:q])
+        @customization = result.active? ? result : nil
       end
 
       def boosts

data/app/queries/workarea/search/storefront_search.rb

@@ -4,14 +4,15 @@ module Workarea
       attr_reader :params
 
       def initialize(params)
-        @params = params.with_indifferent_access.except(:per_page)
+        @params = params
         @used_middleware = []
       end
 
       def customization
-        @customization ||= Customization.active.find_by_query(
-          params[:q].try(:strip).to_s
-        )
+        @customization ||= begin
+          match = Customization.find_by_query(params[:q].try(:strip).to_s)
+          match.active? ? match : Customization.new
+        end
       end
 
       def response

data/app/queries/workarea/search/storefront_search/exact_matches.rb

@@ -2,7 +2,7 @@ module Workarea
   module Search
     class StorefrontSearch
       class ExactMatches
-        include Middleware
+        include StorefrontSearch::Middleware
 
         def call(response)
           exact_match = find_exact_match(response)

data/app/queries/workarea/search/storefront_search/response.rb

@@ -34,10 +34,7 @@ module Workarea
         #
         def reset!(params, by: nil)
           @params = params
-          @query = Search::ProductSearch.new(
-            params.merge(rules: customization&.product_rules)
-          )
-
+          @query = Search::ProductSearch.new(params.merge(rules: product_rules))
           @trace << Trace.new(@params, @query, by)
         end
 
@@ -61,6 +58,11 @@ module Workarea
           @query.query_suggestions
         end
 
+        def product_rules
+          return [] if customization.blank?
+          customization.product_rules.usable
+        end
+
         private
 
         def terms_facets

data/app/seeds/workarea/assets_seeds.rb

@@ -14,7 +14,8 @@ module Workarea
 
           Content::Asset.create!(
             name: filename.titleize,
-            file: File.new(path)
+            file: File.new(path),
+            alt_text: filename.titleize
           )
         end
       end

data/app/seeds/workarea/insights_seeds.rb

@@ -58,31 +58,8 @@ module Workarea
     end
 
     def process
-      add_previous_week_insights
-      add_previous_month_insights
-
       ProcessProductRecommendations.new.perform
       GenerateInsights.generate_all!
     end
-
-    def add_previous_week_insights
-      (1...12).each do |weeks|
-        travel_to weeks.weeks.ago
-
-        GenerateInsights.generate_weekly_insights
-
-        travel_back
-      end
-    end
-
-    def add_previous_month_insights
-      (1...3).each do |months|
-        travel_to months.months.ago
-
-        GenerateInsights.generate_monthly_insights
-
-        travel_back
-      end
-    end
   end
 end

data/app/seeds/workarea/orders_seeds.rb

@@ -36,18 +36,19 @@ module Workarea
         user.addresses.create!(
           first_name: user.first_name,
           last_name: user.last_name,
-          street: Faker::Address.street_address,
-          city: Faker::Address.city,
-          postal_code: Faker::Address.zip_code,
-          region: Faker::Address.state_abbr,
+          street: '22 S. 3rd St.',
+          city: 'Philadelphia',
+          postal_code: '19106',
+          region: 'PA',
           country: 'US',
-          phone_number: Faker::PhoneNumber.cell_phone,
-          phone_extension: Faker::PhoneNumber.extension
+          phone_number: '2159251800'
         )
       end
 
       payment_profile = Payment::Profile.lookup(PaymentReference.new(user))
 
+      payment_profile.update(store_credit: [0, 10].sample.to_m)
+
       saved_card = payment_profile.credit_cards.first
 
       saved_card ||= payment_profile.credit_cards.create!(