spree_cm_commissioner 2.8.3.pre.pre8 → 2.8.3

data/app/models/spree_cm_commissioner/role_decorator.rb

@@ -1,11 +1,10 @@
 module SpreeCmCommissioner
   module RoleDecorator
     def self.prepended(base)
-      base.enum role_type: { internal: 0, external: 1, preview: 2 }
+      base.enum role_type: { internal: 0, external: 1 }
 
       base.has_many :role_permissions, class_name: 'SpreeCmCommissioner::RolePermission'
       base.has_many :permissions, through: :role_permissions, class_name: 'SpreeCmCommissioner::Permission'
-      base.has_many :preview_roles, class_name: 'SpreeCmCommissioner::PreviewRole'
 
       base.belongs_to :vendor, optional: true
 
@@ -14,8 +13,6 @@ module SpreeCmCommissioner
         where(vendor_id: vendor)
       }
       base.scope :filter_external, -> { where(role_type: :external) }
-      base.scope :filter_internal, -> { where(role_type: :internal) }
-      base.scope :filter_preview, -> { where(role_type: :preview) }
 
       base.accepts_nested_attributes_for :role_permissions, allow_destroy: true
 

data/app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb

@@ -3,10 +3,6 @@ module SpreeCmCommissioner
     module AvailabilityValidatorDecorator
       # override
       def item_available?(line_item, quantity)
-        # Ticket-transfer orders move existing inventory between guests rather than
-        # purchasing new stock, so they must not be gated by the live stock check.
-        return true if line_item.order&.ticket_transfer?
-
         SpreeCmCommissioner::Stock::LineItemAvailabilityChecker.new(line_item)
                                                                .can_supply?(quantity)
       end

data/app/models/spree_cm_commissioner/stock/order_availability_checker.rb

@@ -32,9 +32,6 @@ module SpreeCmCommissioner
       end
 
       def sufficient_stock_for?(line_item, cached_inventory_items)
-        # Ticket transfer orders move an already-owned stock between users,
-        # so they must skip stock checks even when the event is sold out.
-        return true if order.ticket_transfer?
         return false unless line_item.variant.available?
         return true unless line_item.variant.should_track_inventory?
         return true if line_item.variant.backorderable?

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -83,28 +83,7 @@ module SpreeCmCommissioner
 
       base.has_many :import_orders, as: :importable, class_name: 'SpreeCmCommissioner::Imports::ImportOrder', dependent: :destroy
 
-      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.store_public_metadata :sorted_ads_ids, :array, default: []
-
-      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
-
-      base.scope :visible_to, lambda { |user|
-        publicly_available = where(preview: false)
-
-        if user
-          allowed_ids = user.preview_roles.where(previewable_type: polymorphic_name).select(:previewable_id)
-          publicly_available.or(where(preview: true, id: allowed_ids))
-        else
-          publicly_available
-        end
-      }
 
       # Create maintaining task to purge taxon related caches
       base.after_save { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: self) }
@@ -117,7 +96,6 @@ module SpreeCmCommissioner
           .joins('INNER JOIN cm_homepage_sections ON cm_homepage_section_relatables.homepage_section_id = cm_homepage_sections.id')
           .where(cm_homepage_sections: { tenant_id: nil, active: true })
           .where(kind: :event)
-          .where(preview: false)
       end
 
       def base.find_event(id)

data/app/models/spree_cm_commissioner/taxonomy_decorator.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   module TaxonomyDecorator
-    def self.prepended(base) # rubocop:disable Metrics/MethodLength
+    def self.prepended(base)
       base.include SpreeCmCommissioner::TaxonKind
 
       base.belongs_to :vendor, class_name: 'Spree::Vendor', optional: true
@@ -15,15 +15,6 @@ module SpreeCmCommissioner
         end
       end
 
