workarea-core 3.5.11 → 3.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72fffa19332c0b8652c70135ef370a1704350ea0037845df1615c958bd9a8bc8
-  data.tar.gz: 717aaef848a0ad75774fc0ed23b41c80362b8657c021d06630296dbdbe3e4dea
+  metadata.gz: 569f33ae16d992354fca8761ef67ed5473a12755dda710cfff057ebd2d7aa2b4
+  data.tar.gz: 24b32513e4215b2aa1c67a5f1d930ae5f8a81ee098be08234eab95f69a6bc574
 SHA512:
-  metadata.gz: da8b605d36c1b60257fb73d8e65a3bee6e5b99f03d991861b4eef5ab9338fd00e8787eb1e32d6e1df3905bdc95ec349d3ab022a6b0a7e648e0006eb6341f444e
-  data.tar.gz: '09fbd0f844ae5ff48b37f160981b9173982114a0f5584e6846a565be9459697812265e9c4224f82efabfe12265537b3e6bfb0f1c501ad0521bc632d9ca13f82e'
+  metadata.gz: 11b65e3f2de7268ec497fecb2019a10133e2a477cc5bf06cd64390976098baa97277a75a295633a4fd6e43b221d31453c6a4da99b1c05012534e19621a6c7d18
+  data.tar.gz: 614ed5b1d7970082ba8eb48b8448434737d194ed1fed7158537774b9e46dce862ab0cae2faafca35f40378a061e3a91c02b9ab4d36875201896ea33ff6b60991

data/app/models/workarea/checkout.rb

@@ -47,11 +47,7 @@ module Workarea
     def inventory
       @inventory ||= Inventory::Transaction.from_order(
         order.id,
-        order.items.inject({}) do |memo, item|
-          memo[item.sku] ||= 0
-          memo[item.sku] += item.quantity
-          memo
-        end
+        order.sku_quantities
       )
     end
 

data/app/models/workarea/inventory/sku.rb

@@ -142,11 +142,11 @@ module Workarea
       end
 
       def policy_class
-        "Workarea::Inventory::Policies::#{policy.classify}".constantize
+        "Workarea::Inventory::Policies::#{policy.camelize}".constantize
       rescue NameError
         raise(
           InvalidPolicy,
-          "Workarea::Inventory::Policies::#{policy.classify} must be a policy class"
+          "Workarea::Inventory::Policies::#{policy.camelize} must be a policy class"
         )
       end
 

data/app/models/workarea/metrics/user.rb

@@ -110,14 +110,28 @@ module Workarea
       end
 
       def merge!(other)
-        %w(orders revenue discounts cancellations refund).each do |field|
-          self.send("#{field}=", send(field) + other.send(field))
-        end
-
-        self.first_order_at = [first_order_at, other.first_order_at].compact.min
-        self.last_order_at = [last_order_at, other.last_order_at].compact.max
-        self.average_order_value = average_order_value
-        save!
+        # To recalculate average_order_value
+        self.orders += other.orders
+        self.revenue += other.revenue
+
+        update = {
+          '$set' => {
+            average_order_value: average_order_value,
+            updated_at: Time.current.utc
+          },
+          '$inc' => {
+            orders: other.orders,
+            revenue: other.revenue,
+            discounts: other.discounts,
+            cancellations: other.cancellations,
+            refund: other.refund
+          }
+        }
+
+        update['$min'] = { first_order_at: other.first_order_at.utc } if other.first_order_at.present?
+        update['$max'] = { last_order_at: other.last_order_at.utc } if other.last_order_at.present?
+
+        self.class.collection.update_one({ _id: id }, update, upsert: true)
 
         self.class.save_affinity(
           id: id,
@@ -133,6 +147,8 @@ module Workarea
           category_ids: other.purchased.category_ids,
           search_ids: other.purchased.search_ids
         )
+
+        reload
       end
     end
   end

data/app/models/workarea/order.rb

@@ -47,13 +47,13 @@ module Workarea
       {
         placed_at: 1,
         reminded_at: 1,
+        fraud_suspected_at: 1,
         checkout_started_at: 1,
         email: 1,
-        "items[0]._id": 1,
-        fraud_suspected_at: 1
+        "items[0]._id": 1
       },
       {
-        name: 'abandoned_order_email_with_fraud_index',
+        name: 'abandoned_order_email_with_fraud_index_v2',
         background: true
       }
     )
@@ -375,6 +375,16 @@ module Workarea
       )
     end
 
+    # A hash with the quantity of each SKU in the order
+    #
+    # @return [Hash]
+    #
+    def sku_quantities
+      items.each_with_object(Hash.new(0)) do |item, quantities|
+        quantities[item.sku] += item.quantity
+      end
+    end
+
     private
 
     def item_count_limit

data/app/models/workarea/payment.rb

@@ -80,12 +80,7 @@ module Workarea
       build_credit_card unless credit_card
       credit_card.saved_card_id = nil
       credit_card.attributes = attrs.slice(
-        :month,
-        :year,
-        :saved_card_id,
-        :number,
-        :cvv,
-        :amount
+        *Workarea.config.credit_card_attributes
       )
       save
     end

