spree_cm_commissioner 2.5.0.pre.pre7 → 2.5.0.pre.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd65c0e3f9c574eac1886f0dd7872516ee4b06ce9de12c91cd56e9101ea37914
-  data.tar.gz: 223b2e1bc19876a282cf764cbfd45da3aeb3e13b671a9bafeaf697bed5938380
+  metadata.gz: 538969bdcdc4e74a70c795d9355b5c49357852b362d0534d208098434dcc8558
+  data.tar.gz: 14329cc3a2c2e8b0ae754057f65c6175c16e6f3251b9d16cd589efe64460ebde
 SHA512:
-  metadata.gz: 959b4855a961019439474b8dc5fb987650e65ecb96c6e3b9a12355d3487d6d067c5824317cc825c882c858cee64c23e21695448999c3caf6b852e7c7d73fbfdc
-  data.tar.gz: c3fe124a224836d629669bf723d80162253e1e732512870d1ddfbaf8bd2c115bb081eb058e7f9dc2acc1bdbe23b425bf9ad19ad2134d31c523c11163016eee0f
+  metadata.gz: 8f989e81e1e4fc89004874ac6fe64535b450aeff5d709127e125339c0a71f5f4fd35eb344722354950fb72c28dbd751325b4b9c44ac3acb73c3ea6473626bdca
+  data.tar.gz: 624b7a73bf7ac18e24a60de96e284a6c1f336d3efbc3d818cbcdb0bda0e1839a9107e9264af5924c934d0e383bac7093db07b88e3ab0543bf0e6512a1f46d3d0

data/.github/workflows/test_and_build_gem.yml

@@ -10,7 +10,7 @@ on:
       - reopened
     branches:
       - develop
-      - 3114-external-integration-milestone
+      - milestone-77-scalable-design
   push:
     tags:
       - "*"

data/.tool-versions

@@ -1 +1 @@
-ruby 3.2.0
+ruby 3.3.5

data/Gemfile.lock

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

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

@@ -19,7 +19,8 @@ module Spree
           # override
           def collection
             @collection ||= collection_finder.new.execute(
-              route_type: params[:route_type]
+              route_type: params[:route_type],
+              query: params[:query]
             )
           end
 
@@ -51,6 +52,11 @@ module Spree
             )
           end
 
+          # override
+          def required_schema
+            SpreeCmCommissioner::PopularRoutePlacesRequestSchema
+          end
+
           def include_vendors?
             resource_includes.include?(:vendors) || false
           end

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

@@ -3,22 +3,22 @@
 # GET /api/v2/storefront/route_places
 #
 # Finds places (origins or destinations) that are connected to a given place through existing routes.
-# Optionally filters results by keyword or route_type. Supports two modes:
+# Optionally filters results by query or route_type. Supports two modes:
 #
 # Usage 1: Connected places (requires place_id)
 #   - Finds places connected to a specific place via routes
 #   - Returns origins/destinations that have routes with the specified place
 #
-# Usage 2: Keyword search (requires query, place_id optional)
-#   - Searches all route places by keyword
-#   - Returns all origins/destinations matching the keyword
+# Usage 2: query search (requires query, place_id optional)
+#   - Searches all route places by query
+#   - Returns all origins/destinations matching the query
 #
 # Query Parameters:
 #   - place_type: [String] Required. Type of route place: 'origin' or 'destination'
 #     * 'origin': returns origins that have routes TO the specified place (if place_id provided)
 #     * 'destination': returns destinations that have routes FROM the specified place (if place_id provided)
 #   - place_id: [Integer] Optional. The place ID to find connected places for
-#   - query: [String] Optional. Keyword to filter place names (case-insensitive)
+#   - query: [String] Optional. query to filter place names (case-insensitive)
 #   - include: Optional comma-separated list (e.g., 'vendors,nearby_places')
 #
 # Response: Collection of places serialized with PlaceSerializer
@@ -27,15 +27,15 @@
 #   - Returns empty collection if place_type is invalid
 #   - If place_id provided: returns places connected to that place
 #   - If place_id blank: returns all origins/destinations
-#   - Filters results by keyword or route_type if provided
+#   - Filters results by query or route_type if provided
 #
 # @example Mode 1: Find destinations connected to origin place ID 123
 #   GET /api/v2/storefront/route_places?place_id=123&place_type=destination
 #
-# @example Mode 2: Search all destination places by keyword
+# @example Mode 2: Search all destination places by query
 #   GET /api/v2/storefront/route_places?place_type=destination&query=Phnom
 #
-# @example Combined: Find origins connected to place 456, filtered by keyword
+# @example Combined: Find origins connected to place 456, filtered by query
 #   GET /api/v2/storefront/route_places?place_id=456&place_type=origin&query=Siem
 module Spree
   module Api
@@ -49,7 +49,7 @@ module Spree
             @collection ||= collection_finder.new(
               place_type: params[:place_type],
               place_id: params[:place_id],
-              keyword: params[:query],
+              query: params[:query],
               route_type: params[:route_type]
             ).execute
           end

data/app/finders/spree_cm_commissioner/places/find_with_route.rb

@@ -2,14 +2,14 @@
 #
 # @param place_type [String] Required. 'origin' or 'destination'
 # @param place_id [Integer] Optional. Filter by connected place ID
-# @param keyword [String] Optional. Filter by place name (case-insensitive)
+# @param query [String] Optional. Filter by place name (case-insensitive)
 # @param route_type [Symbol, String] Optional. Filter by route type from associated trips (e.g., :ferry, :bus)
 #
 # @return [ActiveRecord::Relation<SpreeCmCommissioner::Place>]
 #
 # Modes:
 #   - place_id only: returns connected places (origins TO or destinations FROM given place)
-#   - keyword only: filters by name
+#   - query only: filters by name
 #   - route_type only: filters by trip route types on those routes
 #   - combinations: connected places filtered by name and/or route type
 #   - neither: all origins/destinations in routes
@@ -17,17 +17,17 @@
 # @example Origins with ferry trips to place 123
 #   FindWithRoute.new(place_type: 'origin', place_id: 123, route_type: :ferry).execute
 #
-# @example Destinations filtered by keyword and route type
-#   FindWithRoute.new(place_type: 'destination', keyword: 'Phnom', route_type: :bus).execute
+# @example Destinations filtered by query and route type
+#   FindWithRoute.new(place_type: 'destination', query: 'Phnom', route_type: :bus).execute
 module SpreeCmCommissioner
   module Places
     class FindWithRoute
-      attr_reader :place_type, :place_id, :keyword, :route_type
+      attr_reader :place_type, :place_id, :query, :route_type
 
-      def initialize(place_type:, place_id: nil, keyword: nil, route_type: nil)
+      def initialize(place_type:, place_id: nil, query: nil, route_type: nil)
         @place_type = place_type
         @place_id = place_id
-        @keyword = keyword
+        @query = query
         @route_type = route_type
       end
 
@@ -36,7 +36,7 @@ module SpreeCmCommissioner
         return SpreeCmCommissioner::Place.none if place_id.present? && !SpreeCmCommissioner::Place.exists?(place_id)
 
         result = scope
-        result = apply_keyword_filter(result) if keyword.present?
+        result = apply_query_filter(result) if query.present?
         result = apply_route_type_filter(result) if route_type.present?
         result
       end
@@ -57,8 +57,8 @@ module SpreeCmCommissioner
         end
       end
 
-      def apply_keyword_filter(result)
-        result.where('cm_places.name ILIKE ?', "%#{keyword}%")
+      def apply_query_filter(result)
+        result.where('cm_places.name ILIKE ?', "%#{query}%")
       end
 
       def apply_route_type_filter(result)

data/app/finders/spree_cm_commissioner/routes/find_popular.rb

@@ -24,26 +24,22 @@
 module SpreeCmCommissioner
   module Routes
     class FindPopular
-      def execute(route_type: nil)
-        scope(route_type: route_type)
+      def execute(route_type: nil, query: nil)
+        scope(route_type: route_type, query: query)
       end
 
       private
 
-      def scope(route_type: nil)
-        result = SpreeCmCommissioner::Route
-                 .includes(:origin_place, :destination_place)
+      def scope(route_type:, query:)
+        includes_associations = %i[origin_place destination_place]
+        includes_associations << :trips if route_type.present?
+        result = SpreeCmCommissioner::Route.includes(*includes_associations)
 
-        if route_type.present?
-          # Filter routes that have trips with the specified route_type
-          route_scope = SpreeCmCommissioner::Route
-                        .joins(:trips)
-                        .where(cm_trips: { route_type: route_type.to_sym })
-          result = result.where(id: route_scope.select(:id))
-        end
+        result = result.joins(:trips).where(cm_trips: { route_type: route_type.to_sym }) if route_type.present?
 