-      def base.shows
-        ActiveRecord::Base.connected_to(role: :writing) do
-          shows = Spree::Taxonomy.find_or_create_by(name: 'Shows', store: Spree::Store.default)
-          shows.kind = :event
-          shows.save if shows.changed?
-          shows
-        end
-      end
-
       def base.businesses
         ActiveRecord::Base.connected_to(role: :writing) do
           businesses = Spree::Taxonomy.find_or_create_by(name: 'Businesses', store: Spree::Store.default)
@@ -41,15 +32,6 @@ module SpreeCmCommissioner
           agency_categories
         end
       end
-
-      def base.ads
-        ActiveRecord::Base.connected_to(role: :writing) do
-          ads = Spree::Taxonomy.find_or_create_by(name: 'Ads', store: Spree::Store.default)
-          ads.kind = :ads
-          ads.save if ads.changed?
-          ads
-        end
-      end
     end
   end
 end

data/app/models/spree_cm_commissioner/tenant.rb

@@ -24,8 +24,6 @@ module SpreeCmCommissioner
 
     before_validation :generate_slug, if: -> { slug.blank? && name.present? }
 
-    validate :single_active_vendor
-
     def active_vendor
       vendors.where(state: :active).first
     end
@@ -45,12 +43,5 @@ module SpreeCmCommissioner
     def generate_slug
       self.slug = name.parameterize if slug.blank?
     end
-
-    # Add Guardrails to ensure data integrity and make system predictable.
-    def single_active_vendor
-      return unless vendors.where(state: :active).count > 1
-
-      errors.add(:base, 'must have at most one active vendor')
-    end
   end
 end

data/app/models/spree_cm_commissioner/trip.rb

@@ -21,13 +21,8 @@ module SpreeCmCommissioner
 
     # before create, duplicate seat layout from vehicle_type if present
     before_validation :duplicate_seat_layout_from_vehicle, if: -> { seat_layout.nil? && vehicle_type&.seat_layout.present? }
-
     after_create :increment_route_metric_trip_count
-    after_create :increment_vendor_route_metric_trip_count
-
     before_destroy :decrement_route_metric_trip_count
-    before_destroy :decrement_vendor_route_metric_trip_count
-
     after_commit :update_route_price_range, on: %i[create update]
 
     belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
@@ -167,8 +162,6 @@ module SpreeCmCommissioner
     end
 
     def increment_route_metric_trip_count