data/app/models/workarea/releasable.rb

@@ -72,7 +72,9 @@ module Workarea
         release.preview.changesets_for(self).each { |cs| cs.apply_to(result) }
         result
       else
-        Release.with_current(release) { self.class.find(id) }
+        Release.with_current(release) do
+          Mongoid::QueryCache.uncached { self.class.find(id) }
+        end
       end
     end
 

data/app/models/workarea/release/changeset.rb

@@ -18,6 +18,7 @@ module Workarea
       index({ 'document_path.type' => 1, 'document_path.document_id' => 1 })
       index('changeset.product_ids' => 1)
       index('original.product_ids' => 1)
+      index('releasable_type' => 1, 'releasable_id' => 1)
 
       # Finds changeset by whether the passed document is in the document
       # path of the changeset. Useful for showing embedded changes in the

data/app/models/workarea/search/admin/pricing_discount.rb

@@ -21,7 +21,7 @@ module Workarea
         end
 
         def keywords
-          super + model.promo_codes
+          super + Array.wrap(model.try(:promo_codes))
         end
 
         def facets

data/app/models/workarea/search/storefront.rb

@@ -82,6 +82,14 @@ module Workarea
         @changesets ||= Array.wrap(model.try(:changesets_with_children))
       end
 
+      def releases
+        changesets
+          .uniq(&:release)
+          .reject { |cs| cs.release.blank? }
+          .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
+          .uniq
+      end
+
       def as_document
         Release.with_current(release_id) do
           {
@@ -91,7 +99,7 @@ module Workarea
             active: active,
             active_segment_ids: active_segment_ids,
             release_id: release_id,
-            changeset_release_ids: changesets.map(&:release_id),
+            changeset_release_ids: releases.map(&:id),
             suggestion_content: suggestion_content,
             created_at: model.created_at,
             updated_at: model.updated_at,

data/app/models/workarea/search/storefront/category_query.rb

@@ -144,7 +144,7 @@ module Workarea
             .where(releasable_type: ProductRule.name)
             .any_in(releasable_id: category.product_rules.map(&:id))
             .includes(:release)
-            .to_a
+            .select(&:release)
         end
       end
     end

data/app/models/workarea/search/storefront/product.rb

@@ -122,12 +122,21 @@ module Workarea
           ProductPrimaryImageUrl.new(model).path
         end
 
-        # Override to include release changesets for pricing, featured products, etc.
+        # 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
-          @product_changesets ||= ProductReleases.new(model).changesets
+          criteria = model.changesets_with_children
+          pricing.each { |ps| criteria.merge!(ps.changesets_with_children) }
+          criteria.merge!(FeaturedProducts.changesets(model.id))
+          criteria.includes(:release)
         end
 
         private

data/app/queries/workarea/product_releases.rb

@@ -1,4 +1,10 @@
 module Workarea
+  #
+  # TODO remove in v3.6
+  #
+  # This is no longer used, this logic was moved into the search models to allow
+  # it to be used for any model (not just products).
+  #
   class ProductReleases
     attr_reader :product
 

data/app/services/workarea/direct_upload.rb

@@ -6,22 +6,26 @@ module Workarea
       uri = URI.parse(request_url)
       url = "#{uri.scheme}://#{uri.host}"
       url += ":#{uri.port}" unless uri.port.in? [80, 443]
+      id = "direct_upload_#{url}"
 
-      redis_key = "cors_#{url.optionize}"
-      return if Workarea.redis.get(redis_key) == 'true'
+      response = begin
+        Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
+      rescue Excon::Error::NotFound
+        Excon::Response.new(body: { 'CORSConfiguration' => [] })
+      end
 
-      response = Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
       cors = response.data[:body]
-      cors['CORSConfiguration'] << {
-        'ID' => "direct_upload_#{url}",
-        'AllowedMethod' => 'PUT',
-        'AllowedOrigin' => url,
-        'AllowedHeader' => '*'
-      }
-      cors['CORSConfiguration'].uniq!
-
-      Workarea.s3.put_bucket_cors(Configuration::S3.bucket, cors)
-      Workarea.redis.set(redis_key, 'true')
+
+      unless cors['CORSConfiguration'].pluck('ID').include?(id)
+        cors['CORSConfiguration'] << {
+          'ID' => id,
+          'AllowedMethod' => 'PUT',
+          'AllowedOrigin' => url,
+          'AllowedHeader' => '*'
+        }
+
+        Workarea.s3.put_bucket_cors(Configuration::S3.bucket, cors)
+      end
     end
 
     attr_reader :type, :filename

data/app/services/workarea/index_release_schedule_previews.rb

@@ -0,0 +1,37 @@
+module Workarea
+  class IndexReleaseSchedulePreviews
+    attr_reader :release, :starts_at, :ends_at
+
+    def initialize(release: nil, starts_at: nil, ends_at: nil)
+      @release = release
+      @starts_at = starts_at
+      @ends_at = ends_at
+    end
+
+    def affected_releases
+      result = Release
+        .scheduled(after: starts_at, before: ends_at)
+        .includes(:changesets)
+        .to_a
+
+      result << release if release.present?
+      result.uniq
+    end
+
+    def affected_models
+      affected_releases.flat_map(&:changesets).flat_map(&:releasable).compact
+    end
+
+    def perform
+      affected_releases.each do |release|
+        affected_models.each do |releasable|
+          Search::Storefront.new(releasable.in_release(release)).destroy
+
+          # Different models have different indexing workers, running callbacks
+          # ensures the appropriate worker is triggered
+          releasable.run_callbacks(:save_release_changes)
+        end
+      end
+    end
+  end
+end

data/app/workers/workarea/index_category_changes.rb

@@ -4,16 +4,29 @@ module Workarea
     include Sidekiq::CallbacksWorker
 
     sidekiq_options(
-      enqueue_on: { Catalog::Category => [:save, :save_release_changes], with: -> { [changes] } },
+      enqueue_on: {
+        Catalog::Category => [:save, :save_release_changes],
+        with: -> { [changes, Release.current.present?] }
+      },
       ignore_if: -> { changes['product_ids'].blank? },
       lock: :until_executing,
       query_cache: true
     )
 
-    def perform(changes)
+    def perform(changes, for_release = false)
       return unless changes['product_ids'].present?
 
-      ids = require_index_ids(*changes['product_ids'])
+      ids = if for_release
+        # This is a shortcut because if you're resorting products within a release,
+        # the `changes` hash doesn't reflect the repositioning within the release,
+        # only the difference between what's live and what's in the release.
+        #
+        # Reindexing all of them is a shortcut to having to manually build a diff
+        # between the changesets in the possible affected releases.
+        changes['product_ids'].flatten.uniq
+      else
+        require_index_ids(*changes['product_ids'])
+      end
 
       if ids.size > max_count
         ids.each { |id| IndexProduct.perform_async(id) }

data/app/workers/workarea/index_release_schedule_change.rb

@@ -0,0 +1,32 @@
+module Workarea
+  class IndexReleaseScheduleChange
+    include Sidekiq::Worker
+    include Sidekiq::CallbacksWorker
+
+    sidekiq_options(
+      enqueue_on: {
+        Release => [:save, :destroy],
+        only_if: -> { publish_at_changed? || destroyed? },
+        with: -> { [id, publish_at_was, publish_at] }
+      },
+      queue: 'releases'
+    )
+
+    def perform(id, previous_publish_at, new_publish_at)
+      # When destroyed, changesets for the release ID will still exist and be used to update the index
+      rescheduled_release = Release.find_or_initialize_by(id: id)
+
+      earlier, later = if rescheduled_release.persisted? && previous_publish_at.present? && new_publish_at.present?
+        [previous_publish_at, new_publish_at].sort
+      elsif previous_publish_at.present?
+        [previous_publish_at, nil]
+      else
+        [new_publish_at, nil]
+      end
+
+      IndexReleaseSchedulePreviews
+        .new(release: rescheduled_release, starts_at: earlier, ends_at: later)
+        .perform
+    end
+  end
+end

data/app/workers/workarea/process_import.rb

@@ -17,11 +17,11 @@ module Workarea
       import.process!
 
     ensure
-      if import.error?
+      if import&.error?
         Admin::DataFileMailer.import_error(id).deliver_now
-      elsif import.failure?
+      elsif import&.failure?
         Admin::DataFileMailer.import_failure(id).deliver_now
-      else
+      elsif import.present?
         Admin::DataFileMailer.import(id).deliver_now
       end
     end

data/app/workers/workarea/publish_release.rb

@@ -8,6 +8,7 @@ module Workarea
       system_user = User.find_system_user!(release.name, 'Release')
 
       Mongoid::AuditLog.record(system_user) { release.publish! }
+      IndexReleaseSchedulePreviews.new(release: release).perform
 
     rescue Mongoid::Errors::DocumentNotFound
       # Doesn't matter, release has been removed

data/lib/tasks/search.rake

@@ -16,7 +16,9 @@ namespace :workarea do
     task admin: :environment do
       setup
       puts 'Indexing admin...'
-      Workarea::Search::Admin.reset_indexes!
+      Workarea::QueuesPauser.with_paused_queues do
+        Workarea::Search::Admin.reset_indexes!
+      end
 
       Mongoid.models.each do |klass|
         next unless Workarea::Search::Admin.for(klass.first).present?
@@ -36,8 +38,10 @@ namespace :workarea do
       setup
       puts 'Indexing storefront...'
 
-      Workarea::Search::Storefront.reset_indexes!
-      Workarea::Search::Storefront.ensure_dynamic_mappings
+      Workarea::QueuesPauser.with_paused_queues do
+        Workarea::Search::Storefront.reset_indexes!
+        Workarea::Search::Storefront.ensure_dynamic_mappings
+      end
 
       # This code finds all unique filters for products so we can index a sample
       # product for each to ensure the dynamic mappings get created.
@@ -83,7 +87,9 @@ namespace :workarea do
       setup
       puts 'Indexing help...'
 
-      Workarea::Search::Help.reset_indexes!
+      Workarea::QueuesPauser.with_paused_queues do
+        Workarea::Search::Help.reset_indexes!
+      end
 
       Workarea::Help::Article.all.each_by(Workarea.config.bulk_index_batch_size) do |help_article|
         Workarea::Search::Help.new(help_article).save

data/lib/workarea/configuration.rb

@@ -1297,6 +1297,17 @@ module Workarea
 
       # The number of results that will show per-type in the admin jump to
       config.jump_to_results_per_type = 5
+
+      # Attributes that will be sliced out of params and persisted on
+      # the credit card tender during checkout.
+      config.credit_card_attributes = %i[
+        month
+        year
+        saved_card_id
+        number
+        cvv
+        amount
+      ]
     end
   end
 end

data/lib/workarea/configuration/administrable_options.rb

@@ -1,7 +1,7 @@
 module Workarea
   module Configuration
     class AdministrableOptions < ActiveSupport::InheritableOptions
-      def method_missing(name, *args)
+      def [](name)
         static_config = super
         return static_config if static_config.present? || static_config.to_s == 'false'
         return static_config unless check_fieldsets?(name)
@@ -9,10 +9,6 @@ module Workarea
         Configuration::Admin.instance.send(name)
       end
 
-      def respond_to_missing?(name, include_private)
-        true
-      end
-
       private
 
       def check_fieldsets?(name)

data/lib/workarea/core.rb

@@ -146,6 +146,7 @@ require 'workarea/ext/mongoid/find_ordered'
 require 'workarea/ext/mongoid/embedded_children'
 require 'workarea/ext/sprockets/ruby_processor'
 require 'workarea/ext/jbuilder/jbuilder_append_partials'
+require 'workarea/ext/jbuilder/jbuilder_cache'
 
 if Rails.env.development?
   require 'workarea/ext/freedom_patches/routes_reloader'
@@ -221,6 +222,7 @@ require 'workarea/mail_interceptor'
 require 'workarea/visit'
 require 'workarea/warnings'
 require 'workarea/latest_version'
+require 'workarea/queues_pauser'
 
 #
 # Engines

data/lib/workarea/ext/jbuilder/jbuilder_cache.rb

@@ -0,0 +1,29 @@
+decorate JbuilderTemplate, with: :workarea do
+  def _cache_fragment_for(*)
+    return yield if workarea_admin?
+
+    super
+  end
+
+  def _cache_key(*)
+    super.tap do |result|
+      result << workarea_cache_varies if workarea_cache_varies.present?
+    end
+  end
+
+  private
+
+  def workarea_admin?
+    @context&.controller&.current_user&.admin?
+  rescue ::RuntimeError
+    false
+  end
+
+  def workarea_cache_varies
+    workarea_request_env['workarea.cache_varies']
+  end
+
+  def workarea_request_env
+    @context.controller.request.env || {}
+  end
+end

data/lib/workarea/queues_pauser.rb

@@ -0,0 +1,26 @@
+module Workarea
+  module QueuesPauser
+    extend self
+
+    def pause_queues!
+      pauser = Sidekiq::Throttled::QueuesPauser.instance
+      queues.each { |queue| pauser.pause!(queue) }
+    end
+
+    def resume_queues!
+      pauser = Sidekiq::Throttled::QueuesPauser.instance
+      queues.each { |queue| pauser.resume!(queue) }
+    end
+
+    def with_paused_queues(&block)
+      pause_queues!
+      yield
+    ensure
+      resume_queues!
+    end
+
+    def queues
+      Configuration::Sidekiq.queues
+    end
+  end
+end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 5
-    PATCH = 11
+    PATCH = 16
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 

data/lib/workarea/visit.rb

@@ -38,7 +38,10 @@ module Workarea
     end
 
     def current_email
-      cookies.signed[:email]
+      # For performance, prefer to use the cookie. The fallback to looking it up
+      # by user is a failsafe against a blank email cookie (e.g. from a raised
+      # error or poor application coding).
+      cookies.signed[:email].presence || (email_from_user_id if logged_in?)
     end
 
     def metrics
@@ -91,5 +94,9 @@ module Workarea
     def blank_metrics
       @blank_metrics ||= Metrics::User.new
     end
+
+    def email_from_user_id
+      User.find(session[:user_id]).email rescue nil
+    end
   end
 end

data/test/models/workarea/releasable_test.rb

@@ -375,6 +375,19 @@ module Workarea
       in_release = model.in_release(nil)
       assert_equal('Foo', in_release.name)
       refute_equal(in_release.object_id, model.object_id)
+
+      Mongoid::QueryCache.cache do
+        cached = Foo.find(model.id) # a find to ensure it's in the cache table
+        cached.name = 'Bar' # so the cache table's instance has a change
+
+        in_release = model.in_release(nil)
+        assert_equal('Foo', in_release.name)
+        refute_equal(in_release.object_id, model.object_id)
+        refute_equal(cached.object_id, model.object_id)
+      end
+
+    ensure
+      Mongoid::QueryCache.clear_cache
     end
 
     def test_skip_changeset

data/test/models/workarea/search/storefront/category_query_test.rb

@@ -75,6 +75,17 @@ module Workarea
             assert_equal([@category.id.to_s], CategoryQuery.find_by_product(@product))
           end
         end
+
+        def test_deleted_releases
+          release = create_release
+          release.as_current do
+            @category.product_rules.first.update!(value: 'bar')
+          end
+
+          release.destroy
+          CategoryQuery.new(@category).update
+          assert_equal([@category.id.to_s], CategoryQuery.find_by_product(@product))
+        end
       end
     end
   end

data/test/models/workarea/search/storefront/product_releases_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+module Workarea
+  module Search
+    class Storefront
+      class ProductReleasesTest < TestCase
+        def test_product_changes
+          product = create_product(name: 'Foo')
+          release_one = create_release
+          release_one.as_current { product.update!(name: 'Bar') }
+
+          assert_equal([release_one], Product.new(product).releases)
+
+          release_one.update!(publish_at: 1.day.from_now)
+          release_two = create_release(publish_at: 3.days.from_now)
+          assert_equal([release_one, release_two], Product.new(product).releases)
+        end
+
+        def test_featured_product_changes
+          product = create_product
+          category = create_category
+
+          release_one = create_release
+          release_one.as_current { category.update!(product_ids: [product.id]) }
+          assert_equal([release_one], Product.new(product).releases)
+
+          release_one.update!(publish_at: 1.day.from_now)
+          release_two = create_release(publish_at: 3.days.from_now)
+          assert_equal([release_one, release_two], Product.new(product).releases)
+        end
+
+        def test_variant_changes
+          product = create_product(variants: [{ sku: 'SKU' }])
+          release = create_release
+          release.as_current { product.variants.first.update!(details: { color: 'Red' }) }
+          assert_equal([release], Product.new(product).releases)
+        end
+
+        def test_pricing_changes
+          product = create_product(variants: [{ sku: 'SKU' }])
+          pricing = Pricing::Sku.find('SKU')
+
+          release = create_release
+          release.as_current { pricing.prices.first.update!(regular: 10_000) }
+          assert_equal([release], Product.new(product).releases)
+        end
+
+        def test_changesets_with_missing_releases
+          product = create_product(name: 'Foo')
+          release = create_release
+          release.as_current { product.update!(name: 'Bar') }
+          release.delete
+
+          assert_nil(product.reload.changesets.first.release)
+          assert_equal([], Product.new(product).releases)
+        end
+      end
+    end
+  end
+end

data/test/models/workarea/search/storefront_test.rb

@@ -25,6 +25,19 @@ module Workarea
         release.as_current { category.product_rules.first.update!(value: 'bar') }
         assert_equal(2, Storefront.new(category).changesets.size)
       end
+
+      def test_releases
+        category = create_category(name: 'Foo')
+        assert_empty(Storefront.new(category).as_document[:changeset_release_ids])
+
+        a = create_release(publish_at: 1.week.from_now)
+        a.as_current { category.update!(name: 'Bar') }
+        assert_equal([a.id], Storefront.new(category).as_document[:changeset_release_ids])
+
+        b = create_release(publish_at: 2.weeks.from_now)
+        assert_includes(Storefront.new(category).as_document[:changeset_release_ids], a.id)
+        assert_includes(Storefront.new(category).as_document[:changeset_release_ids], b.id)
+      end
     end
   end
 end

data/test/queries/workarea/search/category_browse_test.rb

@@ -382,6 +382,29 @@ module Workarea
           refute_includes(result_ids, product_five.id)
         end
       end
+
+      def test_featured_product_changes_in_a_release
+        one = create_product
+        two = create_product
+        three = create_product(name: 'Foo', active: false)
+        category = create_category(product_ids: [one.id, two.id], product_rules: [])
+        release = create_release(publish_at: 1.week.from_now)
+
+        release.as_current do
+          three.update!(name: 'Bar', active: true, default_category_id: category.id)
+          category.update!(product_ids: [three.id, one.id, two.id])
+          search = CategoryBrowse.new(sort: %w(featured), category_ids: [category.id])
+          sorts = search.results.pluck(:raw).pluck('_source').pluck('sorts').pluck(category.id.to_s)
+          assert_equal([0, 1, 2], sorts)
+        end
+
+        release.as_current do
+          category.update!(product_ids: [one.id, two.id, three.id])
+          search = CategoryBrowse.new(sort: %w(featured), category_ids: [category.id])
+          sorts = search.results.pluck(:raw).pluck('_source').pluck('sorts').pluck(category.id.to_s)
+          assert_equal([0, 1, 2], sorts)
+        end
+      end
     end
   end
 end

data/test/services/workarea/direct_upload_test.rb

@@ -108,11 +108,28 @@ module Workarea
       ).returns(true)
 
       assert(DirectUpload.ensure_cors!('http://test.host/admin/content_assets'))
