workarea-core 3.5.7 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26dc982f98d5ae00a8d3299b322cd6eb897329888c169a7a035e0bafad3be1e8
-  data.tar.gz: f3b5ae6b3bddb68b0e3d5b5c303e565e69ff812e165371e35285cd3ce04d334e
+  metadata.gz: 1c2fa2d437187cdfa6f9630002c94d5822cc51f5befb62060e6fd219203d4285
+  data.tar.gz: 2a9bb9faea3d1d1ed34cbf48938fcee9d1d2673ebcd3acf1cc976fda0370acd5
 SHA512:
-  metadata.gz: 31ad3ba0206fb6c815e6af2d4af9b572dbefec26460adfa14191279f9bd8098c462eb21b61139a0003ba775ae0b6e65294745b312ba776cd44cb55931221d40f
-  data.tar.gz: 8ffe28be251fddeba16e2f4964ca716ea8f759d171154529414e3b826accc1a709acb15f0374916d4ff2260f64c21acdd1a44b71687bb93fadec4bc626e81e11
+  metadata.gz: 71f63a2c7b0d0824a173279e01c17ddcc10ea4ef7fb2a232874cd54198a867b5fb6cc3735673d7fe41223f1815e28fdc3794d820d25a74eea03d7f381b4e47eb
+  data.tar.gz: fc5503c7cb0ee41b481c04cf3682b002e019e095c4a6a1e27c9279a40c78012c3712312e82e5c8c2878c5be680aca7137acb9d706af71bf6cf95c54c4112ec52

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

@@ -18,7 +18,17 @@ module Workarea
               aggs: {
                 type: {
                   terms: { field: 'facets.type', size: Workarea.config.jump_to_type_limit },
-                  aggs: { top: { top_hits: { size: Workarea.config.jump_to_results_per_type } } }
+                  aggs: {
+                    top: {
+                      top_hits: {
+                        size: Workarea.config.jump_to_results_per_type,
+                        sort: [
+                          { _score: { order: 'desc' } },
+                          { updated_at: { order: 'desc' } }
+                        ]
+                      }
+                    }
+                  }
                 }
               }
             }

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

@@ -78,6 +78,10 @@ module Workarea
         nil
       end
 
+      def changesets
+        @changesets ||= Array.wrap(model.try(:changesets_with_children))
+      end
+
       def as_document
         Release.with_current(release_id) do
           {
@@ -87,7 +91,7 @@ module Workarea
             active: active,
             active_segment_ids: active_segment_ids,
             release_id: release_id,
-            changeset_release_ids: Array.wrap(model.try(:changesets)).map(&:release_id),
+            changeset_release_ids: changesets.map(&:release_id),
             suggestion_content: suggestion_content,
             created_at: model.created_at,
             updated_at: model.updated_at,

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

@@ -122,6 +122,14 @@ module Workarea
           ProductPrimaryImageUrl.new(model).path
         end
 
+        # Override to include release changesets for pricing, featured products, etc.
+        #
+        # @return [Mongoid::Criteria]
+        #
+        def changesets
+          @product_changesets ||= ProductReleases.new(model).changesets
+        end
+
         private
 
         def clean_for_keywords(value)

data/config/initializers/15_endpoint_monitoring.rb

@@ -3,7 +3,8 @@
 #
 Easymon::Repository.add(
   'mongodb',
-  Workarea::Monitoring::MongoidCheck.new
+  Workarea::Monitoring::MongoidCheck.new,
+  :critical
 )
 
 #
@@ -11,7 +12,8 @@ Easymon::Repository.add(
 #
 Easymon::Repository.add(
   'elasticsearch',
-  Workarea::Monitoring::ElasticsearchCheck.new
+  Workarea::Monitoring::ElasticsearchCheck.new,
+  :critical
 )
 
 #
@@ -21,7 +23,8 @@ Easymon::Repository.add(
   "redis",
   Easymon::RedisCheck.new(
     Workarea::Configuration::Redis.persistent.to_h
-  )
+  ),
+  :critical
 )
 
 #

data/lib/workarea/core/engine.rb

@@ -72,6 +72,13 @@ module Workarea
         Workarea::Warnings.check
         Configuration::Session.validate!
       end
+
+      config.to_prepare do
+        # For some reason, app/workers/workarea/bulk_index_products.rb doesn't
+        # get autoloaded. Without this, admin actions like updating product
+        # attributes raises a {NameError} "uninitialized constant BulkIndexProducts".
+        require_dependency 'workarea/bulk_index_products'
+      end
     end
   end
 end

data/lib/workarea/version.rb

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

data/test/integration/workarea/monitoring_integration_test.rb

@@ -3,27 +3,32 @@ require 'test_helper'
 module Workarea
   class MonitoringIntegrationTest < Workarea::IntegrationTest
     def test_monitors_the_mongodb_status
-      get workarea.easymon_path('mongodb')
+      get workarea.easymon_path + '/mongodb'
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_redis_status
-      get workarea.easymon_path('redis')
+      get workarea.easymon_path + '/redis'
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_elasticsearch_status
-      get workarea.easymon_path('elasticsearch')
+      get workarea.easymon_path + '/elasticsearch'
       assert_includes(response.body, 'Up')
     end
 
     def test_monitors_the_sidekiq_queue_status
-      get workarea.easymon_path('sidekiq-queue')
+      get workarea.easymon_path + '/sidekiq-queue'
       assert_includes(response.body, 'Low')
     end
 
     def test_monitors_for_load_balancing
-      get workarea.easymon_path('load-balancing')
+      get workarea.easymon_path + '/load-balancing'
+      assert_includes(response.body, 'Up')
+    end
+
+    def test_critical_endpoint
+      get workarea.easymon_path + "/critical"
       assert_includes(response.body, 'Up')
     end
   end

data/test/models/workarea/search/storefront_test.rb

@@ -10,6 +10,21 @@ module Workarea
         model.update!(active: true)
         assert(Storefront.new(model).active[:now])
       end
+
+      def test_changesets
+        category = create_category(
+          name: 'Foo',
+          product_rules: [{ name: 'search', operator: 'equals', value: 'foo' }]
+        )
+        assert_empty(Storefront.new(category).changesets)
+
+        release = create_release
+        release.as_current { category.update!(name: 'Bar') }
+        assert_equal(1, Storefront.new(category).changesets.size)
+
+        release.as_current { category.product_rules.first.update!(value: 'bar') }
+        assert_equal(2, Storefront.new(category).changesets.size)
+      end
     end
   end
 end

data/test/queries/workarea/search/product_search_test.rb

@@ -410,6 +410,21 @@ module Workarea
         assert(result[:raw].present?)
         assert_kind_of(Float, result[:raw]['_score'])
       end
+
+      def test_previewing_releases
+        product = create_product(id: 'foo', variants: [{ sku: '1234', regular: 5 }])
+        pricing = Pricing::Sku.find('1234')
+        assert_equal([product], ProductSearch.new(q: '*').results.pluck(:model))
+
+        release = create_release
+        release.as_current { pricing.prices.first.update!(regular: 10) }
+        IndexProduct.perform(product.reload)
+
+        assert_equal([product], ProductSearch.new(q: '*').results.pluck(:model))
+        release.as_current do
+          assert_equal([product], ProductSearch.new(q: '*').results.pluck(:model))
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.8
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -2718,7 +2718,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform