workarea-core 3.5.18 → 3.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84d99f1dbf010e7d67b9dbc7785720bbed5cd17c22528dfe57e194dfbb660892
-  data.tar.gz: c5453a27cf96335ae9d35fe857ccc770a0412117579b37dc1cb84e9221cd6efe
+  metadata.gz: edc99891d1b58bf06d070ed152b77852db6ebb0bd9e3b023faafaf93079c1626
+  data.tar.gz: b7095d6fecc6996d72eb680c6a4a7baa8d10769aad48204c0afe7080cd425c14
 SHA512:
-  metadata.gz: 4605fd9a72741e6cac8ab7a32d2408ba1b8f2bfb79ac875875461ab59fe660ffd5254e3b0eb69d5534222217de0ec2fc3d60351bee5e7575d93d2393fb8d9221
-  data.tar.gz: e2946da1f9618bc92f65ceca4281c426747f4c75d162b33e68a6fe629008507c43e07dcde39e12f871b2f0011225f40bfd5d9ecdc8d7f563586b90900f43c447
+  metadata.gz: 4d6fc54dbd4f849840c8cfeff3c97061539e99e124898df794e2ea7ac8ef36bc532c92209e99acbfb669dcfff70932dd3bf49b8cbdf70cce88eebda9f8ca45a1
+  data.tar.gz: 1bb8092da0dfb2fb9c8f774b90a9be3a352d55e4261550471dffb0dd761d2d75e713544bfd96cd8836b448cbee382bfc7234e5a724bd5dc8ae9cbdb2adfb5702

data/app/controllers/workarea/current_tracking.rb

@@ -1,7 +1,6 @@
 module Workarea
   module CurrentTracking
     extend ActiveSupport::Concern
-    include HttpCaching
 
     included do
       before_action :ensure_current_metrics
@@ -27,7 +26,12 @@ module Workarea
       if email.blank?
         cookies.delete(:email)
       elsif email != cookies.signed[:email]
-        Metrics::User.find_or_initialize_by(id: email).merge!(current_visit&.metrics)
+        unless impersonating?
+          Metrics::User
+            .find_or_initialize_by(id: email)
+            .merge_views!(current_visit&.metrics)
+        end
+
         cookies.permanent.signed[:email] = email
       end
 

data/app/controllers/workarea/impersonation.rb

@@ -15,10 +15,11 @@ module Workarea
       session[:user_id] = user.id.to_s
 
       user.mark_impersonated_by!(current_user)
-      @current_user = user
+      update_tracking!(email: user.email)
     end
 
     def stop_impersonation
+      update_tracking!(email: current_admin.email)
       session[:user_id] = current_admin.id.to_s
       session.delete(:admin_id)
     end

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

@@ -110,6 +110,8 @@ module Workarea
       end
 
       def merge!(other)
+        return if other.blank?
+
         # To recalculate average_order_value
         self.orders += other.orders
         self.revenue += other.revenue
@@ -132,14 +134,8 @@ module Workarea
         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)
+        other.delete
 
-        self.class.save_affinity(
-          id: id,
-          action: 'viewed',
-          product_ids: other.viewed.product_ids,
-          category_ids: other.viewed.category_ids,
-          search_ids: other.viewed.search_ids
-        )
         self.class.save_affinity(
           id: id,
           action: 'purchased',
@@ -148,7 +144,21 @@ module Workarea
           search_ids: other.purchased.search_ids
         )
 
-        reload
+        merge_views!(other)
+      end
+
+      def merge_views!(other)
+        return if other.blank?
+
+        self.class.save_affinity(
+          id: id,
+          action: 'viewed',
+          product_ids: other.viewed.product_ids,
+          category_ids: other.viewed.category_ids,
+          search_ids: other.viewed.search_ids
+        )
+
+        reload rescue self # save_affinity might not have actually persisted anything
       end
     end
   end

data/app/models/workarea/order/item.rb

