workarea-core 3.4.44 → 3.5.0.beta.1

data/app/seeds/workarea/products_seeds.rb

@@ -46,6 +46,8 @@ module Workarea
                   { regular: sku_price, sale: sale_price < 0 ? 1.to_m : sale_price }
                 ]
               )
+
+              Fulfillment::Sku.create!(id: sku)
             end
 
             sizes = product.variants.map { |v| v.details['Size'] }

data/app/seeds/workarea/segments_seeds.rb

@@ -0,0 +1,8 @@
+module Workarea
+  class SegmentsSeeds
+    def perform
+      puts 'Adding segments...'
+      Workarea::Segment::LifeCycle.create!
+    end
+  end
+end

data/app/seeds/workarea/tax_seeds.rb

@@ -9,13 +9,13 @@ module Workarea
       )
 
       category.rates.create!(
-        percentage: 0.07,
+        region_percentage: 0.07,
         country: 'US',
         region: 'PA'
       )
 
       category.rates.create!(
-        percentage: 0.08,
+        region_percentage: 0.08,
         country: 'US',
         region: 'NY',
         tier_min: 0,
@@ -23,7 +23,7 @@ module Workarea
       )
 
       category.rates.create!(
-        percentage: 0.09,
+        region_percentage: 0.09,
         country: 'US',
         region: 'NY',
         tier_min: 200.01

data/app/services/workarea/cancel_order.rb

@@ -1,5 +1,3 @@
-# TODO: Factor out remaining calls to this service and then remove
-# Plugins call Order#cancel directly and no longer go through this service
 module Workarea
   class CancelOrder
     attr_reader :order, :params
@@ -45,7 +43,7 @@ module Workarea
       refund if refund?
       update_fulfillment if update_fulfillment?
 
-      order.cancel
+      order.cancel.tap { |canceled| update_metrics if canceled }
     end
 
     private
@@ -64,5 +62,12 @@ module Workarea
     def fulfillment
       @fulfillment ||= Fulfillment.find_or_initialize_by(id: order.id)
     end
+
+    def update_metrics
+      SaveOrderCancellationMetrics.perform_async(
+        order.id,
+        occured_at: order.canceled_at
+      )
+    end
   end
 end

data/app/services/workarea/copy_order.rb

@@ -34,6 +34,12 @@ module Workarea
       cancel_original if cancel_original?
     end
 
+    def anonymize!
+      new_order.update!(user_id: nil, email: nil)
+      new_payment.destroy!
+      new_shippings.each(&:destroy!)
+    end
+
     def save_new_order
       Workarea.config.copy_order_ignored_fields.each do |field|
         new_order.send("#{field}=", nil)

data/app/services/workarea/create_fulfillment.rb

@@ -11,10 +11,12 @@ module Workarea
     def perform
       @order.items.each do |item|
         next if fulfillment.items.detect { |i| i.order_item_id == item.id.to_s }
+        fulfillment.items.build(order_item_id: item.id, quantity: item.quantity)
 
-        fulfillment.items.build(
-          order_item_id: item.id,
-          quantity: item.quantity
+        Fulfillment::Sku.process!(
+          item.sku,
+          order_item: item,
+          fulfillment: fulfillment
         )
       end
 

data/app/services/workarea/direct_upload.rb

@@ -6,26 +6,18 @@ 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}"
 
-      response = begin
-        Workarea.s3.get_bucket_cors(Configuration::S3.bucket)
-      rescue Excon::Error::NotFound
-        Excon::Response.new(body: { 'CORSConfiguration' => [] })
-      end
-
-      cors = response.data[:body]
-
-      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
+      Workarea.s3.put_bucket_cors(
+        Configuration::S3.bucket,
+        'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_#{url}",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => url,
+            'AllowedHeader' => '*'
+          }
+        ]
+      )
     end
 
     attr_reader :type, :filename

data/app/services/workarea/hash_update.rb

@@ -5,30 +5,13 @@ module Workarea
       parsed.map(&:to_s).map(&:strip).reject(&:blank?) if parsed.present?
     end
 
-    def initialize(original: {}, adds: [], updates: [], removes: [])
-      @original = original
+    def initialize(adds: [], updates: [], removes: [])
       @adds = Array(adds).flatten.each_slice(2).to_a
       @updates = Array(updates).flatten.each_slice(2).to_a
       @removes = Array(removes).flatten
     end
 
-    def result
-      apply_to(@original.deep_dup)
-    end
-
-    # TODO v3.6 remove this method, doesn't work when the field is localized
-    # @deprecated
     def apply(hash)
-      warn <<~eos
-        [DEPRECATION] `HashUpdate#apply` is deprecated and will be removed in
-        version 3.6.0. Please use `HashUpdate#result` instead.
-      eos
-      apply_to(hash)
-    end
-
-    private
-
-    def apply_to(hash)
       @adds.each do |tuple|
         key, value = *tuple
         hash[key] = self.class.parse_values(value)