-      return if route_type.nil?
-
       SpreeCmCommissioner::RouteMetrics::IncreaseTripCountJob.perform_later(
         origin_place_id: origin_place_id,
         destination_place_id: destination_place_id,
@@ -177,8 +170,6 @@ module SpreeCmCommissioner
     end
 
     def decrement_route_metric_trip_count
-      return if route_type.nil?
-
       SpreeCmCommissioner::RouteMetrics::DecreaseTripCountJob.perform_later(
         origin_place_id: origin_place_id,
         destination_place_id: destination_place_id,
@@ -186,28 +177,6 @@ module SpreeCmCommissioner
       )
     end
 
-    def increment_vendor_route_metric_trip_count
-      return if vendor_id.nil? || route_type.nil?
-
-      SpreeCmCommissioner::VendorRouteMetrics::IncreaseTripCountJob.perform_later(
-        vendor_id: vendor_id,
-        origin_place_id: origin_place_id,
-        destination_place_id: destination_place_id,
-        route_type: route_type
-      )
-    end
-
-    def decrement_vendor_route_metric_trip_count
-      return if vendor_id.nil? || route_type.nil?
-
-      SpreeCmCommissioner::VendorRouteMetrics::DecreaseTripCountJob.perform_later(
-        vendor_id: vendor_id,
-        origin_place_id: origin_place_id,
-        destination_place_id: destination_place_id,
-        route_type: route_type
-      )
-    end
-
     def update_route_price_range
       return unless route_id.present? && product_id.present?
 

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -19,8 +19,6 @@ module SpreeCmCommissioner
       base.has_many :payments, as: :payable, class_name: 'Spree::Payment', dependent: :nullify
       base.has_many :role_permissions, through: :spree_roles, class_name: 'SpreeCmCommissioner::RolePermission'
       base.has_many :permissions, through: :role_permissions, class_name: 'SpreeCmCommissioner::Permission'
-      base.has_many :preview_spree_roles, -> { where(role_type: :preview) }, through: :role_users, source: :role, class_name: 'Spree::Role'
-      base.has_many :preview_roles, through: :preview_spree_roles, class_name: 'SpreeCmCommissioner::PreviewRole'
       base.has_many :line_items, through: :orders, source: :line_items
       base.has_many :check_ins, foreign_key: 'check_in_by_id', class_name: 'SpreeCmCommissioner::CheckIn'
       base.has_many :user_events, class_name: 'SpreeCmCommissioner::UserEvent'
@@ -37,9 +35,6 @@ module SpreeCmCommissioner
       base.has_many :user_agencies, class_name: 'SpreeCmCommissioner::UserAgency'
       base.has_many :user_places, class_name: 'SpreeCmCommissioner::UserPlace'
       base.has_many :places, through: :user_places, class_name: 'SpreeCmCommissioner::Place'
-      base.has_many :voting_credits, class_name: 'SpreeCmCommissioner::VotingCredit', dependent: :destroy
-      base.has_many :votes, class_name: 'SpreeCmCommissioner::Vote', dependent: :destroy
-      base.has_many :voting_credit_transactions, through: :voting_credits, class_name: 'SpreeCmCommissioner::VotingCreditTransaction'
 
       base.has_one :profile, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::UserProfile'
       base.has_one :customer, class_name: 'SpreeCmCommissioner::Customer'
@@ -164,7 +159,6 @@ module SpreeCmCommissioner
       return first_name if first_name.present?
       return last_name if last_name.present?
       return email if email.present?
-      return login if login.present?
 
       phone_number
     end

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -48,10 +48,6 @@ module SpreeCmCommissioner
       public_metadata[:preload_options_text].presence || Spree::Variants::VisibleOptionsPresenter.new(self).to_sentence
     end
 
-    def vote_credits
-      options.vote_package_amount
-    end
-
     def delivery_required?
       delivery_option == 'delivery'
     end

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -146,10 +146,6 @@ module SpreeCmCommissioner
       @seat_type ||= option_value_name_for(option_type_name: 'seat-type')
     end
 
-    def vote_package_amount
-      @vote_package_amount ||= option_value_name_for(option_type_name: 'vote-package')&.to_i
-    end
-
     # can consider as customers.
     def number_of_guests
       number_of_adults + number_of_kids

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -33,10 +33,6 @@ module SpreeCmCommissioner
 
       base.has_many :taxon_vendors, class_name: 'SpreeCmCommissioner::TaxonVendor'
       base.has_many :taxons, through: :taxon_vendors
-      base.has_many :shows, -> { where(spree_taxons: { type: 'SpreeCmCommissioner::Show' }) },
-                    through: :taxon_vendors, source: :taxon, class_name: 'SpreeCmCommissioner::Show'
-
-      base.has_many :voting_sessions, class_name: 'SpreeCmCommissioner::VotingSession', dependent: :destroy
 
       base.has_many :promoted_option_types, -> { where(promoted: true).order(:position) },
                     through: :vendor_option_types, source: :option_type

data/app/queries/spree_cm_commissioner/multi_leg_trips_query.rb

@@ -16,7 +16,7 @@
 # @return [Array<TripQueryResult>] Multi-leg trip results with pricing and inventory
 #
 module SpreeCmCommissioner
-  class MultiLegTripsQuery # rubocop:disable Metrics/ClassLength
+  class MultiLegTripsQuery
     include SpreeCmCommissioner::Transit::TripHelper
 
     attr_reader :origin_id,
@@ -71,10 +71,7 @@ module SpreeCmCommissioner
           id: leg.parent_trip_id,
           origin_place_id: leg.parent_origin_place_id,
           destination_place_id: leg.parent_destination_place_id,
-          route_type: leg.parent_route_type,
-          vendor_id: leg.parent_vendor_id,
-          has_return_trip_globally: leg.has_return_trip_globally,
-          has_return_trip_in_vendor: leg.has_return_trip_in_vendor
+          vendor_id: leg.parent_vendor_id
         }
       end
 