-        result.order(Arel.sql('COALESCE(fulfilled_order_count, 0) DESC'))
-              .order(Arel.sql('COALESCE(order_count, 0) DESC'))
+        result = result.where('cm_routes.route_name ILIKE ?', "%#{query}%") if query.present?
+
+        result.distinct.order(fulfilled_order_count: :desc, order_count: :desc)
       end
     end
   end

data/app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb

@@ -35,7 +35,7 @@ module SpreeCmCommissioner
       end
 
       def clear_inventory_cache
-        SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+        SpreeCmCommissioner.redis_pool.with do |redis|
           redis.del(inventory_item.redis_key)
         end
       end

data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb

@@ -1,10 +1,10 @@
 module SpreeCmCommissioner
   module Stock
     class InventoryItemsAdjusterJob < ApplicationUniqueJob
-      def perform(options = {})
-        variant = Spree::Variant.find(options[:variant_id])
+      def perform(variant_id:, quantity:)
+        variant = Spree::Variant.find(variant_id)
 
-        SpreeCmCommissioner::Stock::InventoryItemsAdjuster.call(variant: variant, quantity: options[:quantity])
+        SpreeCmCommissioner::Stock::InventoryItemsAdjuster.call(variant: variant, quantity: quantity)
       end
     end
   end

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

@@ -45,8 +45,7 @@ module SpreeCmCommissioner
       'color' => 'color',
       'ticket-type' => 'string',
       'seat-type' => 'string',
-      'intercity-taxi' => 'string',
-      'rules' => 'string'
+      'intercity-taxi' => 'string'
     }.freeze
 
     included do
@@ -57,7 +56,7 @@ module SpreeCmCommissioner
 
       validate :ensure_name_is_not_changed, on: :update
 
-      before_validation :set_reserved_options_attributes, if: :reserved_option?
+      before_validation :set_reverved_options_attributes, if: :reserved_option?
 
       after_save :sort_date_time_option_values, if: -> { attr_type == 'date' || attr_type == 'time' }
       after_save :update_variants_metadata, if: :saved_change_to_name?
@@ -69,17 +68,6 @@ module SpreeCmCommissioner
       end
     end
 
-    class_methods do
-      def rules_option_type = find_by(name: 'rules')
-
-      def ticket_type
-        Spree::OptionType.find_or_create_by!(name: 'ticket-type') do |ot|
-          ot.presentation = 'Ticket Type'
-          ot.kind = :variant
-        end
-      end
-    end
-
     def reserved_option?
       return name_was.in?(RESERVED_OPTIONS.keys) if name_changed?
 
@@ -90,7 +78,7 @@ module SpreeCmCommissioner
       name == 'ticket-type'
     end
 
-    def set_reserved_options_attributes
+    def set_reverved_options_attributes
       self.attr_type = RESERVED_OPTIONS[name]
       self.kind = :variant
     end

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

@@ -143,7 +143,6 @@ module SpreeCmCommissioner
         # The payment will be reversed in vPago gem, and `Spree::Checkout::Complete` will be called, which checks `order.reload.complete?`.
         # This is critical because if the order state is complete, the payment will be marked as paid.
 
-        unstock_inventory_from_external_system!
         reserve_blocks!
         unstock_inventory_in_redis!
 
@@ -162,7 +161,6 @@ module SpreeCmCommissioner
 
     def restock_inventory!
       ActiveRecord::Base.transaction do
-        restock_inventory_from_external_system!
         cancel_blocks!
         restock_inventory_in_redis!
       end

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

@@ -13,7 +13,6 @@
 # - integer
 # - array
 # - datetime
-# - hash
 #
 # Example usage:
 # ```
@@ -23,7 +22,6 @@
 #   store_public_metadata :completed, :boolean, default: true
 #   store_public_metadata :count, :integer, default: 5
 #   store_public_metadata :tags, :array, default: []
-#   store_public_metadata :tags, :hash
 #   store_private_metadata :app_token, :string,  default: "XYZ"
 #   store_public_metadata :scheduled_at, :datetime, default: Time.now
 # end