data/app/services/workarea/packaging.rb

@@ -89,7 +89,7 @@ module Workarea
     end
 
     def shippable_items
-      @order.items.reject(&:digital?)
+      @order.items.select(&:requires_shipping?)
     end
 
     def stacked_dimensions

data/app/services/workarea/save_publishing.rb

@@ -12,7 +12,7 @@ module Workarea
       return true if @releasable.blank?
 
       Release.with_current(release.try(:id)) do
-        @releasable.update_attributes!(active: activate?)
+        @releasable.update!(active: activate?, active_segment_ids: active_segment_ids)
       end
     end
 
@@ -30,5 +30,9 @@ module Workarea
     def activate?
       @params[:activate] != 'never'
     end
+
+    def active_segment_ids
+      Array.wrap(@params[:active_segment_ids])
+    end
   end
 end

data/app/workers/sidekiq/callbacks.rb

@@ -7,54 +7,6 @@ module Sidekiq
     class InvalidConfiguration < RuntimeError; end
 
     class << self
-      # The list of workers that perform Sidekiq callbacks. Used for checking
-      # whether one of them need to be fired off after a callback happens.
-      #
-      # @private
-      # @return [Array<Class>]
-      #
-      def workers
-        caching_classes? ? workers_list : workers_list.map(&:constantize)
-      end
-
-      # Add a {Class} to the list of workers to check when running callbacks.
-      #
-      # @private
-      # @param [Class] worker
-      #
-      def add_worker(klass)
-        if caching_classes?
-          workers_list << klass
-        elsif !workers_list.include?(klass.name)
-          workers_list << klass.name
-        end
-      end
-
-      # Whether Rails is caching classes, which matters when checking workers to
-      # run by comparing the worker's configuration with the model running the
-      # callback.
-      #
-      # When we aren't caching classes, we need to use the fully qualified
-      # constant name to decide since the classes could have been reloaded due
-      # to code changes.
-      #
-      # @return [Boolean]
-      #
-      def caching_classes?
-        ::Rails.application.config.cache_classes
-      end
-
-      # Convenience reference to the tracked list of workers in the Rails config
-      #
-      # @private
-      # @return [Array<String,Class>]
-      #
-      def workers_list
-        config = ::Rails.application.config
-        config.sidekiq_callbacks_workers = [] unless config.respond_to?(:sidekiq_callbacks_workers)
-        config.sidekiq_callbacks_workers
-      end
-
       # Permanently or temporarily enable callback workers. If
       # no workers are given, it will enable all callback
       # workers during the execution of the block or globally if no
@@ -196,7 +148,7 @@ module Sidekiq
       # finds a problem.
       #
       def assert_valid_config!
