workarea-core 3.5.20 → 3.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6261fa607f871ebfb3c05fb63ba16c8fdd08cd08d3dd0e34971ad18b1868f21
-  data.tar.gz: de5b0e46393f51fd7b1259ed6acd2aac028a4f7d8f311e19f26ec0bf331bffb3
+  metadata.gz: 9cf9f289653a43299ab536ddc3ec1604053f3c2369e8895ed41660cc948f4a0d
+  data.tar.gz: a233ee0d02143bda5eb371d384fc5e69c34920cb9c666e489f00229a49c0554c
 SHA512:
-  metadata.gz: 9c8b791f8733b306e0411a309550e32055716ffd6abb952b9ce9e171bd7b3ade86a7cc6868a2d18a586c1ab847c18552b4f024dd9b2a4280a7eb2cd446fbd825
-  data.tar.gz: 033113c7e285a55c87f1fbf9b4a108d50767b9fa83041e7a9bb6bb8391164fd5a1986aa59ee1bd7c14ad0f55398d72a094cbbad4ab2c3e93dc37293be28385be
+  metadata.gz: 9fd77445de6a50cceaf70957f1a8b5bb9cc920a18ac26cd7ba88ec36d4d8fb547cd342fcf3145b9969ff40d76047476e9934f9f87dcadb1cb496a115d38f70ca
+  data.tar.gz: b52b85609a5b1524ca88ba659847a8497826b2e3367246a3855f3f60f289d8dc924e7fc5e976219b761526ac3f564a0267fce8da28f478f2e9b313dc3ee6f9df

data/app/controllers/workarea/current_tracking.rb

@@ -27,7 +27,9 @@ module Workarea
         cookies.delete(:email)
       elsif email != cookies.signed[:email]
         unless impersonating?
-          Metrics::User.find_or_initialize_by(id: email).merge!(current_visit&.metrics)
+          Metrics::User
+            .find_or_initialize_by(id: email)
+            .merge_views!(current_visit&.metrics)
         end
 
         cookies.permanent.signed[:email] = email

data/app/models/workarea/configuration/params.rb

@@ -27,7 +27,9 @@ module Workarea
       end
 
       def array(field, value)
-        Array.wrap(CSV.parse(value).first).map(&:strip)
+        Array.wrap(CSV.parse(value).first)
+             .map(&:strip)
+             .map { |v| field.values_type_class.mongoize(v) }
       end
 
       def hash(field, value)

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/release.rb

@@ -13,7 +13,7 @@ module Workarea
     field :undo_job_id, type: String # TODO deprecated, remove in v3.6
 
     has_many :changesets, class_name: 'Workarea::Release::Changeset'
-    has_one :undo, class_name: 'Workarea::Release', inverse_of: :undoes
+    has_many :undos, class_name: 'Workarea::Release', inverse_of: :undoes
     belongs_to :undoes, class_name: 'Workarea::Release', inverse_of: :undo, optional: true
 
     index({ publish_at: 1 })
@@ -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
@@ -172,11 +180,10 @@ module Workarea
     end
 
     def build_undo(attributes = {})
-      result = undo || Release.new(attributes)
+      result = undos.build(attributes)
 
       result.name ||= I18n.t('workarea.release.undo', name: name)
       result.tags = %w(undo) if result.tags.blank?
-      self.undo = result
 
       result
     end

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

@@ -15,10 +15,36 @@ 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)
+      index(updated_at: 1)
+
+      def self.latest(limit = Workarea.config.per_page)
+        order(updated_at: :desc).limit(limit)
+      end
+
+      def self.summary(release_id)
+        collection.aggregate([
+          { '$match' => { 'release_id' => release_id } },
+          {
+            '$addFields' => {
+              'root' => { '$arrayElemAt' => ['$document_path', 0] }
+            }
+          },
+          {
+            '$group' => {
+              '_id' => '$root.type',
+              'count' => { '$sum' => 1 }
+            }
+          },
+          { '$sort' => { '_id' => 1 } }
+        ]).to_a
+      end
 
       # 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.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'],
@@ -51,10 +51,14 @@ module Workarea
       end
 
       def self.for(model)
+        find_for_model(model)
+      rescue NameError
+        find_for_model(model._root) rescue nil
+      end
+
+      def self.find_for_model(model)
         subclass = model.model_name.singular_route_key.camelize
         "Workarea::Search::Admin::#{subclass}".constantize.new(model)
-      rescue NameError
-        nil
       end
 
       # Allows subclass instances to specify whether they should be included in

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