@@ -117,17 +114,6 @@ module SpreeCmCommissioner
                 LEFT JOIN spree_prices AS date_prices
                   ON date_prices.inventory_item_id = cm_inventory_items.id
                  AND date_prices.deleted_at IS NULL
-
-                LEFT JOIN cm_route_metrics AS global_return_metric
-                  ON global_return_metric.origin_place_id = parent.destination_place_id
-                 AND global_return_metric.destination_place_id = parent.origin_place_id
-                 AND global_return_metric.route_type = parent.route_type
-
-                LEFT JOIN cm_vendor_route_metrics AS vendor_return_metric
-                  ON vendor_return_metric.vendor_id = parent.vendor_id
-                 AND vendor_return_metric.origin_place_id = parent.destination_place_id
-                 AND vendor_return_metric.destination_place_id = parent.origin_place_id
-                 AND vendor_return_metric.route_type = parent.route_type
               SQL
               .where(parent: { origin_place_id: origin_id, destination_place_id: destination_id })
 
@@ -146,7 +132,6 @@ module SpreeCmCommissioner
         parent.origin_place_id AS parent_origin_place_id,
         parent.destination_place_id AS parent_destination_place_id,
         parent.vendor_id AS parent_vendor_id,
-        parent.route_type AS parent_route_type,
         cm_trips.id AS leg_id,
         stop_legs.offset_days AS offset_days,
         stop_legs.sequence AS sequence,
@@ -156,10 +141,7 @@ module SpreeCmCommissioner
 
         COALESCE(MIN(date_prices.amount), MIN(prices.amount)) AS price,
         COALESCE(MIN(date_prices.compare_at_amount), MIN(prices.compare_at_amount)) AS compare_at_price,
-        MIN(COALESCE(date_prices.currency, prices.currency)) AS currency,
-
-        COALESCE(MAX(global_return_metric.trip_count), 0) > 0 AS has_return_trip_globally,
-        COALESCE(MAX(vendor_return_metric.trip_count), 0) > 0 AS has_return_trip_in_vendor
+        MIN(COALESCE(date_prices.currency, prices.currency)) AS currency
       SQL
            # GROUP BY ensures one result row per parent+leg combination, and SUM aggregates inventory
            # across all variants for that leg. Without aggregation, the single JOIN on spree_variants
@@ -173,7 +155,6 @@ module SpreeCmCommissioner
              parent.origin_place_id,
              parent.destination_place_id,
              parent.vendor_id,
-             parent.route_type,
              stop_legs.sequence,
              stop_legs.offset_days
            SQL
@@ -214,7 +195,7 @@ module SpreeCmCommissioner
           :destination_place,
           :vendor,
           { vehicle_type: { option_values: :option_type } },
-          { trip_stops: %i[stop_place location_place] },
+          { trip_stops: :stop_place },
           { product: { variants: :prices } }
         )
         .index_by(&:id)
@@ -235,14 +216,14 @@ module SpreeCmCommissioner
           parent_trip: parent_trip,
           trips: legs.map do |trip|
             row = inventory_map[[parent_id, trip.id]]
-            build_trip_result(trip: trip, trip_row: row, parent_trip: parent_trip)
+            build_trip_result(trip: trip, trip_row: row)
           end
         )
       end
     end
 
     # @return [TripResult] Single leg with pricing and inventory