@@ -33,17 +33,17 @@ module Workarea
     # To allow for custom policies defining their own methods here
     Workarea.config.fulfillment_policies.each do |class_name|
       define_method "#{class_name.demodulize.underscore}?" do
-        fulfillment == class_name.demodulize.underscore
+        fulfilled_by?(class_name.demodulize.underscore)
       end
     end
 
     # These methods exist for findability
     def shipping?
-      fulfillment == 'shipping'
+      fulfilled_by?('shipping')
     end
 
     def download?
-      fulfillment == 'download'
+      fulfilled_by?('download')
     end
 
     # Whether this order has any items that need to be fulfilled by a particular
@@ -53,7 +53,7 @@ module Workarea
     # @return [Boolean]
     #
     def fulfilled_by?(*types)
-      types.any? { |t| send("#{t}?") }
+      types.map(&:to_s).include?(fulfillment)
     end
 
     # Whether this item is a digital (not-shipped) type of item.

data/app/models/workarea/release.rb

@@ -129,6 +129,14 @@ module Workarea
       scoped.sort_by { |r| [r.publish_at, r.created_at] }
     end
 
+    def self.schedule_affected_by_changesets(changesets)
+      changesets
+        .uniq(&:release)
+        .reject { |cs| cs.release.blank? }
+        .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
+        .uniq
+    end
+
     def as_current
       self.class.with_current(self) { yield }
     end

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

@@ -15,7 +15,10 @@ module Workarea
       belongs_to :release, class_name: 'Workarea::Release', index: true
       belongs_to :releasable, polymorphic: true, index: true, optional: true
 
-      index({ 'document_path.type' => 1, 'document_path.document_id' => 1 })
+      index(
+        { 'document_path.type' => 1, 'document_path.document_id' => 1 },
+        { name: 'document_path' }
+      )
       index('changeset.product_ids' => 1)
       index('original.product_ids' => 1)
       index('releasable_type' => 1, 'releasable_id' => 1)

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

@@ -38,7 +38,7 @@ module Workarea
         aggregation = search(query)['aggregations']['grouped_by_type']['type']
         aggregation['buckets']
           .reduce([]) { |m, b| m + b['top']['hits']['hits'] }