@@ -24,7 +24,9 @@ module Workarea
         end
 
         def model_changesets
-          model.changesets.any_in(release_id: upcoming_release_ids)
+          Workarea::Release::Changeset
+            .by_document_path(model)
+            .any_in(release_id: upcoming_release_ids)
         end
 
         def content_changesets

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

@@ -0,0 +1,25 @@
+module Workarea
+  module Search
+    class Admin
+      class SearchCustomization < Search::Admin
+        include Admin::Releasable
+
+        def type
+          'search_customization'
+        end
+
+        def search_text
+          model.name
+        end
+
+        def jump_to_text
+          "#{model.id} - #{model.name}"
+        end
+
+        def jump_to_position
+          99
+        end
+      end
+    end
+  end
+end

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/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/build_release_undo_changesets.rb

@@ -0,0 +1,23 @@
+module Workarea
+  class BuildReleaseUndoChangesets
+    include Sidekiq::Worker
+
+    def perform(undo_release_id, release_id)
+      release = Release.find(release_id)
+      undo_release = Release.find(undo_release_id)
+
+      existing_changesets = undo_release.changesets.to_a
+      matching_changeset = ->(changeset, existing_changesets) do
+        existing_changesets.any? do |cs|
+          changeset.releasable_type == cs.releasable_type &&
+          changeset.releasable_id == cs.releasable_id
+        end
+      end
+
+      release.changesets.each_by(500) do |changeset|
+        next if matching_changeset.call(changeset, existing_changesets)
+        changeset.build_undo(release: undo_release).save!
+      end
+    end
+  end
+end

data/app/workers/workarea/index_admin_search.rb

@@ -9,7 +9,7 @@ module Workarea
       query_cache: true,
       enqueue_on: {
         ApplicationDocument => [:save, :touch, :destroy],
-        with: -> { [self.class.name, id] },
+        with: -> { IndexAdminSearch.job_arguments(self) },
         ignore_if: -> { !IndexAdminSearch.should_enqueue?(self) }
       }
     )
@@ -19,6 +19,11 @@ module Workarea
       search_model.present? && search_model.should_be_indexed?
     end
 
+    def self.job_arguments(model)
+      search_model = Search::Admin.for(model)
+      [search_model.model.class.name, search_model.model.id]
+    end
+
     def self.perform(model)
       search_model = Search::Admin.for(model)
       return false if search_model.blank?

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

@@ -60,6 +60,7 @@ Workarea::Configuration.define_fields do
     field 'Shipping Dimensions',
       type: :array,
       default: [1, 1, 1],
+      values_type: :integer,
       description: %(
         Default package dimensions to use for calculating shipping costs.
         It's recommended to set these to your average or standard box size when

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/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/field.rb

@@ -32,7 +32,7 @@ module Workarea
         end
 
         def values_type_class
-          return unless type == :hash
+          return unless type.in?(%i(hash array))
 
           values_type = options.values_type || :string
           Workarea.config.configurable_field_types[values_type]&.constantize

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/configuration/localized_active_fields.rb

@@ -14,7 +14,7 @@ module Workarea
         return if Workarea.config.localized_active_fields
 
         ::Mongoid.models.each do |klass|
-          if klass < Releasable
+          if klass < Releasable && klass.localized_fields['active'].present?
             klass.localized_fields.delete('active')
             klass.field(:active, type: Boolean, default: true, localize: false)
             klass.index(active: 1)

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 = 20
+    PATCH = 26
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 

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/lib/workarea/configuration/administrable/field_test.rb

@@ -68,6 +68,14 @@ module Workarea
           )
 
           assert_equal(Integer, field.values_type_class)
+
+          field = Field.new(
+            'Bar',
+            type: :array,
+            values_type: :integer
+          )
+
+          assert_equal(Integer, field.values_type_class)
         end
 
         def test_overridden?

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/configuration/params_test.rb

@@ -11,6 +11,7 @@ module Workarea
           field 'baz', type: :string, allow_blank: true
 
           field 'foo_hash', type: :hash, values_type: :integer
+          field 'foo_array', type: :array, values_type: :integer
           field 'bar_array', type: :array
           field 'baz_duration', type: :duration
         end
@@ -20,6 +21,7 @@ module Workarea
           bar: nil,
           baz: '',
           foo_hash: ['one', '1', 'two', '', '', ''],
+          foo_array: '1,2,3',
           bar_array: 'one, two, three',
           baz_duration: %w(20 minutes)
         }
