spree_cm_commissioner 2.14.9 → 2.14.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5426f6a834611d1c303d1305de10998cea1cd5b6ca72c23f512ddff53614b2a
-  data.tar.gz: cb6688095f5daef9df50906c20d5adb5cba20dc4f2657a430b1d2ab00afaaaf6
+  metadata.gz: de45fdbe1a6ac4c18da7e6b8fbd3eb6f4fe7241bb10e23c0d4c23973a91b7170
+  data.tar.gz: 54156df2cef71cff39256c04a949869559c0e477f6c1ba413d8b0ef91761d616
 SHA512:
-  metadata.gz: e609a94743b1283a225d077dad5ba3f775ed599985d687f8b6c4408de286bc6f8b6e91e4024e675ec03ae06a67a013fa43cc6242cc50070a334bc2ac4731e7d0
-  data.tar.gz: d007f4f9a802452c020d32f32f44c466e88469ea24386c87f8b45c834ced740d1faf55185d953901640fd1dd73f19af686667ef9f29e615b97642aadc8645020
+  metadata.gz: '0383b1bb4e0459522cc0004b2a841a5697e18b9b28ff62469a8e1ce5501f91e7fb3fb8899689c2174d997484231b71883408069aca5f53ed0af400bb8e091cd6'
+  data.tar.gz: 5adeb841a23fb3d28a74e0972d34c478a0a80e26ba5ab114bb4d837aac2dadaf98fa9e696aff506fa4ed0de1acaa48af64067e8db8cd34803aa2518e0661945d

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.14.9)
+    spree_cm_commissioner (2.14.10)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/concerns/spree_cm_commissioner/taxon_visible_products_preloadable.rb

@@ -0,0 +1,24 @@
+module SpreeCmCommissioner
+  # The taxon serializer renders `visible_products` as loaded, so the sales-channel filter lives here:
+  # preloading it scoped to the request's channel hides tenant-only products on BookMe+ and platform-only ones on a tenant app.
+  # Prepend it (not include) so it wraps a controller's own `resource`/`paginated_collection`.
+  module TaxonVisibleProductsPreloadable
+    private
+
+    def resource
+      @resource ||= super.tap { |taxon| preload_visible_products([taxon]) }
+    end
+
+    def paginated_collection
+      @paginated_collection ||= super.tap { |taxons| preload_visible_products(taxons.to_a) }
+    end
+
+    def preload_visible_products(taxons)
+      ActiveRecord::Associations::Preloader.new(
+        records: taxons,
+        associations: :visible_products,
+        scope: Spree::Product.sellable_on(Spree::Product.sales_channel_for(@tenant))
+      ).call
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/taxons_controller_decorator.rb

@@ -3,6 +3,8 @@ module Spree
     module V2
       module Storefront
         module TaxonsControllerDecorator
+          include SpreeCmCommissioner::TaxonVisibleProductsPreloadable
+
           def scope
             super.where(preview: false)
           end

data/app/controllers/spree/api/v2/tenant/taxons_controller.rb

@@ -3,6 +3,8 @@ module Spree
     module V2
       module Tenant
         class TaxonsController < BaseController
+          prepend SpreeCmCommissioner::TaxonVisibleProductsPreloadable
+
           private
 
           def collection_serializer

data/app/serializers/spree/v2/storefront/taxon_serializer_decorator.rb

@@ -4,10 +4,7 @@ module Spree
       module TaxonSerializerDecorator
         def self.prepended(base)
           base.has_many :vendors, serializer: ::Spree::V2::Storefront::VendorSerializer
-          # The app lists an event section's tickets from this relation, so products a tenant keeps off BookMe+ are dropped here.
-          base.has_many :visible_products, serializer: ::Spree::V2::Storefront::ProductSerializer do |taxon|
-            taxon.visible_products.sellable_on(:platform)
-          end
+          base.has_many :visible_products, serializer: ::Spree::V2::Storefront::ProductSerializer
           base.has_many :places, serializer: ::Spree::V2::Storefront::PlaceSerializer
 
           base.has_one :vendor, serializer: ::Spree::V2::Storefront::VendorSerializer

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.14.9'.freeze
+  VERSION = '2.14.10'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.14.9
+  version: 2.14.10
 platform: ruby
 authors:
 - You
@@ -822,6 +822,7 @@ files:
 - app/controllers/concerns/spree_cm_commissioner/load_test_login_token_generation.rb
 - app/controllers/concerns/spree_cm_commissioner/operator/event_authorization.rb
 - app/controllers/concerns/spree_cm_commissioner/order_concern.rb
+- app/controllers/concerns/spree_cm_commissioner/taxon_visible_products_preloadable.rb
 - app/controllers/concerns/spree_cm_commissioner/turnstile_protectable.rb
 - app/controllers/concerns/spree_cm_commissioner/waiting_room_authorization.rb
 - app/controllers/spree/admin/account_deletions_controller.rb