-    def build_trip_result(trip:, trip_row:, parent_trip:)
+    def build_trip_result(trip:, trip_row:)
       SpreeCmCommissioner::TripResult.new(
         id: trip.id,
         departure_time: trip.departure_time,
@@ -278,10 +259,7 @@ module SpreeCmCommissioner
 
         stops: build_stops_from_record(trip),
 
-        amenities: trip.vehicle_type&.option_values || [],
-
-        has_return_trip_globally: parent_trip[:has_return_trip_globally] || false,
-        has_return_trip_in_vendor: parent_trip[:has_return_trip_in_vendor] || false
+        amenities: trip.vehicle_type&.option_values || []
       )
     end
 
@@ -296,8 +274,7 @@ module SpreeCmCommissioner
           departure_time: stop.departure_time,
           arrival_time: stop.arrival_time,
           lat: stop.stop_place&.lat,
-          lon: stop.stop_place&.lon,
-          location_name: stop.location_place&.name
+          lon: stop.stop_place&.lon
         }
       end
     end

data/app/queries/spree_cm_commissioner/single_leg_trips_query.rb

@@ -78,7 +78,6 @@ module SpreeCmCommissioner
             LEFT JOIN cm_inventory_items AS date_iv ON date_iv.variant_id = trip_variant.id AND date_iv.inventory_date = '#{date.to_date}' AND date_iv.quantity_available >= #{number_of_guests}
             LEFT JOIN spree_prices AS date_prices ON date_prices.inventory_item_id = date_iv.id AND date_prices.deleted_at IS NULL
             LEFT JOIN (#{stops_subquery_sql}) all_stops ON all_stops.trip_id = cm_trips.id
-            #{return_metric_joins_sql}
           SQL
         )
         .where(<<~SQL.squish, origin: origin_id, destination: destination_id)
@@ -110,35 +109,7 @@ module SpreeCmCommissioner
         COALESCE(date_prices.amount, prices.amount) AS price,
         COALESCE(date_prices.compare_at_amount, prices.compare_at_amount) AS compare_at_price,
         COALESCE(date_prices.currency, prices.currency) AS currency,
-        all_stops.stops AS stops,
-        #{return_columns_sql}
-      SQL
-    end
-
-    # Expose whether a return (reverse-direction) trip exists, in two scopes, by reading the
-    # reverse-pair counters. Always computed (no return_date needed) so the response — and therefore
-    # the CDN/cache key — stays the same regardless of round-trip intent; the client filters by these
-    # flags locally when a return date is chosen. Date-agnostic by design (answers "a reverse route
-    # exists", not "a reverse trip runs on a specific date");
-    def return_columns_sql
-      <<~SQL.squish
-        COALESCE(global_return_metric.trip_count, 0) > 0 AS has_return_trip_globally,
-        COALESCE(vendor_return_metric.trip_count, 0) > 0 AS has_return_trip_in_vendor
-      SQL
-    end
-
-    # Reverse lookup: a trip A -> B has a return when a B -> A metric row has trips.
-    def return_metric_joins_sql
-      <<~SQL.squish
-        LEFT JOIN cm_route_metrics AS global_return_metric
-          ON global_return_metric.origin_place_id = cm_trips.destination_place_id
-         AND global_return_metric.destination_place_id = cm_trips.origin_place_id
-         AND global_return_metric.route_type = cm_trips.route_type
-        LEFT JOIN cm_vendor_route_metrics AS vendor_return_metric
-          ON vendor_return_metric.vendor_id = cm_trips.vendor_id
-         AND vendor_return_metric.origin_place_id = cm_trips.destination_place_id
-         AND vendor_return_metric.destination_place_id = cm_trips.origin_place_id
-         AND vendor_return_metric.route_type = cm_trips.route_type
+        all_stops.stops AS stops
       SQL
     end
 
