workarea-api-admin 4.5.0 → 4.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1293e8aaa96d2635d1dcbe8db63f474d72641e25b5a55c0962198151ad26d6e8
-  data.tar.gz: 6acda0225199411d454aec44aa70cbb16a8afa4d1d127b5f15c20faaf441b561
+  metadata.gz: 73b13580adeadec266393c807ff389f70684dd538a08744c21d926d1b1a70662
+  data.tar.gz: c06a7dbe0e69cdf10f5cee49e65087b19bfa390861ee7f1fb39c7b15eafebf35
 SHA512:
-  metadata.gz: '03188782d8a034260defff0c3de1d8707a62013277b40f9cb3a1a5727c562cdc87272d06b0a1b46617cfb64f530f99f7f1e4a716a5b1936cff78aa121e35e629'
-  data.tar.gz: f5aebc2374c504adb53576ebf7411d0b915d40b4e863909171df81b5e2b9f85c9a9d6854d0956455543898ce8defa5daa4aae369f41bea750e03a44b95c06282
+  metadata.gz: e7b53927b51128022e2404f58f75f811a1332104374e6cb802775c09f187cd5da79d32fae950c5e93d319def28bf0eebf82b1a4f0a2b1a10e9916e74ed571dbc
+  data.tar.gz: 9a2c721e8b8a25fc602eb5dd46c3c4ab4b1805aee7b344ce53f49c4cc82efb79a1b0ebdb90559ec5f92d72bebe62b103de94a63ee7b65d30f180bc28051c27fe

data/app/controllers/workarea/api/admin/recommendation_settings_controller.rb

@@ -114,7 +114,7 @@ module Workarea
         private
 
         def find_recommendation_settings
-          @recommendation_settings = Recommendation::Settings.find(params[:product_id])
+          @recommendation_settings = Recommendation::Settings.find_or_initialize_by(id: params[:product_id])
         end
       end
     end

data/app/models/workarea/api/admin/date_filtering.rb

@@ -4,9 +4,6 @@ module Workarea
       module DateFiltering
         extend ActiveSupport::Concern
         included do
-          index({ updated_at: 1 })
-          index({ created_at: 1 })
-
           scope :by_updated_at, ->(starts_at:, ends_at:) do
             query = criteria
             query = query.where(:updated_at.gte => starts_at) unless starts_at.nil?

data/lib/workarea/api/admin.rb

@@ -19,3 +19,4 @@ end
 require 'workarea/api/version'
 require 'workarea/api/admin/engine'
 require 'workarea/api/admin/swagger'
+require 'workarea/api/admin/date_indexes'

data/lib/workarea/api/admin/date_indexes.rb

@@ -0,0 +1,23 @@
+
+module Workarea
+  module Api
+    module Admin
+      module DateIndexes
+        extend self
+
+        # We do this separately from the DateFiltering module to ensure
+        # this happens after a model has defined all of its normal indexes. This
+        # prevents the date filtering indexes from applying before explicity
+        # defined indexes for models that could include options like a TTL.
+        def load
+          ::Mongoid.models.each do |model|
+            if model < ApplicationDocument
+              model.index({ updated_at: 1 })
+              model.index({ created_at: 1 })
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/workarea/api/admin/engine.rb

@@ -14,10 +14,12 @@ module Workarea
 
         config.after_initialize do
           Workarea::Api::Admin::Swagger.generate!
+          Workarea::Api::Admin::DateIndexes.load
         end
 
         config.to_prepare do
           ApplicationDocument.include(DateFiltering)
+          Workarea::Api::Admin::DateIndexes.load
         end
       end
     end

data/test/integration/workarea/api/admin/recommendation_settings_integration_test.rb

@@ -35,6 +35,20 @@ module Workarea
 
           assert_equal(['foo'], recommendation_settings.reload.product_ids)
         end
+
+        def test_unpersisted_recommendation_settings
+          get admin_api.product_recommendation_settings_path(@product.id)
+          result = JSON.parse(response.body)['recommendation_settings']
+          assert_equal(@product.id, result['_id'])
+          assert_equal(0, Recommendation::Settings.count)
+
+          patch admin_api.product_recommendation_settings_path(@product.id),
+            params: { recommendation_settings: { product_ids: ['foo'] } }
+
+          assert_equal(1, Recommendation::Settings.count)
+          assert_equal(@product.id, Recommendation::Settings.first.id)
+          assert_equal(['foo'], Recommendation::Settings.first.product_ids)
+        end
       end
     end
   end

data/workarea-api-admin.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_dependency 'workarea', '~> 3.x', '>= 3.4.x'
-  s.add_dependency 'responders', '~> 2.4.0'
+  s.add_dependency 'workarea', '~> 3.x', '>= 3.5.x'
+  s.add_dependency 'responders', '~> 3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-api-admin
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.6
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -19,7 +19,7 @@ dependencies:
         version: 3.x
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.x
+        version: 3.5.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: 3.x
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.x
+        version: 3.5.x
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
 description: This provides an admin JSON REST API for the Workarea Commerce Platform.
   Useful for managing the site, 3rd party integrations, etc.
 email:
@@ -102,6 +102,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/workarea/api/admin.rb
+- lib/workarea/api/admin/date_indexes.rb
 - lib/workarea/api/admin/engine.rb
 - lib/workarea/api/admin/swagger.rb
 - test/documentation/workarea/api/admin/categories_documentation_test.rb
@@ -250,7 +251,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: Admin JSON REST API for the Workarea Commerce Platform