-          .sort_by { |r| [r['_source']['jump_to_position'], r['_score']] }
+          .sort_by { |r| [r['_source']['jump_to_position'] || 999, r['_score'] || 0] }
           .map do |result|
             {
               label: result['_source']['jump_to_text'],

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

@@ -11,7 +11,11 @@ module Workarea
         end
 
         def jump_to_text
-          "#{model.id} (#{model.available} available)"
+          I18n.t(
+            'workarea.inventory_sku.jump_to_text',
+            id: model.id,
+            count: model.available_to_sell
+          )
         end
 
         def jump_to_position

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

@@ -83,11 +83,7 @@ module Workarea
       end
 
       def releases
-        changesets
-          .uniq(&:release)
-          .reject { |cs| cs.release.blank? }
-          .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
-          .uniq
+        Release.schedule_affected_by_changesets(changesets)
       end
 
       def as_document

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

@@ -122,21 +122,8 @@ module Workarea
           ProductPrimaryImageUrl.new(model).path
         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 = model.changesets_with_children
-          pricing.each { |ps| criteria.merge!(ps.changesets_with_children) }
-          criteria.merge!(FeaturedProducts.changesets(model.id))
-          criteria.includes(:release)
+          ProductReleases.new(model).changesets
         end
 
         private

data/app/models/workarea/shipping/service.rb

@@ -37,15 +37,22 @@ module Workarea
       end
 
       def self.by_price(price)
-        cache.select do |method|
-          (method.subtotal_min.nil? || method.subtotal_min <= price) &&
-            (method.subtotal_max.nil? || method.subtotal_max >= price)
+        cache.select do |service|
+          (service.subtotal_min.nil? || service.subtotal_min <= price) &&
+            (service.subtotal_max.nil? || service.subtotal_max >= price)
         end
       end
 
       def self.find_tax_code(carrier, name)
-        method = find_by(carrier: carrier, name: name) rescue nil
-        method.try(:tax_code)
+        service = find_by(carrier: carrier, name: name) rescue nil
+        service.present? ? service.tax_code : default_tax_code(carrier, name)
+      end
+
+      def self.default_tax_code(carrier, name)
+        default = Workarea.config.default_shipping_service_tax_code
+        return default unless default.respond_to?(:call)
+
+        default.call(carrier, name)
       end
 
       def find_rate(price = 0.to_m)

data/app/models/workarea/tax/rate.rb

@@ -57,7 +57,9 @@ module Workarea
         percentage_field = super
         return percentage_field unless percentage_field.zero?
 
-        country_percentage + region_percentage + postal_code_percentage
+        [country_percentage, region_percentage, postal_code_percentage]
+          .compact
+          .sum
       end
     end
   end

data/app/queries/workarea/product_releases.rb

@@ -1,10 +1,4 @@
 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
 
@@ -13,11 +7,7 @@ module Workarea
     end
 
     def releases
-      changesets
-        .uniq(&:release)
-        .reject { |cs| cs.release.blank? }
-        .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
-        .uniq
+      Release.schedule_affected_by_changesets(changesets)
     end
 
     # All {Releasable}s that could affect the product's Elasticsearch document

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

@@ -18,17 +18,23 @@ module Workarea
 
       def live_entries
         @live_entries ||= @products.reduce([]) do |memo, product|
-          memo + Array.wrap(index_entries_for(product.without_release))
+          memo + live_entries_for(product)
         end
       end
 
       def release_entries
-        @release_entries ||= @products.reduce([]) do |results, product|
-          releases = ProductReleases.new(product).releases
+        @release_entries ||= @products.reduce([]) do |memo, product|
+          memo + release_entries_for(product)
+        end
+      end
+
+      def live_entries_for(product)
+        Array.wrap(index_entries_for(product.without_release))
+      end
 
-          results + releases.reduce([]) do |memo, release|
-            memo + Array.wrap(index_entries_for(product.in_release(release)))
-          end
+      def release_entries_for(product)
+        ProductReleases.new(product).releases.reduce([]) do |memo, release|
+          memo + Array.wrap(index_entries_for(product.in_release(release)))
         end
       end
 

data/app/workers/workarea/update_email.rb

@@ -0,0 +1,33 @@
+module Workarea
+  class UpdateEmail
+    include Sidekiq::Worker
+    include Sidekiq::CallbacksWorker
+
+    sidekiq_options(
+      enqueue_on: { User => :update, with: -> { [id, changes] } }
+    )
+
+    def perform(id, changes)
+      return unless changes['email'].present? && changes['email'].first.present?
+
+      old_email, new_email = changes['email']
+      update_payment_profile(id, old_email, new_email)
+      update_metrics(old_email, new_email)
+    end
+
+    def update_payment_profile(id, old_email, new_email)
+      user = User.find(id)
+      user.email = old_email # set old email so we lookup by old email value
+
+      Payment::Profile.update_email(PaymentReference.new(user), new_email)
+    end
+
+    def update_metrics(old_email, new_email)
+      old_metrics = Metrics::User.find(old_email) rescue nil
+      return if old_metrics.blank?
+
+      new_metrics = Metrics::User.find_or_initialize_by(id: new_email)
+      new_metrics.merge!(old_metrics)
+    end
+  end
+end

data/config/initializers/00_configuration.rb

@@ -76,6 +76,17 @@ Workarea::Configuration.define_fields do
         zip: '19106'
       },
       description: 'Origin location for calculating shipping costs'
+
+    # This can be overwritten within the app to use a proc for more complex
+    # scenarios.
+    field 'Default Shipping Service Tax Code',
+      type: String,
+      allow_blank: true,
+      description: %(
+        Tax code assigned to shipping options when an existing service does
+        not exist. This is useful for third-party gateways to assign tax codes
+        to dynamically generated options.
+      ).squish
   end
 
   fieldset 'Payment', namespaced: false do