@@ -29,6 +31,7 @@ module Workarea
         assert_equal('test', result[:bar])
         assert_equal('', result[:baz])
         assert_equal({ 'one' => 1 }, result[:foo_hash])
+        assert_equal([1, 2, 3], result[:foo_array])
         assert_equal(%w(one two three), result[:bar_array])
         assert_equal(20.minutes, result[:baz_duration])
       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/releasable_active_test.rb

@@ -35,6 +35,14 @@ module Workarea
       @release = create_release
     end
 
+    def active?(changeset)
+      if Workarea.config.localized_active_fields
+        changeset['active'][I18n.locale.to_s]
+      else
+        changeset['active']
+      end
+    end
+
     def test_save_can_schedule_activation
       model = Foo.create!(
         name: 'Test',
@@ -48,9 +56,9 @@ module Workarea
       assert_equal(1, model.changesets.length)
       assert_equal(@release.id, model.changesets.first.release_id)
       assert_equal(1, model.changesets.first.changeset.size)
-      assert(model.changesets.first.changeset['active'][I18n.locale.to_s])
+      assert(active?(model.changesets.first.changeset))
       assert_equal(1, model.changesets.first.original.size)
-      refute(model.changesets.first.original['active'][I18n.locale.to_s])
+      refute(active?(model.changesets.first.original))
     end
 
     def test_save_can_schedule_activation_for_an_embedded_document
@@ -74,17 +82,17 @@ module Workarea
       assert_equal(1, embedded_1.changesets.length)
       assert_equal(@release.id, embedded_1.changesets.first.release_id)
       assert_equal(1, embedded_1.changesets.first.changeset.size)
-      assert(embedded_1.changesets.first.changeset['active'][I18n.locale.to_s])
+      assert(active?(embedded_1.changesets.first.changeset))
       assert_equal(1, embedded_1.changesets.first.original.size)
-      refute(embedded_1.changesets.first.original['active'][I18n.locale.to_s])
+      refute(active?(embedded_1.changesets.first.original))
 
       refute(embedded_2.active)
       assert_equal(1, embedded_2.changesets.length)
       assert_equal(@release.id, embedded_2.changesets.first.release_id)
       assert_equal(1, embedded_2.changesets.first.changeset.size)
-      assert(embedded_2.changesets.first.changeset['active'][I18n.locale.to_s])
+      assert(active?(embedded_2.changesets.first.changeset))
       assert_equal(1, embedded_2.changesets.first.original.size)
-      refute(embedded_2.changesets.first.original['active'][I18n.locale.to_s])
+      refute(active?(embedded_2.changesets.first.original))
     end
 
     def test_creating_and_activating_embedded
@@ -104,9 +112,9 @@ module Workarea
       assert_equal(1, embedded.changesets.length)
       assert_equal(@release.id, embedded.changesets.first.release_id)
       assert_equal(1, embedded.changesets.first.changeset.size)
-      assert(embedded.changesets.first.changeset['active'][I18n.locale.to_s])
+      assert(active?(embedded.changesets.first.changeset))
       assert_equal(1, embedded.changesets.first.original.size)
-      refute(embedded.changesets.first.original['active'][I18n.locale.to_s])
+      refute(active?(embedded.changesets.first.original))
       assert(embedded.changesets.first.document_path.present?)
     end
   end

data/test/models/workarea/release/changeset_test.rb

@@ -3,6 +3,23 @@ require 'test_helper'
 module Workarea
   class Release
     class ChangesetTest < TestCase
+      def test_summary
+        release = create_release
+        product_one = create_product(id: 'PROD1')
+        product_two = create_product(id: 'PROD2')
+        page = create_page
+
+        release.as_current do
+          product_one.variants.first.update!(details: { 'Color' => 'Orange' })
+          product_two.update!(name: 'Test Product Changed')
+          page.update!(name: 'Test Page Changed')
+        end
+
+        summary = Changeset.summary(release.id)
+        assert_includes(summary, { '_id' => 'Workarea::Catalog::Product', 'count' => 2 })
+        assert_includes(summary, { '_id' => 'Workarea::Content::Page', 'count' => 1 })
+      end
+
       def test_build_undo
         releasable = create_page(name: 'Foo')
         release = create_release

data/test/models/workarea/search/admin/releasable_test.rb

@@ -28,6 +28,20 @@ module Workarea
           assert_includes(search_model.facets[:upcoming_changes], release_two.id)
           refute_includes(search_model.facets[:upcoming_changes], release_three.id)
         end
+
+        def test_upcoming_changes
+          release_one = create_release
+          release_two = create_release
+
+          product = create_product
+
+          release_one.as_current { product.update!(name: 'Changed Name') }
+          release_two.as_current { product.variants.first.update!(name: 'Changed Name') }
+
+          search_model = Foo.new(product)
+          assert_includes(search_model.facets[:upcoming_changes], release_one.id)
+          assert_includes(search_model.facets[:upcoming_changes], release_two.id)
+        end
       end
     end
   end

data/test/workers/workarea/build_release_undo_changesets_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Workarea
+  class BuildReleaseUndoChangesetsTest < TestCase
+    def test_perform
+      releasable_one = create_page(name: 'Foo')
+      releasable_two = create_page(name: 'Bar')
+      release = create_release
+
+      release.as_current do
+        releasable_one.update!(name: 'Changed Foo')
+        releasable_two.update!(name: 'Changed Bar')
+      end
+
+      undo_release = release.build_undo.tap(&:save!)
+      release.changesets.first.build_undo(release: undo_release).save!
+
+      BuildReleaseUndoChangesets.new.perform(undo_release.id, release.id)
+
+      undo_release.reload
+      assert_equal(2, undo_release.changesets.count)
+      assert_includes(undo_release.changesets.map(&:releasable), releasable_one)
+      assert_includes(undo_release.changesets.map(&:releasable), releasable_two)
+    end
+  end
+end

data/test/workers/workarea/index_admin_search_test.rb

@@ -6,5 +6,26 @@ module Workarea
       refute(IndexAdminSearch.should_enqueue?(create_order))
       assert(IndexAdminSearch.should_enqueue?(create_placed_order))
     end
+
+    def test_enqueuing_embedded_documents
+      content = create_content
+
+      Sidekiq::Testing.fake!
+      IndexAdminSearch.drain
+      Sidekiq::Callbacks.async(IndexAdminSearch)
+      Sidekiq::Callbacks.enable(IndexAdminSearch)
+
+      assert_difference 'IndexAdminSearch.jobs.size', 1 do
+        content.blocks.create!(type: :html)
+      end
+
+      args = IndexAdminSearch.jobs.first['args']
+      assert_equal(Content.name, args.first)
+      assert_equal(content.id.to_s, args.second)
+
+    ensure
+      IndexAdminSearch.drain
+      Sidekiq::Testing.inline!
+    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
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'wysihtml-rails', '~> 0.6.0.beta2'
   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 'redcarpet', '~> 3.5.1', '>= 3.5.1'
   s.add_dependency 'jquery-unique-clone-rails', '~> 1.0.0'
   s.add_dependency 'avalanche-rails', '~> 1.2.0'
   s.add_dependency 'inline_svg', '~> 1.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.20
+  version: 3.5.26
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2021-01-20 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
@@ -772,14 +772,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: jquery-unique-clone-rails
   requirement: !ruby/object:Gem::Requirement
@@ -910,22 +916,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -1532,6 +1538,7 @@ files:
 - app/models/workarea/search/admin/pricing_sku.rb
 - app/models/workarea/search/admin/releasable.rb
 - app/models/workarea/search/admin/release.rb
+- app/models/workarea/search/admin/search_customization.rb
 - app/models/workarea/search/admin/segment.rb
 - app/models/workarea/search/admin/user.rb
 - app/models/workarea/search/customization.rb
@@ -1749,6 +1756,7 @@ files:
 - app/view_models/workarea/shipping_carrier_view_model.rb
 - app/workers/sidekiq/callbacks.rb
 - app/workers/sidekiq/callbacks_worker.rb
+- app/workers/workarea/build_release_undo_changesets.rb
 - app/workers/workarea/bulk_index_admin.rb
 - app/workers/workarea/bulk_index_products.rb
 - app/workers/workarea/bulk_index_searches.rb
@@ -1795,7 +1803,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
@@ -2466,6 +2474,7 @@ files:
 - test/view_models/workarea/shipping_carrier_view_model_test.rb
 - test/workarea_test.rb
 - test/workers/sidekiq/callbacks_test.rb
+- test/workers/workarea/build_release_undo_changesets_test.rb
 - test/workers/workarea/bulk_index_admin_test.rb
 - test/workers/workarea/bulk_index_products_test.rb
 - test/workers/workarea/bulk_index_searches_test.rb
@@ -2499,7 +2508,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
@@ -2747,7 +2756,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform

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