-        Sidekiq::Callbacks.workers.each do |worker|
+        Sidekiq::CallbacksWorker.workers.each do |worker|
           if (worker.enqueue_on.values.flatten & [:find, 'find']).any?
             raise(
               InvalidConfiguration,
@@ -209,7 +161,7 @@ module Sidekiq
       private
 
       def set_workers(workers, action)
-        workers = Sidekiq::Callbacks.workers if workers.blank?
+        workers = Sidekiq::CallbacksWorker.workers if workers.blank?
 
         if !block_given?
           workers.each(&action)
@@ -245,7 +197,7 @@ module Sidekiq
     private
 
     def _enqueue_callback_workers(kind)
-      Sidekiq::Callbacks.workers.select(&:enabled?).each do |worker|
+      Sidekiq::CallbacksWorker.workers.select(&:enabled?).each do |worker|
         worker.callbacks.each do |klass, callbacks|
           if _perform_callback_worker?(klass, callbacks, kind, worker)
             args = worker.find_callback_args(self)
@@ -267,7 +219,7 @@ module Sidekiq
     end
 
     def _is_a_callback_type_match?(model_class)
-      return is_a?(model_class) if Sidekiq::Callbacks.caching_classes?
+      return is_a?(model_class) if ::Rails.application.config.cache_classes
 
       # This is a funny way of doing the same check as `is_a?`.
       #

data/app/workers/sidekiq/callbacks_worker.rb

@@ -4,17 +4,15 @@ module Sidekiq
   module CallbacksWorker
     extend ActiveSupport::Concern
 
+    mattr_accessor :workers
+    self.workers = []
+
     included do
       thread_cattr_accessor :enabled, :inlined
-      Sidekiq::Callbacks.add_worker(self)
+      CallbacksWorker.workers << self
     end
 
     class_methods do
-      # @deprecated TODO remove this in v3.6
-      def workers
-        Sidekiq::Callbacks.workers
-      end
-
       def enabled?
         enabled.nil? || !!enabled
       end

data/app/workers/workarea/bulk_index_admin.rb

@@ -6,14 +6,14 @@ module Workarea
 
     class << self
       def perform(klass, ids)
-        ids.each_slice(100) do |group|
+        ids.each_slice(Workarea.config.bulk_index_batch_size) do |group|
           perform_by_models(klass.constantize.in(id: group).to_a)
         end
       end
 
       def perform_by_models(models)
         return if models.empty?
-        Workarea::Search::Admin.bulk { documents_for(models) }
+        Workarea::Search::Admin.bulk(documents_for(models))
       end
 
       private

data/app/workers/workarea/bulk_index_products.rb

@@ -6,20 +6,21 @@ module Workarea
 
     class << self
       def perform(ids = Catalog::Product.pluck(:id))
-        ids.each_slice(100) do |group|
+        ids.each_slice(Workarea.config.bulk_index_batch_size) do |group|
           perform_by_models(Catalog::Product.in(id: group).to_a)
         end
       end
 
       def perform_by_models(products)
         return if products.blank?
+        products = Array.wrap(products)
 
-        Search::Storefront.bulk do
-          Search::ProductEntries.new(products).map(&:as_bulk_document)
-        end
+        documents = Search::ProductEntries.new(products).map(&:as_bulk_document)
+        Search::Storefront.bulk(documents)
 
-        products.each { |p| p.set(last_indexed_at: Time.current) }
+        Catalog::Product.in(id: products.map(&:id)).set(last_indexed_at: Time.current)
       end
+      alias_method :perform_by_model, :perform_by_models
     end
 
     def perform(ids)

data/app/workers/workarea/bulk_index_searches.rb

@@ -4,7 +4,7 @@ module Workarea
 
     class << self
       def perform(ids = popular_searches.pluck(:id))
-        ids.each_slice(100) do |group|
+        ids.each_slice(Workarea.config.bulk_index_batch_size) do |group|
           perform_by_models(Metrics::SearchByWeek.in(id: group).to_a)
         end
       end
@@ -18,11 +18,11 @@ module Workarea
       end
 
       def perform_by_models(searches)
-        Search::Storefront.bulk do
-          searches.map do |model|
-            Search::Storefront::Search.new(model).as_bulk_document
-          end
+        documents = searches.map do |model|
+          Search::Storefront::Search.new(model).as_bulk_document
         end
+
+        Search::Storefront.bulk(documents)
       end
     end
 

data/app/workers/workarea/deactivate_stale_discounts.rb

@@ -29,9 +29,9 @@ module Workarea
 
     def all_active_discount_ids
       Pricing::Discount
-        .where(:updated_at.lt => Workarea.config.discount_staleness_ttl.ago)
-        .active
-        .pluck(:id)
+        .where(:created_at.lt => Workarea.config.discount_staleness_ttl.ago)
+        .select(&:active?)
+        .map(&:id)
         .map(&:to_s)
     end
   end

data/app/workers/workarea/generate_insights.rb

@@ -25,7 +25,7 @@ module Workarea
         Metrics::ProductByWeek.append_last_week!
         Metrics::SearchForLastWeek.aggregate!
         Metrics::SearchByWeek.append_last_week!
-        Metrics::User.update_aggregations!
+        Metrics::UpdateUserAggregations.update!
         Insights::Base.subclasses.each(&:generate_weekly!)
       end
 

data/app/workers/workarea/index_admin_search.rb

@@ -6,6 +6,7 @@ module Workarea
     sidekiq_options(
       queue: 'low',
       lock: :until_executing,
+      query_cache: true,
       enqueue_on: {
         ApplicationDocument => [:save, :touch, :destroy],
         with: -> { [self.class.name, id] },

data/app/workers/workarea/index_categorization.rb

@@ -4,16 +4,13 @@ module Workarea
     include Sidekiq::CallbacksWorker
 
     sidekiq_options(
-      enqueue_on: { Catalog::Category => :save },
-      lock: :until_executing
+      enqueue_on: { Catalog::Category => [:save, :save_release_changes] },
+      lock: :until_executing,
+      query_cache: true
     )
 
     def self.perform(category)
-      Search::Storefront::Product.delete_category(category.id)
-
-      return unless category.product_rules.present?
-
-      Search::Storefront::Product.add_category(category)
+      Search::Storefront::CategoryQuery.new(category).update
     end
 
     def perform(id)

data/app/workers/workarea/index_category.rb

@@ -5,7 +5,8 @@ module Workarea
 
     sidekiq_options(
       enqueue_on: { Catalog::Category => [:save, :destroy] },
-      lock: :until_executing
+      lock: :until_executing,
+      query_cache: true
     )
 
     def perform(id)