@@ -116,11 +127,6 @@ Workarea::Configuration.define_fields do
   end
 
   fieldset 'Search', namespaced: false do
-    field 'Default Search Facet Result Sizes',
-      type: :integer,
-      default: 10,
-      description: 'The number of filter results returned for each filter type.'
-
     field 'Search Facet Result Sizes',
       type: :hash,
       values_type: :integer,
@@ -128,7 +134,15 @@ Workarea::Configuration.define_fields do
       description: %(
         The number of filter results returned for any specified filter type. If no
         size is defined for a filter type, the default will be what is specified
-        in the default config above.
+        in the default config below.
+      ).squish
+
+    field 'Default Search Facet Result Sizes',
+      type: :integer,
+      default: 10,
+      description: %(
+        The number of filter results returned for each filter type when not
+        specified above.
       ).squish
 
     field 'Search Size Facet Sort',

data/config/initializers/05_scheduled_jobs.rb

@@ -1,4 +1,4 @@
-unless Workarea.config.skip_service_connections
+unless Workarea.skip_services?
   Sidekiq::Cron::Job.create(
     name: 'Workarea::CleanInventoryTransactions',
     klass: 'Workarea::CleanInventoryTransactions',

data/config/initializers/22_session_store.rb

@@ -7,5 +7,5 @@ env_expire_after = ENV['WORKAREA_SESSION_STORE_EXPIRE_AFTER']
 Rails.application.config.session_store(
   :cookie_store,
   key: "_#{Rails.application.class.name.deconstantize.underscore}_session",
-  expire_after: env_expire_after.present? ? env_expire_after.to_i : 2.weeks
+  expire_after: env_expire_after.present? ? env_expire_after.to_i : 30.minutes
 )

data/config/locales/en.yml

@@ -102,6 +102,7 @@ en:
       name: "Fulfillment SKU %{id}"
     inventory_sku:
       name: "Inventory %{id}"
+      jump_to_text: "%{id} (%{count} sellable)"
     inquiry:
       subjects: {}
     order:

data/lib/workarea.rb

@@ -182,6 +182,16 @@ module Workarea
   def self.deprecation
     @deprecation ||= ActiveSupport::Deprecation.new('3.6', 'Workarea')
   end
+
+  # Whether the app should skip connecting to external services on boot,
+  # such as Mongo, Elasticsearch, or Redis. Note that this will break
+  # functionality relying on these services.
+  #
+  # @return [Boolean]
+  #
+  def self.skip_services?
+    !!(ENV['WORKAREA_SKIP_SERVICES'] =~ /true/)
+  end
 end
 
 require 'workarea/core'

data/lib/workarea/changelog.rake

@@ -38,7 +38,7 @@ namespace :workarea do
         author: author
       }
 
-      if subject.start_with?('Revert')
+      if subject.start_with?('Revert "')
         reverts << body.match(/[a-f0-9]{40}/)
         reverts << sha
       end

data/lib/workarea/configuration.rb

@@ -940,7 +940,10 @@ module Workarea
 
       # Whether the app should skip connecting to external services on boot,
       # such as Mongo, Elasticsearch, or Redis.
-      config.skip_service_connections = ENV['WORKAREA_SKIP_SERVICES'].to_s =~ /true/
+      #
+      # @deprecated Use `Workarea.skip_services?` instead
+      #
+      config.skip_service_connections = Workarea.skip_services?
 
       # This is a feature flag, which enables localized active fields. If you're
       # upgrading, you can set this to false to avoid having to do a MongoDB

data/lib/workarea/configuration/administrable_options.rb

@@ -12,7 +12,8 @@ module Workarea
       private
 
       def check_fieldsets?(name)
