workarea-core 3.5.13 → 3.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15a5824ab2746ddff9941773fefcaec1829d2a721a65893b3dac3a2fc7aad8a
-  data.tar.gz: 90b49ae058315ad91c7427c0b94c39a86016ed1898bb44d4bad99c9377053d53
+  metadata.gz: 32f457800d2f9e59fb315b3bdedde57f90d04ea6befdd4cf04dc5b4c78838eaf
+  data.tar.gz: 564f64759f19ea4d0db9b1ea4b7a2c12cdebf629ea2f52b5916519a3c958d611
 SHA512:
-  metadata.gz: 7ee0b818334a756cbeceacf3be95347e8fa0d46090c0fd3729073c67a04e4c2e17530adc50e772e3bc4f759fdc5d62d7d775e5e2cb0281a5541e063d82fe7526
-  data.tar.gz: bd4eb10892770ef2b332a25203f54e703940cec8d45fce3f13a3316636b4ec3c78c0ce4088e504845e7f017ebf75eaa8a0036251f37ed9207d90f3fe6a86be5e
+  metadata.gz: 6ae82b803bfe0daffc1e54953aa54f0c3a045cbe83fbb7b2e0c3d68961746950f442f7d87bee7c6b31c4fb697f685b0db3aa5277b0e6b430e6adabfbab4d9837
+  data.tar.gz: '094e9624ee3213c17dc554e263dc79538c5c09d2db4868d0f1aaa827db8559e60e46728c171364db364d2ff323f6100e0b2edaeea5746a4f59a73cbc51b16832'

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

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

data/app/services/workarea/index_release_schedule_previews.rb

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

data/app/workers/workarea/index_release_schedule_change.rb

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

data/app/workers/workarea/publish_release.rb

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

data/lib/workarea/version.rb

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

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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.13
+  version: 3.5.14
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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
@@ -2442,6 +2443,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 +2476,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 +2487,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