spree_cm_commissioner 2.8.3.pre.pre10 → 2.8.3.pre.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160dde1b317fc939ab0c8085e06cef761660f1076c445cf8a4e80a4c0b8815e2
-  data.tar.gz: 3b21ad6f91559722a34191563ba1b57f66e3944aff9857d7422c2ec23f49ef3b
+  metadata.gz: fc670dfc1c70b1d0307e09941e9e1bbcbcc8b8ebebcd3ff883b81350e42ead04
+  data.tar.gz: 8c1fc869352e101588a38ff8ce00726a50788e7ea9bd936e53d74cf01246ef00
 SHA512:
-  metadata.gz: cabcd16295082a5799df607523e08f8b1911b8cb687b87e27e6c4d6691c4aa9ac9bd37acecd3ced81481c747160f8b6c24861bb6fbf6802e4d4594aa93176722
-  data.tar.gz: 3a9d2da8ce4c1a6d0069f54b0097123d170c9097106ab87e3fd81b4ffc7387ea9ec118e6899249215d9193f23df62dc45c8779980e08b97493bccbe1da0c5f40
+  metadata.gz: 696ae98c855011b50c62a2cb60e6f31564d3841531361785595b2334adb340e6f3a189bc73bb3b636801f66664d1bf8037f95bc7ea17895769be09825546e10c
+  data.tar.gz: 641c6beaccb2eb7cc69977d204f583af78d0f49ecd642da05569579a57e96c6e882be53a163ce20cb5d8f0550970bc7998f07b173b6070d20580e9e6ac87ae37

data/Gemfile.lock

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

data/app/controllers/spree/api/v2/tenant/{advertisements_controller.rb → ad_campaigns_controller.rb}

@@ -2,12 +2,13 @@ module Spree
   module Api
     module V2
       module Tenant
-        class AdvertisementsController < BaseController
+        class AdCampaignsController < BaseController
           private
 
           def scope
-            Spree::Taxon.campaigns
+            Spree::Taxon.ad_campaigns
                         .joins(:vendor)
+                        .includes(:advertisements)
                         .where(spree_vendors: { tenant_id: @tenant.id })
                         .where('spree_taxons.from_date <= ? OR spree_taxons.from_date IS NULL', Time.current)
                         .where('spree_taxons.to_date >= ? OR spree_taxons.to_date IS NULL', Time.current)
@@ -15,7 +16,7 @@ module Spree
           end
 
           def collection_serializer
-            Spree::V2::Tenant::CampaignSerializer
+            Spree::V2::Tenant::AdCampaignSerializer
           end
         end
       end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -85,13 +85,14 @@ module SpreeCmCommissioner
 
       base.scope :shows, -> { where(taxonomy_id: Spree::Taxonomy.shows.id, depth: 1) }
       base.scope :events,     -> { where(taxonomy_id: Spree::Taxonomy.events.id, depth: 1) }
-      base.scope :campaigns,  -> { where(taxonomy_id: Spree::Taxonomy.ads.id, depth: 1) }
+      base.scope :ad_campaigns, -> { where(taxonomy_id: Spree::Taxonomy.ads.id, depth: 1) }
 
-      base.store_public_metadata :sorted_ads_ids, :array, default: []
+      base.has_many :advertisements,
+                    -> { where(product_type: :advertisement, deleted_at: nil) },
+                    through: :classifications,
+                    class_name: 'Spree::Product',
+                    source: :product
 
-      base.has_many :advertisements, lambda {
-                                       advertisement.where(deleted_at: nil)
-                                     }, through: :classifications, class_name: 'Spree::Product', source: :product
       base.has_many :agencies, class_name: 'SpreeCmCommissioner::Agency', foreign_key: :agency_category_id
       base.has_many :preview_roles, class_name: 'SpreeCmCommissioner::PreviewRole', as: :previewable
 

data/app/serializers/spree/v2/tenant/ad_campaign_serializer.rb

@@ -0,0 +1,13 @@
+module Spree
+  module V2
+    module Tenant
+      class AdCampaignSerializer < BaseSerializer
+        set_type :campaign
+
+        attributes :name, :from_date, :to_date
+
+        has_many :advertisements, serializer: Spree::V2::Tenant::AdvertisementSerializer
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -508,7 +508,7 @@ Spree::Core::Engine.add_routes do
         resources :vendors
         resources :products
         resources :taxons, only: %i[index show], id: /.+/
-        resources :advertisements, only: [:index]
+        resources :ad_campaigns, only: [:index]
 
         resources :account_checker
         resource :pin_code_checkers, only: [:update]

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.3.pre.pre10'.freeze
+  VERSION = '2.8.3.pre.pre11'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.3.pre.pre10
+  version: 2.8.3.pre.pre11
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-15 00:00:00.000000000 Z
+date: 2026-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1041,7 +1041,7 @@ files:
 - app/controllers/spree/api/v2/tenant/account_controller.rb
 - app/controllers/spree/api/v2/tenant/account_deletions_controller.rb
 - app/controllers/spree/api/v2/tenant/account_recovers_controller.rb
-- app/controllers/spree/api/v2/tenant/advertisements_controller.rb
+- app/controllers/spree/api/v2/tenant/ad_campaigns_controller.rb
 - app/controllers/spree/api/v2/tenant/base_controller.rb
 - app/controllers/spree/api/v2/tenant/cart_controller.rb
 - app/controllers/spree/api/v2/tenant/cart_guests_controller.rb
@@ -1975,6 +1975,7 @@ files:
 - app/serializers/spree/v2/storefront/variant_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/vendor_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/wished_item_serializer_decorator.rb
+- app/serializers/spree/v2/tenant/ad_campaign_serializer.rb
 - app/serializers/spree/v2/tenant/address_serializer.rb
 - app/serializers/spree/v2/tenant/advertisement_serializer.rb
 - app/serializers/spree/v2/tenant/asset_serializer.rb