-        ::Mongoid.clients.any? &&
+        !Workarea.skip_services? &&
+          ::Mongoid.clients.any? &&
           Configuration::Admin.fields.keys.include?(name.to_s)
       end
     end

data/lib/workarea/scheduled_jobs.rb

@@ -5,7 +5,7 @@ module Workarea
     # removing a previously scheduled job from initializers doesn't
     # actually stop the job from being enqueued.
     def self.clean
-      return if Workarea.config.skip_service_connections
+      return if Workarea.skip_services?
 
       Sidekiq::Cron::Job.all.each do |job|
         job.destroy unless const_defined?(job.klass)

data/lib/workarea/version.rb

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

data/lib/workarea/visit.rb

@@ -6,7 +6,6 @@ module Workarea
     attr_writer :override_segments
 
     delegate :postal_code, :city, :subdivision, :region, :country, to: :geolocation
-    delegate :admin?, to: :metrics
 
     def initialize(env)
       @env = env
@@ -25,6 +24,14 @@ module Workarea
       session[:user_id].present?
     end
 
+    def impersonating?
+      session[:admin_id].present?
+    end
+
+    def admin?
+      (logged_in? && impersonating?) || metrics.admin?
+    end
+
     def request
       @request ||= ActionDispatch::Request.new(env)
     end

data/lib/workarea/warnings.rb

@@ -26,7 +26,7 @@ find their preference.
 
     def check_mongo_notable_scan
       if (Rails.env.development? &&
-          !Workarea.config.skip_service_connections &&
+          !Workarea.skip_services? &&
           Configuration::Mongoid.indexes_enforced?)
         warn <<~eos
 **************************************************

data/test/integration/workarea/authentication_test.rb

@@ -3,8 +3,9 @@ require 'test_helper'
 module Workarea
   class AuthenticationTest < IntegrationTest
     class AuthenticationController < Workarea::ApplicationController
-      include Authentication
       include HttpCaching
+      include Authentication
+      include Impersonation
       include Storefront::CurrentCheckout
 
       before_action :cache_page, only: :cached

data/test/lib/workarea/scheduled_jobs_test.rb

@@ -15,12 +15,8 @@ module Workarea
     end
 
     def test_redis_not_available
-      @_skip_services = Workarea.config.skip_service_connections
-      Workarea.config.skip_service_connections = true
-
+      Workarea.stubs(skip_services?: true)
       assert_nil(ScheduledJobs.clean)
-    ensure
-      Workarea.config.skip_service_connections = @_skip_services
     end
   end
 end

data/test/models/workarea/data_file/csv_test.rb

@@ -309,7 +309,8 @@ module Workarea
       end
 
       def test_blank_rows_are_ignored
