spree_cm_commissioner 2.8.2.pre.pre.3 → 2.8.2.pre.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d81921f1e2c71c3740ce4b4d0c933c5ecc1c1c1e008eacf01636e95c2d0078e3
-  data.tar.gz: 4b02d2667e7d5a441e37315ecb0c91de142b529a595ea14a350863e75b22bd0b
+  metadata.gz: d4cd730387ccdcb3fab3576b93581404b2612162c839b7a9e5eea00e1ce8c633
+  data.tar.gz: 39ab583fea644ea040871592bfd145f06512f5bc0ef0ede6df8b9985bb21af63
 SHA512:
-  metadata.gz: 480b051b7f31a87059d9c6f396e6a6e0c2c48b0a38432c7c93d027cbf038263a500945afdb2c8d9c6dbbed92a2cc857a03eaff25bdb57f31b6e7f429dce6556f
-  data.tar.gz: bc516685858c51491db8801c3004f2f8c095c1b2727958877e911312dcb7039feccc8c318c9d88ff8b1c56f88c933478bd05a1664d480dd4a2e0c5dca0a64190
+  metadata.gz: c07eeed2b2dc958ca1edecd2c8ee0898700bf56216364c849b8ac34a693a226323561f52d79ab3331620448dff35f1ae906d8382e9f3c17876d91cdf32d51291
+  data.tar.gz: 840295b33cacc219eb1c56c83f5e06938fd882a000e240b15b03d2992f4196d70f8a59db83f8c535cbaa95c5eece2ab95ab2d658a91c85c5aebb23a2f3ad7dc2

data/Gemfile.lock

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

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

@@ -16,6 +16,7 @@ module SpreeCmCommissioner
       GuestCardClassesController
       SeatLayoutController
       CmsPagesController
+      AdvertisementsController
     ].freeze
 
     # Priority 2: Semi-Static (1 hour)
@@ -25,6 +26,7 @@ module SpreeCmCommissioner
       HomepageDataController
       PopularRoutesController
       RoutePlacesController
+      ShowsController
     ].freeze
 
     # Priority 3: Moderate Freshness (30 minutes)

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

@@ -0,0 +1,23 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class AdvertisementsController < BaseController
+          private
+
+          def scope
+            Spree::Product
+              .advertisements
+              .joins(:vendor)
+              .where(tenant_id: @tenant.id)
+              .order(created_at: :asc)
+          end
+
+          def collection_serializer
+            Spree::V2::Tenant::AdvertisementSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/product_type.rb

@@ -5,7 +5,7 @@ module SpreeCmCommissioner
   module ProductType
     extend ActiveSupport::Concern
 
-    PRODUCT_TYPES = %i[accommodation service ecommerce transit show_episode vote_package].freeze
+    PRODUCT_TYPES = %i[accommodation service ecommerce transit show_episode vote_package advertisement].freeze
     PERMANENT_STOCK_PRODUCT_TYPES = %w[accommodation service transit].freeze
     PRE_INVENTORY_DAYS = { 'transit' => 90, 'accommodation' => 365, 'service' => 30 }.freeze
 

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -108,6 +108,12 @@ module SpreeCmCommissioner
           .maximum('spree_prices.price').to_f
       }
       base.scope :subscribable, -> { where(subscribable: 1) }
+      base.scope :advertisements, lambda {
+        advertisement
+          .available
+          .where('spree_products.available_on IS NULL OR spree_products.available_on <= CURRENT_TIMESTAMP')
+          .where('spree_products.discontinue_on IS NULL OR spree_products.discontinue_on > CURRENT_TIMESTAMP')
+      }
 
       base.before_validation :set_event_id
 
@@ -121,6 +127,10 @@ module SpreeCmCommissioner
       base.store_public_metadata :open_dated_validity_days, :integer, default: 90
       base.store_public_metadata :enable_inventory_hold, :boolean, default: false
 
+      base.store_private_metadata :video_url, :string
+      base.store_private_metadata :skip_after_seconds, :integer, default: 5
+      base.store_private_metadata :duration_seconds, :integer, default: 30
+
       base.after_update :update_variants_vendor_id, if: :saved_change_to_vendor_id?
       base.after_update :sync_event_id_to_children, if: :saved_change_to_event_id?
 

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class AdvertisementSerializer < BaseSerializer
+        set_type :advertisement
+
+        attributes :name, :video_url, :skip_after_seconds, :duration_seconds
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -499,6 +499,7 @@ Spree::Core::Engine.add_routes do
         resources :vendors
         resources :products
         resources :taxons, only: %i[index show], id: /.+/
+        resources :advertisements, 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.2.pre.pre.3'.freeze
+  VERSION = '2.8.2.pre.pre.4'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.2.pre.pre.3
+  version: 2.8.2.pre.pre.4
 platform: ruby
 authors:
 - You
@@ -1035,6 +1035,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/base_controller.rb
 - app/controllers/spree/api/v2/tenant/cart_controller.rb
 - app/controllers/spree/api/v2/tenant/cart_guests_controller.rb
@@ -1948,6 +1949,7 @@ files:
 - app/serializers/spree/v2/storefront/vendor_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/wished_item_serializer_decorator.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
 - app/serializers/spree/v2/tenant/base_serializer.rb
 - app/serializers/spree/v2/tenant/booking_card_class_serializer.rb