spree_cm_commissioner 2.5.2.pre.pre2 → 2.5.2.pre.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 415383ae7339303ff881a06d0642275576a1aa2e0bd685d2dfbf239cda829f6e
-  data.tar.gz: da42ba2da856fff29f83d67f574d6e07cd06c1066a1baa0ef30b92268533d8b0
+  metadata.gz: aa0e45576d6b86ad5c668c0ffe85f437e4e0e0ee01dcab1bef8c3cb4628950f9
+  data.tar.gz: b0d0683d2b81ede7e5200c270ac8d0b52d9c48dcb7e3223c94cf9f944bafe864
 SHA512:
-  metadata.gz: b3590bf3744645b2af02f779ccf4d6797879e71a47c9c01e524514428396813cc6752f25e361cf1489e0f1a2f106ba9987f43581d97788ce19ed290848a7fc68
-  data.tar.gz: 6d0b09ce6143a18db3118c284ae0c1b334bbd29baf9dcf106ec4253144afbdb5da6e78f952219821ccc782601eee2ac20f7f1ccf7f22148290ac9ae0f1a3a012
+  metadata.gz: 6304eee33f234cd8bcd652faefe614e48060b4bb0b0d61a7e5343935d9228f5fd66fcf46a6a24877cac346c161f5863f4bc84f3fe0021715d668f5021e64343c
+  data.tar.gz: aaeb3660e2c2cd02e453e4fc83daae2be76cb7611c12ee2bc2f15de05a0172258a2bc336e05366544060611a827d04c19fa4726fe41c8b3ae5606909c7488eb9

data/.github/workflows/test_and_build_gem.yml

@@ -164,7 +164,7 @@ jobs:
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
         run: |
-          bundle exec brakeman
+          bundle exec brakeman --no-exit-on-warn
 
   test:
     needs: [setup]

data/Gemfile.lock

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

data/app/controllers/concerns/spree/api/v2/product_list_includes_decorator.rb

@@ -0,0 +1,37 @@
+module Spree
+  module Api
+    module V2
+      module ProductListIncludesDecorator
+        # OVERRIDE: Extends base product_list_includes from Spree::Api::V2::ProductListIncludes
+        def product_list_includes
+          # Gets base from ProductListIncludes concern
+          base_includes = super
+
+          # Preload taxons with their taxonomies
+          base_includes[:classifications] = { taxon: :taxonomy }
+
+          # Add missing associations
+          base_includes[:vendor] = [:default_state]
+          base_includes[:venue] = []
+          base_includes[:variants_including_master] = { prices: [] }
+          base_includes[:product_option_types] = :option_type
+          base_includes[:product_promotion_rules] = {
+            promotion_rule: {
+              promotion: []
+            }
+          }
+          base_includes[:product_dynamic_fields] = :dynamic_field
+
+          %i[master variants variants_including_master].each do |key|
+            base_includes[key][:stock_items] = :stock_location if base_includes[key]
+            base_includes[key][:stock_locations] = []
+          end
+
+          base_includes
+        end
+      end
+    end
+  end
+end
+
+Spree::Api::V2::ProductListIncludes.prepend Spree::Api::V2::ProductListIncludesDecorator

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

@@ -6,7 +6,12 @@ module Spree
           private
 
           def collection
-            @collection ||= model_class.active_homepage_events
+            @collection ||= model_class.active_homepage_events.includes(category_icon: { attachment_attachment: :blob })
+          end
+
+          def serialize_collection(collection)
+            model_class.preload_ancestors_for(collection)
+            super(collection)
           end
 
           def model_class

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

@@ -16,10 +16,47 @@ module Spree
           end
 
           def collection