-      assert_equal('true', Workarea.redis.get('cors_http_test_host'))
       assert(DirectUpload.ensure_cors!('http://localhost:3000/admin/content_assets'))
-      assert_equal('true', Workarea.redis.get('cors_http_localhost_3000'))
       assert(DirectUpload.ensure_cors!('https://example.com/admin/direct_uploads'))
-      assert_equal('true', Workarea.redis.get('cors_https_example_com'))
+    end
+
+    def test_ensure_cors_with_no_existing_configuration
+      Workarea.s3.expects(:get_bucket_cors)
+                 .raises(Excon::Errors::NotFound.new('CORS configuration does not exist'))
+
+
+      Workarea.s3.expects(:put_bucket_cors).with(
+        Configuration::S3.bucket,
+        'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_http://test.host",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'http://test.host',
+            'AllowedHeader' => '*'
+          }
+        ]
+      ).returns(true)
+
+      assert(DirectUpload.ensure_cors!('http://test.host/admin/content_assets'))
     end
 
     private

data/test/services/workarea/index_release_schedule_previews_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+module Workarea
+  class IndexReleaseSchedulePreviewsTest < TestCase
+    def test_affected_releases
+      release = create_release
+      results = IndexReleaseSchedulePreviews.new(release: release).affected_releases
+      assert_equal([release], results)
+
+      a = create_release(publish_at: 1.week.from_now)
+      b = create_release(publish_at: 2.weeks.from_now)
+      c = create_release(publish_at: 4.weeks.from_now)
+      assert_equal([a, b, c], IndexReleaseSchedulePreviews.new.affected_releases)
+
+      results = IndexReleaseSchedulePreviews
+        .new(starts_at: 3.days.from_now, ends_at: 17.days.from_now)
+        .affected_releases
+
+      assert_equal([a, b], results)
+
+      results = IndexReleaseSchedulePreviews
+        .new(release: release, starts_at: 3.days.from_now, ends_at: 10.days.from_now)
+        .affected_releases
+
+      assert_equal([a, release], results)
+    end
+  end
+end