@@ -94,7 +92,7 @@ module SpreeCmCommissioner
       # - Return default if nil
       # - Cast to correct type
       # - Add `?` predicate for booleans
-      def define_metadata_reader(column_name, key, type, default) # rubocop:disable Metrics/CyclomaticComplexity
+      def define_metadata_reader(column_name, key, type, default)
         define_method(key) do
           metadata = send(column_name) || {}
           raw_value = metadata[key.to_s]
@@ -111,8 +109,6 @@ module SpreeCmCommissioner
             Array(raw_value)
           when :datetime
             Time.zone.parse(raw_value.to_s)
-          when :hash
-            raw_value.is_a?(Hash) ? raw_value : {}
           else
             raw_value
           end
@@ -122,7 +118,7 @@ module SpreeCmCommissioner
       end
 
       # Validates only new assignments (raw JSON values) for type safety
-      def define_metadata_validation(column_name, key, type) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/AbcSize
+      def define_metadata_validation(column_name, key, type) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         case type
         when :boolean
           validates key, inclusion: { in: [true, false] }, allow_nil: true
@@ -164,14 +160,6 @@ module SpreeCmCommissioner
               errors.add(key, 'is not a valid datetime')
             end
           end
-        when :hash
-          validate do
-            metadata = send(column_name) || {}
-            raw_value = metadata[key.to_s]
-            next if raw_value.nil?
-
-            errors.add(key, 'must be a hash') unless raw_value.is_a?(Hash)
-          end
         end
       end
     end

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

@@ -12,6 +12,9 @@ module SpreeCmCommissioner
       preference :brand_primary_color, :string, default: ''
       preference :redirect_target_host, :string, default: ''
       preference :redirect_excluded_paths, :string, default: ''
+      preference :facebook, :string, default: ''
+      preference :twitter, :string, default: ''
+      preference :instagram, :string, default: ''
     end
   end
 end

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

@@ -35,6 +35,12 @@ module SpreeCmCommissioner
                to: :options
     end
 
+    # Override variant.rb to return cached formatted options text, avoiding repeated database queries.
+    # Falls back to database queries & computing the format if preload data is unavailable.
+    def options_text
+      @options_text ||= public_metadata[:preload_options_text].presence || Spree::Variants::VisableOptionsPresenter.new(self).to_sentence
+    end
+
     def options
       @options ||= VariantOptions.new(self)
     end
@@ -105,7 +111,7 @@ module SpreeCmCommissioner
       # Precomputes the human-readable format (e.g., "Red, 256GB") to avoid
       # repeated formatting and association queries.
       # Example: {"color" => "red", "storage" => "256GB"} - option_type_name => option_value_name pairs
-      self.public_metadata[:preload_options_text] = Spree::Variants::VisibleOptionsPresenter.new(self).to_sentence
+      self.public_metadata[:preload_options_text] = Spree::Variants::VisableOptionsPresenter.new(self).to_sentence
     end
 
     def set_options_to_public_metadata!

data/app/models/spree_cm_commissioner/guest.rb

@@ -3,8 +3,6 @@ module SpreeCmCommissioner
   class Guest < SpreeCmCommissioner::Base # rubocop:disable Metrics/ClassLength
     include SpreeCmCommissioner::KycBitwise
     include SpreeCmCommissioner::PhoneNumberSanitizer
-    include SpreeCmCommissioner::StoreMetadata
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
 
     delegate :kyc, to: :line_item, allow_nil: true
     delegate :allowed_upload_later?, to: :line_item, allow_nil: true
@@ -214,20 +212,9 @@ module SpreeCmCommissioner
     end
 
     def qr_data
-      return external_qr_data if external_qr_data.present?
-
       token
     end
 
-    # QR data for check-in. If external_wins? is true, use their QR data (they have their own check-in system).
-    # Otherwise, use our system's QR data. Only applicable to models with QR support (e.g., line_item, guest).
-    def external_qr_data
-      return nil if line_item.nil? || !line_item.integration?
-
-      mapping = external_wins_integration_mappings.first
-      mapping.external_qr_data if mapping.present?
-    end
-
     def current_age
       return nil if dob.nil?
 

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -56,12 +56,8 @@ module SpreeCmCommissioner
       "inventory:#{id}"
     end
 
-    def quantity_in_redis
-      SpreeCmCommissioner.inventory_redis_pool.with { |redis| redis.get(redis_key).to_i }
-    end
-
     def adjust_quantity_in_redis(quantity)