@@ -157,13 +128,11 @@ module SpreeCmCommissioner
               'departure_time', ts.departure_time AT TIME ZONE 'UTC',
               'arrival_time', ts.arrival_time AT TIME ZONE 'UTC',
               'lat', p.lat,
-              'lon', p.lon,
-              'location_name', lp.name
+              'lon', p.lon
             ) ORDER BY ts.sequence
           ) AS stops
         FROM cm_trip_stops ts
         LEFT JOIN cm_places p ON p.id = ts.stop_place_id
-        LEFT JOIN cm_places lp ON lp.id = ts.location_place_id
         GROUP BY ts.trip_id
       SQL
     end

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Storefront
       class HomepageSectionSerializer < BaseSerializer
-        attributes :id, :title, :segments, :description, :active, :position, :preview, :created_at, :updated_at
+        attributes :id, :title, :segments, :description, :active, :position, :created_at, :updated_at
         has_many :homepage_section_relatables
       end
     end

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

@@ -35,16 +35,14 @@ module Spree
 
           base.has_one :google_wallet, serializer: SpreeCmCommissioner::V2::Storefront::GoogleWalletSerializer
 
-          base.has_many :guests, serializer: SpreeCmCommissioner::V2::Storefront::GuestMinimalSerializer
+          base.has_many :guests, serializer: SpreeCmCommissioner::V2::Storefront::GuestSerializer
 
           base.has_many :saved_guests, serializer: SpreeCmCommissioner::V2::Storefront::SavedGuestSerializer
 
-          base.has_many :pending_guests, serializer: SpreeCmCommissioner::V2::Storefront::GuestMinimalSerializer
+          base.has_many :pending_guests, serializer: SpreeCmCommissioner::V2::Storefront::GuestSerializer
 
           base.has_one :product, serializer: Spree::V2::Storefront::ProductSerializer
 
-          base.has_one :event, serializer: Spree::V2::Storefront::TaxonSerializer
-
           # completion_steps updates frequently
           base.cache_options store: nil
         end

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

@@ -12,9 +12,8 @@ module Spree
           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, :allow_transfer, :allow_gift_transfer
-          base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on, :preview
+          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),

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Storefront
       class RoleSerializer < BaseSerializer
-        attributes :name, :role_type
+        attributes :name
       end
     end
   end

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

@@ -15,8 +15,7 @@ module Spree
 
           base.attributes :custom_redirect_url, :kind, :subtitle, :from_date, :to_date,
                           :background_color, :foreground_color, :show_badge_status,
-                          :purchasable_on, :vendor_id, :available_on, :hide_video_banner,
-                          :preview
+                          :purchasable_on, :vendor_id, :available_on, :hide_video_banner
 
           # To get full seat layout details, call the seat_layouts API with this ID.
           base.attribute :seat_layout_ids, &:preload_seat_layout_ids

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Tenant
       class DynamicFieldSerializer < BaseSerializer
-        attributes :id, :label, :description, :data_type, :vendor_id, :multiple_select, :position, :data_fill_stage
+        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :position, :data_fill_stage
 
         has_many :dynamic_field_options, serializer: Spree::V2::Tenant::DynamicFieldOptionSerializer
       end

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

@@ -3,7 +3,7 @@ module Spree
     module Tenant
       class HomepageSectionSerializer < BaseSerializer
         attributes :id, :title, :segments, :description,
-                   :active, :position, :preview, :created_at, :updated_at
+                   :active, :position, :created_at, :updated_at
 
         has_many :homepage_section_relatables, serializer: ::Spree::V2::Tenant::HomepageSectionRelatableSerializer
       end

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Tenant
       class RoleSerializer < BaseSerializer
-        attributes :name, :presentation, :role_type
+        attributes :name
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        attributes :id, :label, :description, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at, :position, :data_fill_stage
+        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at, :position, :data_fill_stage
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end

data/app/serializers/spree_cm_commissioner/v2/storefront/guest_serializer.rb

