workarea-core 3.5.13 → 3.5.18

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

@@ -132,6 +132,46 @@ module Workarea
         refute(import.error?)
         assert(import.successful?)
       end
+
+      def test_csv_embedded_changes_for_release
+        release = create_release
+        product = create_product(
+          name: 'Foo',
+          variants: [{ sku: '1', name: 'Bar' }, { sku: '2', name: 'Baz' }]
+        )
+        product.name = 'Foo Changed'
+        product.variants.first.name = 'Bar Changed'
+
+        import = create_import(
+          model_type: product.class.name,
+          file: create_tempfile(Csv.new.serialize(product), extension: 'csv'),
+          file_type: 'csv',
+          release_id: release.id
+        )
+
+        assert_equal('csv', import.file_type)
+        assert_nothing_raised { import.process! }
+
+        product.reload
+        assert_equal('Foo', product.name)
+        assert_equal('Bar', product.variants.first.name)
+        assert_equal('Baz', product.variants.second.name)
+
+        Release.with_current(release) do
+          product.reload
+          assert_equal('Foo Changed', product.name)
+          assert_equal('Bar Changed', product.variants.first.name)
+          assert_equal('Baz', product.variants.second.name)
+        end
+
+        import.reload
+        assert_equal(2, import.total)
+        assert_equal(2, import.succeeded)
+        assert_equal(0, import.failed)
+        assert(import.complete?)
+        refute(import.error?)
+        assert(import.successful?)
+      end
     end
   end
 end

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/queries/workarea/search/admin_search_test.rb

@@ -81,6 +81,16 @@ module Workarea
         assert_equal(results.reverse, search.results)
       end
 
+      def test_default_sort_by_score
+        # Unlike other admin searches (primarily indexes), we want searching to
+        # default sort by score. Testing scores directly is unreliable so just
+        # do a simple check here.
+        assert_equal(
+          [{ _score: :desc }, { updated_at: :desc }],
+          AdminSearch.new.default_admin_sort
+        )
+      end
+
       def test_selected_sorting
         results = [
           create_product(name: 'A', variants: []),

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/{reindex_release_test.rb → index_release_schedule_change_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Workarea
-  class ReindexReleaseTest < TestCase
+  class IndexReleaseScheduleChangeTest < TestCase
     include TestCase::SearchIndexing
 
     setup :set_product
@@ -26,7 +26,9 @@ module Workarea
       previous_publish_at = b.publish_at
       b.set(publish_at: 5.weeks.from_now)
 
-      Sidekiq::Callbacks.enable(IndexProduct) { ReindexRelease.new.perform(b.id, previous_publish_at, b.publish_at) }
+      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)) }
@@ -49,7 +51,9 @@ module Workarea
       previous_publish_at = b.publish_at
       b.set(publish_at: nil)
 
-      Sidekiq::Callbacks.enable(IndexProduct) { ReindexRelease.new.perform(b.id, previous_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)) }
@@ -71,11 +75,33 @@ module Workarea
       # 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) { ReindexRelease.new.perform(b.id, nil, b.publish_at) }
+      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/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

@@ -91,10 +91,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'loofah', '~> 2.3.1'
   s.add_dependency 'referer-parser', '~> 0.3.0'
   s.add_dependency 'serviceworker-rails', '~> 0.5.5'
-  s.add_dependency 'chartkick', '~> 3.3.0'
+  s.add_dependency 'chartkick', '~> 3.4.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.13
+  version: 3.5.18
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1100,14 +1100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -1142,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
@@ -1734,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
@@ -1771,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
@@ -1785,7 +1787,6 @@ files:
 - app/workers/workarea/publish_bulk_action.rb
 - app/workers/workarea/publish_release.rb
 - app/workers/workarea/redirect_navigable_slugs.rb
-- app/workers/workarea/reindex_release.rb
 - app/workers/workarea/save_metrics.rb
 - app/workers/workarea/save_order_cancellation_metrics.rb
 - app/workers/workarea/save_order_metrics.rb
@@ -1945,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
@@ -1988,6 +1990,12 @@ files:
 - lib/workarea/string_id.rb
 - lib/workarea/svg_asset_finder.rb
 - lib/workarea/swappable_list.rb
+- lib/workarea/tasks/cache.rb
+- lib/workarea/tasks/help.rb
+- lib/workarea/tasks/insights.rb
+- lib/workarea/tasks/migrate.rb
+- lib/workarea/tasks/search.rb
+- lib/workarea/tasks/services.rb
 - lib/workarea/url_token.rb
 - lib/workarea/validators/email_validator.rb
 - lib/workarea/validators/ip_address_validator.rb
@@ -2442,6 +2450,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
@@ -2474,6 +2483,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
@@ -2484,7 +2494,6 @@ files:
 - test/workers/workarea/publish_bulk_action_test.rb
 - test/workers/workarea/publish_release_test.rb
 - test/workers/workarea/redirect_navigable_slugs_test.rb
-- test/workers/workarea/reindex_release_test.rb
 - test/workers/workarea/save_order_metrics_test.rb
 - test/workers/workarea/save_user_order_details_test.rb
 - test/workers/workarea/send_refund_email_test.rb

data/app/workers/workarea/reindex_release.rb

@@ -1,42 +0,0 @@
-module Workarea
-  class ReindexRelease
-    include Sidekiq::Worker
-    include Sidekiq::CallbacksWorker
-
-    sidekiq_options(
-      enqueue_on: {
-        Release => :save,
-        only_if: -> { publish_at_changed? },
-        with: -> { [id, publish_at_was, publish_at] }
-      },
-      queue: 'high'
-    )
-
-    def perform(id, previous_publish_at, new_publish_at)
-      rescheduled_release = Release.find(id)
-      earlier, later = if 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
-
-      affected_releases = Release.scheduled(after: earlier, before: later).includes(:changesets).to_a
-      affected_releases += [rescheduled_release]
-      affected_releases.uniq!
-
-      affected_models = affected_releases.flat_map(&:changesets).flat_map(&:releasable)
-
-      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