-      SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+      SpreeCmCommissioner.redis_pool.with do |redis|
         # Always update Redis cache, even if it doesn't exist yet.
         # This prevents admin adjustments from being lost when cache is later initialized.
         script = <<~LUA

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -72,12 +72,10 @@ module SpreeCmCommissioner
     def self.include_modules(base)
       base.include Spree::Core::NumberGenerator.new(prefix: 'L')
       base.include SpreeCmCommissioner::StoreMetadata
-      base.include SpreeCmCommissioner::LineItemIntegration
       base.include SpreeCmCommissioner::LineItemDurationable
       base.include SpreeCmCommissioner::LineItemsFilterScope
       base.include SpreeCmCommissioner::LineItemGuestsConcern
       base.include SpreeCmCommissioner::LineItemTransitable
-      base.include SpreeCmCommissioner::Integrations::IntegrationMappable
       base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::KycBitwise
@@ -200,21 +198,11 @@ module SpreeCmCommissioner
     end
 
     def qr_data
-      return external_qr_data if external_qr_data.present?
       return nil if order.nil?
 
       "#{order.number}-#{order.token}-L#{id}"
     end
 
-    # QR data for check-in. If external_wins? is true, use their QR data (they have their own check-in system).
-    # Otherwise, use our system's QR data. Only applicable to models with QR support (e.g., line_item, guest).
-    def external_qr_data
-      return nil unless integration?
-
-      mapping = external_wins_integration_mappings.first
-      mapping.external_qr_data if mapping.present?
-    end
-
     def generate_completion_steps
       generate_completion_steps!
       true
@@ -267,7 +255,7 @@ module SpreeCmCommissioner
     end
 
     def update_vendor_id
-      self.vendor_id = variant&.vendor_id
+      self.vendor_id = variant.vendor_id
     end
 
     def subscription?

data/app/models/spree_cm_commissioner/option_type_decorator.rb

@@ -22,14 +22,6 @@ module SpreeCmCommissioner
       def base.rules_option_type
         Spree::OptionType.find_by(name: RULES_OPTION_TYPE_NAME)
       end
-
-      # override
-      def base.color
-        Spree::OptionType.find_or_create_by!(name: 'color') do |ot|
-          ot.presentation = 'Color'
-          ot.kind = :variant
-        end
-      end
     end
 
     private

data/app/models/spree_cm_commissioner/option_value_decorator.rb

@@ -3,36 +3,6 @@ module SpreeCmCommissioner
     def self.prepended(base)
       base.include SpreeCmCommissioner::OptionValueAttrType
       base.has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', foreign_key: :option_value_id, dependent: :destroy
-
-      base.validates :name, presence: true, uniqueness: { scope: :option_type_id, case_sensitive: -> { name_case_sensitive? } }
-
-      # Ticket types: case-SENSITIVE matching (preserve external API casing)
-      # Other types: case-INSENSITIVE storage (prevent duplicates from varying API casing; presentation keeps original)
-      def base.find_or_create_by_name!(option_type, name)
-        name = name.strip
-        if option_type.ticket_type?
-          where(option_type_id: option_type.id, name: name).first_or_create! do |ov|
-            ov.option_type = option_type
-            ov.name = name
-            ov.presentation = name
-          end
-        else
-          where(option_type_id: option_type.id).where('LOWER(name) = ?', name.downcase).first_or_create! do |ov|
-            ov.option_type = option_type
-            ov.name = name.downcase
-            ov.presentation = name
-          end
-        end
-      end
-    end
-
-    # Override Spree's name validation to make it case-sensitive only for ticket-type option values.
-    # Spree's default is case-insensitive (false), but we enforce case-sensitivity (true) for ticket-types.
-    # Which means ticket type "STANDARD" and "Standard" are different option values.
-    def name_case_sensitive?
-      return true if ticket_type?
-
-      false
     end
 
     def display_icon
@@ -44,9 +14,5 @@ module SpreeCmCommissioner
 end
 
 unless Spree::OptionValue.included_modules.include?(SpreeCmCommissioner::OptionValueDecorator)