data/test/workers/workarea/index_release_schedule_change_test.rb

@@ -0,0 +1,107 @@
+require 'test_helper'
+
+module Workarea
+  class IndexReleaseScheduleChangeTest < TestCase
+    include TestCase::SearchIndexing
+
+    setup :set_product
+
+    def set_product
+      @product = create_product(name: 'Foo')
+    end
+
+    def test_reschedule
+      a = create_release(name: 'A', publish_at: 1.week.from_now)
+      b = create_release(name: 'B', publish_at: 2.weeks.from_now)
+      c = create_release(name: 'C', publish_at: 4.weeks.from_now)
+
+      b.as_current { @product.update!(name: 'Bar') }
+      IndexProduct.perform(@product)
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      # Changing publish_at via `update` causes the release to publish due to Sidekiq inline
+      previous_publish_at = b.publish_at
+      b.set(publish_at: 5.weeks.from_now)
+
+      Sidekiq::Callbacks.enable(IndexProduct) do
+        IndexReleaseScheduleChange.new.perform(b.id, previous_publish_at, b.publish_at)
+      end
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
+
+    def test_removing_from_schedule
+      a = create_release(name: 'A', publish_at: 1.week.from_now)
+      b = create_release(name: 'B', publish_at: 2.weeks.from_now)
+      c = create_release(name: 'C', publish_at: 4.weeks.from_now)
+
+      b.as_current { @product.update!(name: 'Bar') }
+      IndexProduct.perform(@product)
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      # Changing publish_at via `update` causes the release to publish due to Sidekiq inline
+      previous_publish_at = b.publish_at
+      b.set(publish_at: nil)
+
+      Sidekiq::Callbacks.enable(IndexProduct) do
+        IndexReleaseScheduleChange.new.perform(b.id, previous_publish_at, nil)
+      end
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
+
+    def test_adding_to_schedule
+      a = create_release(name: 'A', publish_at: 1.week.from_now)
+      b = create_release(name: 'B')
+      c = create_release(name: 'C', publish_at: 4.weeks.from_now)
+
+      b.as_current { @product.update!(name: 'Bar') }
+      IndexProduct.perform(@product)
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      # Changing publish_at via `update` causes the release to publish due to Sidekiq inline
+      b.set(publish_at: 2.weeks.from_now)
+
+      Sidekiq::Callbacks.enable(IndexProduct) do
+        IndexReleaseScheduleChange.new.perform(b.id, nil, b.publish_at)
+      end
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
+
+    def test_destroyed
+      a = create_release(name: 'A', publish_at: 1.week.from_now)
+      b = create_release(name: 'B', publish_at: 2.weeks.from_now)
+      c = create_release(name: 'C', publish_at: 4.weeks.from_now)
+
+      b.as_current { @product.update!(name: 'Bar') }
+      IndexProduct.perform(@product)
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([@product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      Sidekiq::Callbacks.enable(IndexReleaseScheduleChange, IndexProduct) do
+        b.destroy
+      end
+
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
+  end
+end

data/test/workers/workarea/process_import_test.rb

@@ -53,5 +53,11 @@ module Workarea
         t('workarea.admin.data_file_mailer.import_failure.errors')
       )
     end
+
+    def test_perform_with_missing_import
+      assert_raises Mongoid::Errors::DocumentNotFound do
+        ProcessImport.new.perform('foo')
+      end
+    end
   end
 end

data/test/workers/workarea/publish_release_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 
 module Workarea
   class PublishReleaseTest < TestCase
+    include TestCase::SearchIndexing
+
     def test_publishes_the_release
       release = create_release
       PublishRelease.new.perform(release.id)
@@ -16,5 +18,27 @@ module Workarea
       assert_equal(1, Mongoid::AuditLog::Entry.count)
       assert(Mongoid::AuditLog::Entry.first.modifier.system?)
     end
+
+    def test_reindexes_release_schedule
+      product = create_product(name: 'Foo')
+
+      a = create_release(publish_at: 1.week.from_now)
+      b = create_release(publish_at: 2.weeks.from_now)
+      c = create_release(publish_at: 4.weeks.from_now)
+
+      b.as_current { product.update!(name: 'Bar') }
+      IndexProduct.perform(product)
+
+      assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model))
+      a.as_current { assert_empty(Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      b.as_current { assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+
+      Sidekiq::Callbacks.enable(IndexProduct) { PublishRelease.new.perform(b.id) }
+
+      assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model))
+      a.as_current { assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+      c.as_current { assert_equal([product], Search::ProductSearch.new(q: 'bar').results.pluck(:model)) }
+    end
   end
 end

data/workarea-core.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mongoid-sample', '~> 0.1.0'
   s.add_dependency 'mongoid-encrypted', '~> 1.0.0'
   s.add_dependency 'elasticsearch', '~> 5.0.1'
-  s.add_dependency 'kaminari', '~> 0.17.0'
+  s.add_dependency 'kaminari', '~> 1.2.1'
   s.add_dependency 'kaminari-mongoid', '~> 0.1.2'
   s.add_dependency 'activemerchant', '~> 1.52'
   s.add_dependency 'dragonfly', '~> 1.1.2'
@@ -33,7 +33,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'sidekiq-cron', '~> 0.6.3'
   s.add_dependency 'sidekiq-unique-jobs', '~> 6.0.6'
   s.add_dependency 'sidekiq-throttled', '~> 0.8.2'
-  s.add_dependency 'geocoder', '~> 1.4.4'
+  s.add_dependency 'geocoder', '~> 1.6.3'
+  s.add_dependency 'redis-rails', '~> 5.0.0'
   s.add_dependency 'redis-rack-cache', '~> 2.2.0'
   s.add_dependency 'easymon', '~> 1.4.0'
   s.add_dependency 'image_optim', '~> 0.26.0'
@@ -65,7 +66,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'chart-horizontalbar-rails', '~> 1.0.4' # TODO remove v4
   s.add_dependency 'select2-rails', '~> 4.0.3'
   s.add_dependency 'wysihtml-rails', '~> 0.6.0.beta2'
-  s.add_dependency 'rack-attack', '~> 5.0.1'
+  s.add_dependency 'rack-attack', '~> 6.3.1'
   s.add_dependency 'jquery-livetype-rails', '~> 0.1.0' # TODO remove v4
   s.add_dependency 'redcarpet', '~> 3.4.0'
   s.add_dependency 'jquery-unique-clone-rails', '~> 1.0.0'
@@ -93,7 +94,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'chartkick', '~> 3.3.0'
   s.add_dependency 'browser', '~> 2.6.1'
   s.add_dependency 'puma', '>= 4.3.1'
-  s.add_dependency 'rack', '>= 2.0.8'
+  s.add_dependency 'rack' , '>= 2.1.4'
 
   # HACK for vendoring active_shipping
   s.add_dependency 'active_utils', '~> 3.3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.11
+  version: 3.5.16
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: redis-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: redis-rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -730,14 +744,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: jquery-livetype-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1128,14 +1142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1720,6 +1734,7 @@ files:
 - app/services/workarea/direct_upload/product_image.rb
 - app/services/workarea/export_report.rb
 - app/services/workarea/hash_update.rb
+- app/services/workarea/index_release_schedule_previews.rb
 - app/services/workarea/inventory_adjustment.rb
 - app/services/workarea/login.rb
 - app/services/workarea/new_discount.rb
@@ -1757,6 +1772,7 @@ files:
 - app/workers/workarea/index_product.rb
 - app/workers/workarea/index_product_children.rb
 - app/workers/workarea/index_product_rule.rb
+- app/workers/workarea/index_release_schedule_change.rb
 - app/workers/workarea/index_search_customizations.rb
 - app/workers/workarea/index_skus.rb
 - app/workers/workarea/keep_product_index_fresh.rb
@@ -1930,6 +1946,7 @@ files:
 - lib/workarea/ext/freedom_patches/string.rb
 - lib/workarea/ext/freedom_patches/uri.rb
 - lib/workarea/ext/jbuilder/jbuilder_append_partials.rb
+- lib/workarea/ext/jbuilder/jbuilder_cache.rb
 - lib/workarea/ext/mongoid/audit_log_entry.decorator
 - lib/workarea/ext/mongoid/each_by.rb
 - lib/workarea/ext/mongoid/embedded_children.rb
@@ -1964,6 +1981,7 @@ files:
 - lib/workarea/ping_home_base.rb
 - lib/workarea/plugin.rb
 - lib/workarea/plugin/asset_appends_helper.rb
+- lib/workarea/queues_pauser.rb
 - lib/workarea/routes_constraints/redirect.rb
 - lib/workarea/routes_constraints/super_admin.rb
 - lib/workarea/scheduled_jobs.rb
@@ -2314,6 +2332,7 @@ files:
 - test/models/workarea/search/storefront/product/inventory_test.rb
 - test/models/workarea/search/storefront/product/pricing_test.rb
 - test/models/workarea/search/storefront/product/text_test.rb
+- test/models/workarea/search/storefront/product_releases_test.rb
 - test/models/workarea/search/storefront/product_test.rb
 - test/models/workarea/search/storefront_test.rb
 - test/models/workarea/segment/life_cycle_test.rb
@@ -2365,7 +2384,6 @@ files:
 - test/queries/workarea/pricing_override_params_test.rb
 - test/queries/workarea/product_primary_image_url_test.rb
 - test/queries/workarea/product_primary_navigation_test.rb
-- test/queries/workarea/product_releases_test.rb
 - test/queries/workarea/recommendation/order_based_test.rb
 - test/queries/workarea/recommendation/product_based_test.rb
 - test/queries/workarea/recommendation/searches_test.rb
@@ -2426,6 +2444,7 @@ files:
 - test/services/workarea/direct_upload_test.rb
 - test/services/workarea/export_report_test.rb
 - test/services/workarea/hash_update_test.rb
+- test/services/workarea/index_release_schedule_previews_test.rb
 - test/services/workarea/inventory_adjustment_test.rb
 - test/services/workarea/login_test.rb
 - test/services/workarea/order_merge_test.rb
@@ -2458,6 +2477,7 @@ files:
 - test/workers/workarea/index_payment_transactions_test.rb
 - test/workers/workarea/index_product_rule_test.rb
 - test/workers/workarea/index_product_test.rb
+- test/workers/workarea/index_release_schedule_change_test.rb
 - test/workers/workarea/index_skus_test.rb
 - test/workers/workarea/keep_product_index_fresh_test.rb
 - test/workers/workarea/mark_discounts_as_redeemed_test.rb

data/test/queries/workarea/product_releases_test.rb

@@ -1,56 +0,0 @@
-require 'test_helper'
-
-module Workarea
-  class ProductReleasesTest < TestCase
-    def test_product_changes
-      product = create_product(name: 'Foo')
-      release_one = create_release
-      release_one.as_current { product.update!(name: 'Bar') }
-
-      assert_equal([release_one], ProductReleases.new(product).releases)
-
-      release_one.update!(publish_at: 1.day.from_now)
-      release_two = create_release(publish_at: 3.days.from_now)
-      assert_equal([release_one, release_two], ProductReleases.new(product).releases)
-    end
-
-    def test_featured_product_changes
-      product = create_product
-      category = create_category
-
-      release_one = create_release
-      release_one.as_current { category.update!(product_ids: [product.id]) }
-      assert_equal([release_one], ProductReleases.new(product).releases)
-
-      release_one.update!(publish_at: 1.day.from_now)
-      release_two = create_release(publish_at: 3.days.from_now)
-      assert_equal([release_one, release_two], ProductReleases.new(product).releases)
-    end
-
-    def test_variant_changes
-      product = create_product(variants: [{ sku: 'SKU' }])
-      release = create_release
-      release.as_current { product.variants.first.update!(details: { color: 'Red' }) }
-      assert_equal([release], ProductReleases.new(product).releases)
-    end
-
-    def test_pricing_changes
-      product = create_product(variants: [{ sku: 'SKU' }])
-      pricing = Pricing::Sku.find('SKU')
-
-      release = create_release
-      release.as_current { pricing.prices.first.update!(regular: 10_000) }
-      assert_equal([release], ProductReleases.new(product).releases)
-    end
-
-    def test_changesets_with_missing_releases
-      product = create_product(name: 'Foo')
-      release = create_release
-      release.as_current { product.update!(name: 'Bar') }
-      release.delete
-
-      assert_nil(product.reload.changesets.first.release)
-      assert_equal([], ProductReleases.new(product).releases)
-    end
-  end
-end