@@ -8,7 +8,7 @@ module SpreeCmCommissioner
                    :qr_data, :social_contact_platform, :social_contact, :available_social_contact_platforms,
                    :age, :emergency_contact, :other_organization, :expectation, :upload_later, :address, :formatted_bib_number, :phone_number,
                    :token, :country_code, :contact, :data_fill_stage_phase,
-                   :saved_guest_id, :state
+                   :saved_guest_id
 
         # temporary, once app release after cm-app v1.9.1, we no longer need this.
         attribute :seat_number do |object|
@@ -30,8 +30,6 @@ module SpreeCmCommissioner
 
         has_many :check_ins, serializer: SpreeCmCommissioner::V2::Storefront::CheckInSerializer
 
-        has_many :ticket_transfers, serializer: SpreeCmCommissioner::V2::Storefront::TicketTransferMinimalSerializer
-
         # allowed_checkout updates frequently
         cache_options store: nil
       end

data/app/serializers/spree_cm_commissioner/v2/storefront/reserved_block_serializer.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class ReservedBlockSerializer < BaseSerializer
-        attributes :block_id, :gender
+        attributes :block_id
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_query_result_serializer.rb

@@ -4,8 +4,7 @@ module SpreeCmCommissioner
       class TripQueryResultSerializer < BaseSerializer
         set_type :trip_query_result
 
-        attributes :quantity_available, :max_capacity, :price, :compare_at_price, :currency, :display_price, :display_compare_at_price,
-                   :has_return_trip_globally, :has_return_trip_in_vendor
+        attributes :quantity_available, :max_capacity, :price, :compare_at_price, :currency, :display_price, :display_compare_at_price
 
         attribute :direct, &:direct?
         has_many :trips, serializer: ::SpreeCmCommissioner::V2::Storefront::TripResultSerializer

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_stop_serializer.rb

@@ -11,7 +11,6 @@ module SpreeCmCommissioner
                    :offset_days
 
         has_one :stop_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
-        has_one :location_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
       end
     end
   end

data/app/services/spree_cm_commissioner/api_caches/invalidate.rb

@@ -66,19 +66,12 @@ module SpreeCmCommissioner
             '/api/v2/storefront/homepage_data*'
           ],
           'Spree::Taxon' => ['/api/v2/storefront/taxons/:id*'],
-          'SpreeCmCommissioner::Show' => ['/api/v2/storefront/taxons/:id*'],
           'Spree::Product' => [
             '/api/v2/tenant/products/:id*',
             '/api/v2/tenant/products/:slug*',
             '/api/v2/storefront/products/:id*',
             '/api/v2/storefront/products/:slug*'
           ],
-          'SpreeCmCommissioner::ShowEpisode' => [
-            '/api/v2/tenant/products/:id*',
-            '/api/v2/tenant/products/:slug*',
-            '/api/v2/storefront/products/:id*',
-            '/api/v2/storefront/products/:slug*'
-          ],
           'Spree::Vendor' => [
             '/api/v2/tenant/vendors/:id*',
             '/api/v2/storefront/vendors/:id*',
@@ -94,15 +87,10 @@ module SpreeCmCommissioner
           'SpreeCmCommissioner::HomepageBackground' => homepage_background_patterns,
           'Spree::Menu' => ['/api/v2/storefront/menus/*'],
           'Spree::Taxon' => ['/api/v2/storefront/taxons/*'],
-          'SpreeCmCommissioner::Show' => ['/api/v2/storefront/taxons/*'],
           'Spree::Product' => [
             '/api/v2/tenant/products/*',
             '/api/v2/storefront/products/*'
           ],
-          'SpreeCmCommissioner::ShowEpisode' => [
-            '/api/v2/tenant/products/*',
-            '/api/v2/storefront/products/*'
-          ],
           'Spree::Vendor' => [
             '/api/v2/tenant/vendors/*',
             '/api/v2/storefront/vendors/*',