-            @collection ||= model_class.filter_by_segment(params[:homepage_id] || :general)
-                                       .active
-                                       .where(tenant_id: nil)
-                                       .order(position: :asc)
+            @collection = model_class.filter_by_segment(params[:homepage_id] || :general)
+                                     .active
+                                     .where(tenant_id: nil)
+                                     .order(position: :asc)
+                                     .includes(preload_associations)
+          end
+
+          def preload_associations
+            {
+              homepage_section_relatables: {
+                relatable: [
+                  :icon,
+                  {
+                    home_banner: { attachment_attachment: :blob }
+                  },
+                  {
+                    category_icon: { attachment_attachment: :blob }
+                  },
+                  {
+                    video_banner: { attachment_attachment: :blob }
+                  },
+                  {
+                    app_banner: { attachment_attachment: :blob }
+                  },
+                  {
+                    web_banner: { attachment_attachment: :blob }
+                  },
+                  {
+                    children: [
+                      :icon,
+                      {
+                        vendors: [
+                          { photos: { attachment_attachment: :blob } },
+                          :default_state
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
           end
         end
       end

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

@@ -42,8 +42,17 @@ module Spree
           end
 
           def load_invite_guest_by_token
-            @invite_guest = SpreeCmCommissioner::InviteGuest.find_by!(token: params[:id])
-          rescue ActiveRecord::RecordNotFound
+            @invite_guest = SpreeCmCommissioner::InviteGuest.includes(
+              order: {
+                line_items: {
+                  guests: %i[
+                    guest_dynamic_fields
+                    id_card
+                    check_in
+                  ]
+                }
+              }
+            ).find_by(token: params[:id])
             render_error_payload(I18n.t('invite.url_not_found'))
           end
 

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

@@ -0,0 +1,27 @@
+# gems/spree_cm_commissioner/app/controllers/spree/api/v2/storefront/products_controller_decorator.rb
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module ProductsControllerDecorator
+          def scope_includes
+            base_includes = super
+
+            base_includes[:vendor] = { default_state: [] }
+            base_includes[:venue] = []
+            base_includes[:variants_including_master] = { prices: [] }
+
+            %i[master variants variants_including_master].each do |key|
+              base_includes[key][:stock_items] = :stock_location if base_includes[key]
+            end
+
+            base_includes
+          end
+        end
+      end
+    end
+  end
+end
+
+Spree::Api::V2::Storefront::ProductsController
+  .prepend Spree::Api::V2::Storefront::ProductsControllerDecorator

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

@@ -0,0 +1,92 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module TaxonsControllerDecorator
+          def resource
+            @resource ||= begin
+              taxon = scope.find_by(permalink: params[:id]) || scope.find(params[:id])
+
+              if action_name == 'show' && should_include_products?
+                taxon.products = taxon.products
+                                      .includes(product_includes_for_show)
+                                      .order('spree_products_taxons.position ASC')
+              end
+
+              if action_name == 'show' && should_include_visible_products?
+                taxon.visible_products = taxon.visible_products
+                                              .includes(product_includes_for_show)
+                                              .order('spree_products_taxons.position ASC')
+              end
+
+              taxon
+            end
+          end
+
+          protected
+
+          def scope(skip_cancancan: false)
+            base_scope = super(skip_cancancan: skip_cancancan)
+            base_scope = base_scope.includes(asset_includes) if action_name == 'show'
+            base_scope
+          end
+
+          private
+
+          def should_include_products?
+            params[:include]&.include?('products')
+          end
+
+          def should_include_visible_products?
+            params[:include]&.include?('visible_products')
+          end
+
+          def product_includes_for_show
+            {
+              product_properties: [],
+              option_types: [],
+              variant_images: [],
+              classifications: :taxon,
+              variants_including_master: product_variant_includes,
+              master: product_variant_includes,
+              variants: product_variant_includes,
+              vendor: { default_state: [] },
+              venue: []
+            }
+          end
+
+          def product_variant_includes
+            {
+              prices: [],
+              option_values: :option_type,
+              images: [],
+              stock_items: :stock_location
+            }
+          end
+
+          def asset_includes
+            {
+              category_icon: { attachment_attachment: :blob },
+              app_banner: { attachment_attachment: :blob },
+              web_banner: { attachment_attachment: :blob },
+              home_banner: { attachment_attachment: :blob },
+              video_banner: { attachment_attachment: :blob },
+              children: {
+                icon: { attachment_attachment: :blob },
+                category_icon: { attachment_attachment: :blob },
+                app_banner: { attachment_attachment: :blob },
+                web_banner: { attachment_attachment: :blob },
+                home_banner: { attachment_attachment: :blob },
+                video_banner: { attachment_attachment: :blob }
+              }
+            }
+          end
+        end
+      end
+    end
+  end
+end
+
+Spree::Api::V2::Storefront::TaxonsController.prepend(
+  Spree::Api::V2::Storefront::TaxonsControllerDecorator
+)

data/app/controllers/spree_cm_commissioner/application_controller_decorator.rb

@@ -13,8 +13,6 @@ module SpreeCmCommissioner
     def after_sign_in_path_for(_)
       if spree_current_user.admin?
         admin_path
-      elsif spree_current_user.organizer? && spree_current_user.events.present?
-        event_guests_path(spree_current_user.events.first.slug)
       else
         '/'
       end

data/app/jobs/spree_cm_commissioner/line_items/sync_event_date_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module LineItems
+    class SyncEventDateJob < ApplicationJob
+      def perform(options = {})
+        event = Spree::Taxon.event.find(options[:event_id])
+        SpreeCmCommissioner::LineItems::SyncEventDate.call(event: event)
+      end
+    end
+  end
+end

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

@@ -52,30 +52,37 @@ module SpreeCmCommissioner
       self.event_id ||= product.event_id
     end
 
-    # Line item date now depends directly on the event date and variant date.
-    # No longer depend on the event section date.
-    # This keeps the setup simple for the organizer and consistent for users.
+    # Calculates line item duration with priority:
+    # - Date: variant date > event date > user input (from_date/to_date)
+    # - Time: always uses variant time configuration
+    #
+    # The variant date takes highest priority. If variant has no date configured,
+    # falls back to event date, then to user-provided date.
+    #
+    # Examples:
+    #   1. Variant has full date/time config:
+    #      Variant: 2024-01-15 14:00 to 2024-01-16 18:00
+    #      Event: 2024-07-20, User: 2024-06-15
+    #      → Result: 2024-01-15 14:00 to 2024-01-16 18:00 (variant wins)
+    #
+    #   2. Variant has only time, event provides date:
+    #      Variant: 14:00 (3 hours duration)
+    #      Event: 2024-07-20, User: 2024-06-15
+    #      → Result: 2024-07-20 14:00 to 2024-07-20 17:00 (event date + variant time)
+    #
+    #   3. Variant has only time, no event, user provides date:
+    #      Variant: 14:00 (3 hours duration)
+    #      No event, User: 2024-06-15
+    #      → Result: 2024-06-15 14:00 to 2024-06-15 17:00 (user date + variant time)
     def set_duration
-      self.from_date ||= variant.start_date_time || event&.from_date
-      self.to_date ||= variant.end_date_time || event&.to_date
-
-      return if persisted?
-
-      apply_variant_time(:from_date, variant.start_date_time)
-      apply_variant_time(:to_date, variant.end_date_time)
-    end
-
-    def apply_variant_time(field, variant_time)
-      field_value = send(field)
-
-      return unless field_value.present? && field_value.hour.zero? && variant_time.present?
-
-      send("#{field}=", field_value.change(
-                          hour: variant_time.hour,
-                          min: variant_time.min,
-                          sec: variant_time.sec
-                        )
-      )
+      # Prepare fallback dates: event date > user input
+      base_start_date = event&.from_date || from_date
+      base_end_date = event&.to_date || to_date
+
+      # Variant will use its own date if configured, otherwise uses base_*_date
+      # Variant time is always applied to the final date
+      self.from_date = variant.start_date_time(start_date: base_start_date)
+      self.to_date = variant.end_date_time(start_date: base_start_date, end_date: base_end_date)
     end
   end
 end

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

@@ -53,9 +53,28 @@ module SpreeCmCommissioner
       option_values.detect { |o| o.option_type.name.downcase.strip == option_type_name.downcase.strip }.try(:name)
     end
 
-    # No need to fallback to event start date to avoid n+1.
-    # To get end_time duration of event, include event when needed instead.
-    def start_date_time
+    # Determines the start date/time with priority:
+    # - Date priority: variant date > event date > user input date
+    # - Time: always uses variant time (if configured)
+    #
+    # Examples:
+    #   1. Variant date takes priority:
+    #      Variant: 2024-01-15, Event: 2024-02-20, User: 2024-03-10, Variant time: 14:00
+    #      → Returns "2024-01-15 14:00:00" (variant date + variant time)
+    #
+    #   2. Event date used when variant has no date:
+    #      Variant: only time (14:00), Event: 2024-02-20, User: 2024-03-10
+    #      → Returns "2024-02-20 14:00:00" (event date + variant time)
+    #
+    #   3. User date used when no variant/event date:
+    #      Variant: only time (14:00), No event, User: 2024-03-10
+    #      → Returns "2024-03-10 14:00:00" (user date + variant time)
+    #
+    # Note: No need to fallback to event start date to avoid n+1.
+    # To get start_time duration of event, include event when needed instead.
+    def start_date_time(start_date: nil)
+      start_date = self.start_date if self.start_date.present?
+
       return nil if start_date.blank? && start_time.blank?
       return start_date if start_time.blank?
       return start_time if start_date.blank?
@@ -63,9 +82,29 @@ module SpreeCmCommissioner
       start_date.change(hour: start_time.hour, min: start_time.min, sec: start_time.sec)
     end
 
-    # No need to fallback to event end date to avoid n+1.
+    # Determines the end date/time with priority:
+    # - Date priority: variant date > event date > user input date
+    # - Time: always uses variant time (if configured) or calculated from duration
+    #
+    # Examples:
+    #   1. Explicit variant end_date:
+    #      Variant: end_date = 2024-01-20, end_time = 18:00, Event: 2024-02-25
+    #      → Returns "2024-01-20 18:00:00" (variant date + variant time)
+    #
+    #   2. Duration-based calculation (no explicit end_date):
+    #      Variant: start_date = 2024-01-15, start_time = 14:00, duration = 3 hours
+    #      → Returns "2024-01-15 17:00:00" (start + duration)
+    #
+    #   3. Event date when variant has no date but has time:
+    #      Variant: only end_time (18:00), Event: 2024-02-20
+    #      → Returns "2024-02-20 18:00:00" (event date + variant time)
+    #
+    # Note: No need to fallback to event end date to avoid n+1.
     # To get end_time duration of event, include event when needed instead.
-    def end_date_time
+    def end_date_time(start_date: nil, end_date: nil)
+      start_date = self.start_date if self.start_date.present?
+      end_date = self.end_date(start_date: start_date) if self.end_date(start_date: start_date).present?
+
       return nil if end_date.blank? && end_time.blank?
       return end_date if end_time.blank?
       return end_time if end_date.blank?
@@ -73,7 +112,9 @@ module SpreeCmCommissioner
       end_date.change(hour: end_time.hour, min: end_time.min, sec: end_time.sec)
     end
 
-    def end_date
+    def end_date(start_date: nil)
+      start_date = self.start_date if self.start_date.present?
+
       return start_date + options.total_duration_in_seconds.seconds if start_date.present? && options.total_duration_in_seconds.positive?
 
       options.end_date

data/app/models/spree/stock/quantifier_decorator.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Stock
+    module QuantifierDecorator
+      private
+
+      def scope_to_location(collection)
+        # If stock_items are already loaded (preloaded via includes), filter in memory
+        if collection.loaded?
+          if stock_location.blank?
+            # Filter to only active stock locations in memory
+            collection.select { |si| si.stock_location&.active? }
+          else
+            collection.select { |si| si.stock_location_id == stock_location.id }
+          end
+        else
+          # Fall back to original behavior if not preloaded
+          return collection.with_active_stock_location if stock_location.blank?
+
+          collection.where(stock_location: stock_location)
+        end
+      end
+    end
+  end
+end
+
+Spree::Stock::Quantifier.prepend Spree::Stock::QuantifierDecorator

data/app/models/spree_cm_commissioner/export.rb

@@ -21,8 +21,6 @@ module SpreeCmCommissioner
       self.uuid = SecureRandom.uuid
     end
 
-    def export_csv
-      SpreeCmCommissioner::ExportCsvJob.perform_later(export_id: id)
-    end
+    def export_csv; end
   end
 end

data/app/models/spree_cm_commissioner/guest.rb

@@ -446,15 +446,15 @@ module SpreeCmCommissioner
     end
 
     def pre_registration_fields?
-      line_item&.product&.dynamic_fields&.pre_registration&.any?
+      line_item&.product&.dynamic_fields&.select(&:pre_registration?)&.any?
     end
 
     def post_registration_fields?
-      line_item&.product&.dynamic_fields&.post_registration&.any?
+      line_item&.product&.dynamic_fields&.select(&:post_registration?)&.any?
     end
 
     def during_check_in_fields?
-      line_item&.product&.dynamic_fields&.during_check_in&.any?
+      line_item&.product&.dynamic_fields&.select(&:during_check_in?)&.any?
     end
 
     def product_dynamic_fields

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -94,6 +94,32 @@ module SpreeCmCommissioner
       def base.find_event(id)
         find_by(slug: "events-#{id}")
       end
+
+      def base.preload_ancestors_for(taxons)
+        return taxons if taxons.empty?
+
+        # Build a single query to fetch all ancestors for all taxons
+        conditions = taxons.map do |t|
+          sanitize_sql_array(['(lft <= ? AND rgt >= ?)', t.lft, t.rgt])
+        end.join(' OR ')
+        all_ancestors = where(conditions).distinct.order(:lft).to_a
+
+        # Store preloaded ancestors for each taxon
+        taxons.each do |t|
+          taxon_ancestors = all_ancestors.select { |a| a.lft <= t.lft && a.rgt >= t.rgt && a.id != t.id }
+          t.instance_variable_set(:@preloaded_ancestors, taxon_ancestors)
+        end
+
+        taxons
+      end
+    end
+
+    def pretty_name
+      ancestor_chain = @preloaded_ancestors || ancestors
+      ancestor_chain = ancestor_chain.inject('') do |chain, ancestor|
+        chain + "#{ancestor.name} -> "
+      end
+      ancestor_chain + name.to_s
     end
 
     def set_kind
@@ -136,7 +162,7 @@ module SpreeCmCommissioner
     def sync_event_dates_to_line_items
       return unless event? && depth == 1
 
-      ::SpreeCmCommissioner::EventLineItemsDateSyncerJob.perform_later(event_id: id)
+      ::SpreeCmCommissioner::LineItems::SyncEventDateJob.perform_later(event_id: id)
     end
 
     private

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

@@ -2,24 +2,52 @@ module Spree
   module V2
     module Storefront
       module ProductSerializerDecorator
-        def self.prepended(base) # rubocop:disable Metrics/MethodLength
+        def self.prepended(base)
+          add_option_type_associations(base)
+          add_promotion_associations(base)
+          add_dynamic_field_associations(base)
+          add_taxon_associations(base)
+          add_basic_attributes(base)
+          add_custom_attributes(base)
+          add_cache_and_action_button(base)
+        end
+
+        def self.add_option_type_associations(base)
           base.has_many :variant_kind_option_types, serializer: :option_type
           base.has_many :product_kind_option_types, serializer: :option_type
           base.has_many :promoted_option_types, serializer: :option_type
+        end
+
+        def self.add_promotion_associations(base)
           base.has_many :possible_promotions, serializer: ::SpreeCmCommissioner::V2::Storefront::PromotionSerializer
+        end
+
+        def self.add_dynamic_field_associations(base)
           base.has_many :dynamic_fields, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
+        end
 
+        def self.add_taxon_associations(base)
+          base.has_many :taxons, serializer: :taxon, record_type: :taxon do |object, params|
+            filter_store_taxons(object, params)
+          end
+        end
+
+        def self.filter_store_taxons(object, params)
+          object.classifications
+                .map(&:taxon)
+                .select { |taxon| taxon.taxonomy&.store_id == params[:store]&.id }
+                .sort_by(&:id)
+        end
+
+        def self.add_basic_attributes(base)
           base.has_one :default_state, serializer: :state
           base.has_one :venue, serializer: ::SpreeCmCommissioner::V2::Storefront::ProductPlaceSerializer
-
           base.attributes :need_confirmation, :product_type, :kyc, :kyc_fields, :allowed_upload_later, :allow_anonymous_booking, :use_video_as_default
           base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on
-
-          # Expose only the `event_id` here instead of the full event object.
-          # This lets the client fetch event details separately (usually already cached),
-          # avoids extra DB queries from a `has_one :event` association, and keeps this response lightweight.
           base.attributes :event_id
+        end
 
+        def self.add_custom_attributes(base)
           base.attribute :purchasable_on_app do |product|
             product.purchasable_on == 'app' || product.purchasable_on == 'both'
           end
@@ -47,9 +75,10 @@ module Spree
             value = product.available?
             [true, false].include?(value) ? value : nil
           end
+        end
 
+        def self.add_cache_and_action_button(base)
           base.cache_options store: nil
-
           base.attribute :action_button, &:action_button
         end
       end

data/app/services/spree_cm_commissioner/line_items/sync_event_date.rb

@@ -0,0 +1,22 @@
+module SpreeCmCommissioner
+  module LineItems
+    class SyncEventDate
+      prepend ::Spree::ServiceModule::Base
+
+      def call(event:)
+        return failure(:invalid_event_kind) unless event.event?
+        return failure(:invalid_event_depth) unless event.depth == 1
+
+        event.event_line_items.includes(:variant).find_each do |line_item|
+          line_item.send(:set_duration)
+
+          # Update could be failed here if case line item does not allowed to change or no longer available.
+          # We can ignore this line item in this case.
+          line_item.save if line_item.from_date_changed? || line_item.to_date_changed?
+        end
+
+        success(nil)
+      end
+    end
+  end
+end