-        model = Foo.new(id: nil)
+        model = Foo.new
+        Foo.fields.keys.each { |f| model.send("#{f}=", nil) }
 
         import = create_import(
           model_type: Foo.name,

data/test/models/workarea/metrics/user_test.rb

@@ -134,7 +134,7 @@ module Workarea
       def test_merging_metrics
         freeze_time
 
-        metrics = User.create!(
+        first = User.create!(
           first_order_at: 2.weeks.ago,
           last_order_at: 1.day.ago,
           orders: 2,
@@ -147,41 +147,43 @@ module Workarea
           purchased: { product_ids: ['qoo'], category_ids: ['quo'], search_ids: ['qux'] }
         )
 
-        metrics.merge!(User.new)
-        metrics.reload
-        assert_equal(2.weeks.ago, metrics.first_order_at)
-        assert_equal(1.day.ago, metrics.last_order_at)
-        assert_equal(2, metrics.orders)
-        assert_equal(100, metrics.revenue)
-        assert_equal(-10, metrics.discounts)
-        assert_equal(50, metrics.average_order_value)
-        assert_equal(1, metrics.cancellations)
-        assert_equal(-20, metrics.refund)
-        assert_equal(['foo'], metrics.viewed.product_ids)
-        assert_equal(['bar'], metrics.viewed.category_ids)
-        assert_equal(['baz'], metrics.viewed.search_ids)
-        assert_equal(['qoo'], metrics.purchased.product_ids)
-        assert_equal(['quo'], metrics.purchased.category_ids)
-        assert_equal(['qux'], metrics.purchased.search_ids)
-
-        blank = User.create!(id: 'foo').tap { |u| u.merge!(metrics) }
-        blank.reload
-        assert_equal(2.weeks.ago, blank.first_order_at)
-        assert_equal(1.day.ago, blank.last_order_at)
-        assert_equal(2, blank.orders)
-        assert_equal(100, blank.revenue)
-        assert_equal(-10, blank.discounts)
-        assert_equal(50, blank.average_order_value)
-        assert_equal(1, blank.cancellations)
-        assert_equal(-20, blank.refund)
-        assert_equal(['foo'], blank.viewed.product_ids)
-        assert_equal(['bar'], blank.viewed.category_ids)
-        assert_equal(['baz'], blank.viewed.search_ids)
-        assert_equal(['qoo'], blank.purchased.product_ids)
-        assert_equal(['quo'], blank.purchased.category_ids)
-        assert_equal(['qux'], blank.purchased.search_ids)
-
-        existing = User.create!(
+        first.merge!(User.new)
+        first.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(2.weeks.ago, first.first_order_at)
+        assert_equal(1.day.ago, first.last_order_at)
+        assert_equal(2, first.orders)
+        assert_equal(100, first.revenue)
+        assert_equal(-10, first.discounts)
+        assert_equal(50, first.average_order_value)
+        assert_equal(1, first.cancellations)
+        assert_equal(-20, first.refund)
+        assert_equal(['foo'], first.viewed.product_ids)
+        assert_equal(['bar'], first.viewed.category_ids)
+        assert_equal(['baz'], first.viewed.search_ids)
+        assert_equal(['qoo'], first.purchased.product_ids)
+        assert_equal(['quo'], first.purchased.category_ids)
+        assert_equal(['qux'], first.purchased.search_ids)
+
+        second = User.create!(id: 'foo').tap { |u| u.merge!(first) }
+        second.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(2.weeks.ago, second.first_order_at)
+        assert_equal(1.day.ago, second.last_order_at)
+        assert_equal(2, second.orders)
+        assert_equal(100, second.revenue)
+        assert_equal(-10, second.discounts)
+        assert_equal(50, second.average_order_value)
+        assert_equal(1, second.cancellations)
+        assert_equal(-20, second.refund)
+        assert_equal(['foo'], second.viewed.product_ids)
+        assert_equal(['bar'], second.viewed.category_ids)
+        assert_equal(['baz'], second.viewed.search_ids)
+        assert_equal(['qoo'], second.purchased.product_ids)
+        assert_equal(['quo'], second.purchased.category_ids)
+        assert_equal(['qux'], second.purchased.search_ids)
+
+        third = User.create!(
           first_order_at: 3.weeks.ago,
           last_order_at: 3.weeks.ago,
           orders: 2,
@@ -191,22 +193,23 @@ module Workarea
           purchased: { product_ids: ['four'], category_ids: ['five'], search_ids: ['six'] }
         )
 
-        existing.merge!(metrics)
-        existing.reload
-        assert_equal(3.weeks.ago, existing.first_order_at)
-        assert_equal(1.day.ago, existing.last_order_at)
-        assert_equal(4, existing.orders)
-        assert_equal(220, existing.revenue)
-        assert_equal(-10, existing.discounts)
-        assert_equal(55, existing.average_order_value)
-        assert_equal(1, existing.cancellations)
-        assert_equal(-20, existing.refund)
-        assert_equal(%w(one foo), existing.viewed.product_ids)
-        assert_equal(%w(two bar), existing.viewed.category_ids)
-        assert_equal(%w(three baz), existing.viewed.search_ids)
-        assert_equal(%w(four qoo), existing.purchased.product_ids)
-        assert_equal(%w(five quo), existing.purchased.category_ids)
-        assert_equal(%w(six qux), existing.purchased.search_ids)
+        third.merge!(second)
+        third.reload
+        assert_equal(1, Metrics::User.count)
+        assert_equal(3.weeks.ago, third.first_order_at)
+        assert_equal(1.day.ago, third.last_order_at)
+        assert_equal(4, third.orders)
+        assert_equal(220, third.revenue)
+        assert_equal(-10, third.discounts)
+        assert_equal(55, third.average_order_value)
+        assert_equal(1, third.cancellations)
+        assert_equal(-20, third.refund)
+        assert_equal(%w(one foo), third.viewed.product_ids)
+        assert_equal(%w(two bar), third.viewed.category_ids)
+        assert_equal(%w(three baz), third.viewed.search_ids)
+        assert_equal(%w(four qoo), third.purchased.product_ids)
+        assert_equal(%w(five quo), third.purchased.category_ids)
+        assert_equal(%w(six qux), third.purchased.search_ids)
       end
     end
   end

data/test/models/workarea/order/item_test.rb

@@ -55,6 +55,15 @@ module Workarea
         )
         assert(item.on_sale?)
       end
+
+      def test_fulfilled_by?
+        item.fulfillment = 'shipping'
+        assert(item.fulfilled_by?(:shipping))
+        assert(item.fulfilled_by?(:shipping, :download))
+        refute(item.fulfilled_by?(:download))
+        assert(item.shipping?)
+        refute(item.download?)
+      end
     end
   end
 end

data/test/models/workarea/shipping/service_test.rb

@@ -35,6 +35,32 @@ module Workarea
         assert_equal(3.to_m, shipping_service.find_rate(7.to_m).price)
         assert_equal(2.to_m, shipping_service.find_rate(10.to_m).price)
       end
+
+      def test_find_tax_code
+        create_shipping_service(name: 'Ground', carrier: 'UPS', tax_code: '001')
+        create_shipping_service(name: 'Express', carrier: 'UPS', tax_code: nil)
+        Workarea.config.default_shipping_service_tax_code = nil
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_nil(Service.find_tax_code('FedEx', 'Express'))
+
+        Workarea.config.default_shipping_service_tax_code = '101'
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+
+        Workarea.config.default_shipping_service_tax_code = -> (carrier, name) do
+          carrier == 'FedEx' ? '101' : '001'
+        end
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+        assert_equal('001', Service.find_tax_code('DHL', 'Overnight'))
+      end
     end
   end
 end

data/test/workers/workarea/status_reporter_test.rb

@@ -12,8 +12,10 @@ module Workarea
 
       StatusReporter.new.perform
 
-      assert(2, ActionMailer::Base.deliveries.count)
+      assert_equal(2, ActionMailer::Base.deliveries.count)
+
       delivery_emails = ActionMailer::Base.deliveries.map(&:to).flatten
+
       assert(delivery_emails.include?('foo@workarea.com'))
       assert(delivery_emails.include?('bar@workarea.com'))
     end

data/test/workers/workarea/update_email_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+module Workarea
+  class UpdateEmailTest < TestCase
+    def test_updating_payment_profile
+      user = create_user(email: 'user@workarea.com')
+      profile = Payment::Profile.lookup(PaymentReference.new(user))
+
+      UpdateEmail.new.perform(user.id.to_s, 'email' => [nil, 'user@workarea.com'])
+      assert_equal(profile.reload.email, 'user@workarea.com')
+
+      UpdateEmail.new.perform(
+        user.id.to_s,
+        'email' => ['user@workarea.com', 'test@workarea.com']
+      )
+      assert_equal(profile.reload.email, 'test@workarea.com')
+    end
+
+    def test_updating_metrics
+      user = create_user(email: 'user@workarea.com')
+      old_metrics = Metrics::User.find_or_initialize_by(id: 'user@workarea.com')
+      old_metrics.update!(orders: 3)
+
+      UpdateEmail.new.perform(user.id.to_s, 'email' => [nil, 'user@workarea.com'])
+      assert_equal(1, Metrics::User.count)
+      assert_equal(3, old_metrics.reload.orders)
+
+      new_metrics = Metrics::User.create!(id: 'test@workarea.com', orders: 1)
+
+      UpdateEmail.new.perform(
+        user.id.to_s,
+        'email' => ['user@workarea.com', 'test@workarea.com']
+      )
+      assert_equal(1, Metrics::User.count)
+      assert_raises(Mongoid::Errors::DocumentNotFound) { old_metrics.reload }
+      assert_equal(4, new_metrics.reload.orders)
+    end
+  end
+end

data/workarea-core.gemspec

@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n-js', '~> 3.2.1'
   s.add_dependency 'local_time', '~> 1.0.3'
   s.add_dependency 'lodash-rails', '~> 4.17.4'
-  s.add_dependency 'jquery-rails', '~> 4.3.1'
+  s.add_dependency 'jquery-rails', '~> 4.4.0'
   s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
   s.add_dependency 'tooltipster-rails', '~> 4.1.2'
   s.add_dependency 'chart-js-rails', '~> 0.0.9' # TODO remove v4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.18
+  version: 3.5.23
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -646,14 +646,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1795,7 +1795,7 @@ files:
 - app/workers/workarea/status_reporter.rb
 - app/workers/workarea/synchronize_user_metrics.rb
 - app/workers/workarea/update_elasticsearch_settings.rb
-- app/workers/workarea/update_payment_profile_email.rb
+- app/workers/workarea/update_email.rb
 - app/workers/workarea/verify_scheduled_releases.rb
 - bin/rails
 - config/i18n-js.yml
@@ -2499,7 +2499,7 @@ files:
 - test/workers/workarea/send_refund_email_test.rb
 - test/workers/workarea/status_reporter_test.rb
 - test/workers/workarea/synchronize_user_metrics_test.rb
-- test/workers/workarea/update_payment_profile_email_test.rb
+- test/workers/workarea/update_email_test.rb
 - test/workers/workarea/verify_scheduled_releases_test.rb
 - vendor/active_shipping/.gitignore
 - vendor/active_shipping/.travis.yml

data/app/workers/workarea/update_payment_profile_email.rb

@@ -1,22 +0,0 @@
-module Workarea
-  class UpdatePaymentProfileEmail
-    include Sidekiq::Worker
-    include Sidekiq::CallbacksWorker
-
-    sidekiq_options(
-      enqueue_on: { User => :update, with: -> { [id, changes] } }
-    )
-
-    def perform(id, changes)
-      if changes['email'].present? && changes['email'].first.present?
-        old_email = changes['email'].first
-        new_email = changes['email'].last
-
-        user = User.find(id)
-        user.email = old_email # set old email so we lookup by old email value
-
-        Payment::Profile.update_email(PaymentReference.new(user), new_email)
-      end
-    end
-  end
-end

data/test/workers/workarea/update_payment_profile_email_test.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-module Workarea
-  class UpdatePaymentProfileEmailTest < Workarea::TestCase
-    setup do
-      @user = create_user(email: 'user@workarea.com')
-      @profile = Payment::Profile.lookup(PaymentReference.new(@user))
-      @worker = UpdatePaymentProfileEmail.new
-    end
-
-    def test_updating_payment_profile_email_address
-      @worker.perform(
-        @user.id.to_s,
-        'email' => ['user@workarea.com', 'test@workarea.com']
-      )
-
-      @profile.reload
-      assert_equal(@profile.email, 'test@workarea.com')
-    end
-
-    def test_skipping_update_if_email_change_is_nil
-      @worker.perform(@user.id.to_s, 'email' => [nil, 'user@workarea.com'])
-      @profile.reload
-      assert_equal(@profile.email, 'user@workarea.com')
-    end
-  end
-end