-  # remove all name validations so we can override them in the decorator.
-  Spree::OptionValue._validators.reject! { |key, _| key == :name }
-  Spree::OptionValue._validate_callbacks.each { |c| c.filter.attributes.delete(:name) if c.filter.respond_to?(:attributes) }
-
   Spree::OptionValue.prepend SpreeCmCommissioner::OptionValueDecorator
 end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -3,7 +3,6 @@ module SpreeCmCommissioner
     def self.prepended(base) # rubocop:disable Metrics/MethodLength
       base.include SpreeCmCommissioner::StoreMetadata
       base.include SpreeCmCommissioner::PhoneNumberSanitizer
-      base.include SpreeCmCommissioner::OrderIntegration
       base.include SpreeCmCommissioner::OrderSeatable
       base.include SpreeCmCommissioner::OrderStateMachine
       base.include SpreeCmCommissioner::RouteOrderCountable

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -8,7 +8,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::TenantUpdatable
       base.include SpreeCmCommissioner::ServiceType
       base.include SpreeCmCommissioner::ServiceRecommendations
-      base.include SpreeCmCommissioner::Integrations::IntegrationMappable
 
       base.has_many :variant_kind_option_types, -> { where(kind: :variant).order(:position) },
                     through: :product_option_types, source: :option_type
@@ -90,7 +89,7 @@ module SpreeCmCommissioner
                                   request_to_book: 8
                                 }
 
-      base.belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant'
+      base.multi_tenant :tenant, class_name: 'SpreeCmCommissioner::Tenant'
       base.before_save :set_tenant
     end
 
@@ -143,7 +142,7 @@ module SpreeCmCommissioner
     end
 
     def set_event_id
-      self.event_id ||= taxons.select(&:event?).first&.parent_id
+      self.event_id = taxons.select(&:event?).first&.parent_id
     end
 
     def update_variants_vendor_id

data/app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb

@@ -12,7 +12,7 @@ module SpreeCmCommissioner
         keys = inventory_items.map { |item| "inventory:#{item.id}" }
         return [] unless keys.any?
 
-        counts = SpreeCmCommissioner.inventory_redis_pool.with { |redis| redis.mget(*keys) }
+        counts = SpreeCmCommissioner.redis_pool.with { |redis| redis.mget(*keys) }
         inventory_items.map.with_index do |inventory_item, i|
           ::SpreeCmCommissioner::CachedInventoryItem.new(
             inventory_key: keys[i],
@@ -32,7 +32,7 @@ module SpreeCmCommissioner
 
         # Use atomic SET NX to prevent race condition where multiple concurrent reads
         # initialize cache with stale values. Only the first thread wins.
-        SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+        SpreeCmCommissioner.redis_pool.with do |redis|
           redis.eval(set_nx_with_expiry_script, keys: [key], argv: [inventory_item.quantity_available, inventory_item.redis_expired_in])
         end
 

data/app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb

@@ -51,13 +51,13 @@ module SpreeCmCommissioner
       end
 
       def unstock(keys, quantities)
-        SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+        SpreeCmCommissioner.redis_pool.with do |redis|
           redis.eval(unstock_redis_script, keys: keys, argv: quantities)
         end.positive?
       end
 
       def restock(keys, quantities)
-        SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+        SpreeCmCommissioner.redis_pool.with do |redis|
           redis.eval(restock_redis_script, keys: keys, argv: quantities)
         end.positive?
       end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -5,7 +5,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::TaxonKind
       base.include SpreeCmCommissioner::ParticipationTypeBitwise
       base.include SpreeCmCommissioner::EventMetadata
-      base.include SpreeCmCommissioner::Integrations::IntegrationMappable
 
       base.has_many :taxon_vendors, class_name: 'SpreeCmCommissioner::TaxonVendor'
       base.has_many :vendors, through: :taxon_vendors

data/app/models/spree_cm_commissioner/taxonomy_decorator.rb

@@ -3,21 +3,9 @@ module SpreeCmCommissioner
     def self.prepended(base)
       base.include SpreeCmCommissioner::TaxonKind
 
-      def base.events
-        ActiveRecord::Base.connected_to(role: :writing) do
-          events = Spree::Taxonomy.find_or_create_by(name: 'Events', store: Spree::Store.default)
-          events.kind = :event
-          events.save if events.changed?
-          events
-        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)
-          businesses.kind = :category
-          businesses.save if businesses.changed?
-          businesses
+          Spree::Taxonomy.find_or_create_by(name: 'Businesses', kind: 'category', store: Spree::Store.default)
         end
       end
     end