spree_cm_commissioner 1.10.0 → 1.11.0.pre.pre

data/lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb

@@ -1,19 +1,51 @@
 FactoryBot.define do
   factory :cm_base_variant, parent: :base_variant do
+    is_master { false }
+    product { create(:cm_product) }
+
     transient do
       total_inventory { 10 }
+      backorderable { false }
+      pregenerate_inventory_items { true }
+      pre_inventory_days { nil } # optional for permanent only
     end
 
     after :create do |variant, evaluator|
       variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
+      variant.stock_items.update_all(backorderable: evaluator.backorderable)
+
+      if evaluator.pregenerate_inventory_items
+        variant.inventory_items.each { |item| item.adjust_quantity!(evaluator.total_inventory) }
+        SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(pre_inventory_days: evaluator.pre_inventory_days || 3) if variant.permanent_stock?
+      else
+        # make sure all inventory items are remove if exist.
+        variant.inventory_items.destroy_all
+      end
     end
   end
 
-  factory :cm_variant, parent: :variant do
-    product do
-      stock_locations = [create(:stock_location)]
-      product = create(:product, vendor: create(:active_vendor, stock_locations: stock_locations))
-      product
+  factory :cm_variant, parent: :cm_base_variant do
+    product { create(:cm_product) }
+
+    transient do
+      number_of_adults { nil }
+      number_of_kids { nil }
+    end
+
+    after(:create) do |variant, evaluator|
+      if evaluator.number_of_adults.present?
+        number_of_adults = create(:cm_option_type, :number_of_adults)
+        variant.product.option_types << number_of_adults
+        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_adults, name: evaluator.number_of_adults, option_type: number_of_adults)
+      end
+
+      if evaluator.number_of_kids.present?
+        number_of_kids = create(:cm_option_type, :number_of_kids)
+        variant.product.option_types << number_of_kids
+        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_kids, name: evaluator.number_of_kids, option_type: number_of_kids)
+      end
+
+      variant.save!
     end
   end
 
@@ -24,12 +56,13 @@ FactoryBot.define do
       duration { "1" }
       route { }
     end
+
     before(:create) do |trip, evaluator|
       trip.product = evaluator.route
 
       trip.option_values = [evaluator.departure_time, evaluator.duration]
-
     end
+
     after(:create) do |trip, evaluator|
       trip.stock_items = [create(:stock_item, variant: trip, stock_location: evaluator.product.vendor.stock_locations.first)]
       trip.stock_items.first.adjust_count_on_hand(10)

data/lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb

@@ -30,7 +30,7 @@ FactoryBot.define do
         if vendor.primary_product_type == :accommodation
           product = create(:cm_accommodation_product, vendor: vendor, total_inventory: evaluator.total_inventory)
         else
-          product = create(:product, vendor: vendor, product_type: vendor.primary_product_type)
+          product = create(:cm_product, vendor: vendor, product_type: vendor.primary_product_type)
           product.master.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
         end
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.10.0'.freeze
+  VERSION = '1.11.0-pre'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -19,6 +19,7 @@ require 'spree_cm_commissioner/user_session_jwt_token'
 require 'spree_cm_commissioner/trip_result'
 require 'spree_cm_commissioner/trip_query_result'
 require 'spree_cm_commissioner/trip_seat_layout_result'
+require 'spree_cm_commissioner/cached_inventory_item'
 
 require 'activerecord_multi_tenant'
 require 'google/cloud/recaptcha_enterprise'
@@ -44,3 +45,36 @@ require 'cm_app_logger'
 require 'counter_culture'
 
 require 'byebug' if Rails.env.development? || Rails.env.test?
+
+module SpreeCmCommissioner
+  class << self
+    # Allows overriding the default Redis connection pool with a custom one
+    attr_writer :redis_pool
+
+    def redis_pool
+      @redis_pool ||= default_redis_pool
+    end
+
+    # Resets the Redis pool, useful for testing or reinitialization
+    def reset_redis_pool
+      @redis_pool = nil
+    end
+
+    private
+
+    def default_redis_pool
+      pool_size = ENV.fetch('REDIS_POOL_SIZE', '5').to_i
+      timeout = ENV.fetch('REDIS_TIMEOUT', '5').to_i
+      redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/12')
+
+      ConnectionPool.new(size: pool_size, timeout: timeout) do
+        Redis.new(url: redis_url, timeout: timeout)
+      end
+    end
+  end
+
+  # Provides a configuration block for customizing SpreeCmCommissioner settings
+  def self.configure
+    yield self
+  end
+end

data/lib/tasks/create_default_non_permanent_inventory_items.rake

@@ -0,0 +1,16 @@
+# recommend to be used in schedule.yml & manually access in /sidekiq/cron
+namespace :spree_cm_commissioner do
+  desc 'Create default inventory items for non-permanent stock products'
+  task create_default_non_permanent_inventory_items: :environment do
+    Spree::Variant.active.with_non_permanent_stock.find_each do |variant|
+      total_purchases = variant.complete_line_items.sum(:quantity).to_i || 0
+      max_capacity = variant.total_on_hand || 0
+      quantity_available = [max_capacity - total_purchases, 0].max
+
+      variant.create_default_non_permanent_inventory_item!(
+        max_capacity: max_capacity,
+        quantity_available: quantity_available
+      )
+    end
+  end
+end

data/lib/tasks/ensure_correct_product_type.rake

@@ -0,0 +1,7 @@
+# recommend to be used in schedule.yml & manually access in /sidekiq/cron
+namespace :spree_cm_commissioner do
+  desc 'Ensure product_type in variants, line_items, inventory_items are correct with product'
+  task ensure_correct_product_type: :environment do
+    SpreeCmCommissioner::EnsureCorrectProductTypeJob.perform_now
+  end
+end

data/lib/tasks/generate_inventory_items.rake

@@ -0,0 +1,7 @@
+# recommend to be used in schedule.yml & schedule run it everyday
+namespace :spree_cm_commissioner do
+  desc 'Generate inventory items for permanent_stock variants.'
+  task generate_inventory_items: :environment do
+    SpreeCmCommissioner::Stock::PermanentInventoryItemsGeneratorJob.perform_now
+  end
+end

data/lib/tasks/migrate_and_rebuild_place_hierarchy.rake

@@ -0,0 +1,9 @@
+namespace :spree_cm_commissioner do
+  desc 'Migrate and Rebuild place hierarchy..'
+  task migrate_and_rebuild_place_hierarchy: :environment do
+    puts 'Resetting column information :lft and :rgt columns...'
+    SpreeCmCommissioner::Place.reset_column_information
+    SpreeCmCommissioner::Place.rebuild!
+    puts 'Place hierarchy rebuild completed successfully!'
+  end
+end

data/lib/tasks/update_orphan_root_places.rake

@@ -0,0 +1,7 @@
+namespace :spree_cm_commissioner do
+  desc 'Update orphan root places...'
+  task update_orphan_root_places: :environment do
+    count = SpreeCmCommissioner::Place.where(parent_id: 0).update_all(parent_id: nil) # rubocop:disable Rails/SkipsModelValidations
+    puts "#{count} orphan root places updated."
+  end
+end

data/spree_cm_commissioner.gemspec

@@ -54,6 +54,11 @@ Gem::Specification.new do |s|
   s.add_dependency "rqrcode", "~> 2.0"
   s.add_dependency "premailer-rails"
   s.add_dependency 'counter_culture', '~> 3.2'
+  # Redis
+  s.add_dependency 'redis'
+  s.add_dependency 'redis-rails'
+  s.add_dependency 'connection_pool'
+
   s.add_development_dependency 'pg'
   s.add_development_dependency 'spree_dev_tools'
   s.add_dependency 'blazer', '~> 3.0.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0.pre.pre
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-02 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -464,6 +464,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -788,6 +830,7 @@ files:
 - app/controllers/spree/api/v2/platform/seat_number_layouts_controller.rb
 - app/controllers/spree/api/v2/platform/taxons_controller_decorator.rb
 - app/controllers/spree/api/v2/resource_controller_decorator.rb
+- app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb
 - app/controllers/spree/api/v2/storefront/accommodations_controller.rb
 - app/controllers/spree/api/v2/storefront/account/orders_controller_decorator.rb
 - app/controllers/spree/api/v2/storefront/account/preferred_payment_method_controller.rb
@@ -958,6 +1001,8 @@ files:
 - app/exception_notifier/spree_cm_commissioner/telegram_notifier.rb
 - app/factory/spree_cm_commissioner/order_telegram_message_factory.rb
 - app/factory/spree_cm_commissioner/telegram_message_factory.rb
+- app/finders/spree_cm_commissioner/accommodations/find.rb
+- app/finders/spree_cm_commissioner/accommodations/find_variant.rb
 - app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb
 - app/finders/spree_cm_commissioner/orders/find.rb
 - app/finders/spree_cm_commissioner/orders/find_by_state.rb
@@ -1002,6 +1047,7 @@ files:
 - app/interactors/spree_cm_commissioner/customer_promotion_creator.rb
 - app/interactors/spree_cm_commissioner/enqueue_cart/add_item.rb
 - app/interactors/spree_cm_commissioner/enqueue_cart/add_item_status_marker.rb
+- app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb
 - app/interactors/spree_cm_commissioner/event_qr_generator.rb
 - app/interactors/spree_cm_commissioner/existing_account_checker.rb
 - app/interactors/spree_cm_commissioner/firebase_email_fetcher.rb
@@ -1015,6 +1061,7 @@ files:
 - app/interactors/spree_cm_commissioner/imported_csv_downloader.rb
 - app/interactors/spree_cm_commissioner/international_mobile_formatter.rb
 - app/interactors/spree_cm_commissioner/invalidate_cache_request.rb
+- app/interactors/spree_cm_commissioner/inventory_item_syncer.rb
 - app/interactors/spree_cm_commissioner/invoice_creator.rb
 - app/interactors/spree_cm_commissioner/media/signed_cookie_generator.rb
 - app/interactors/spree_cm_commissioner/media/signed_path_generator.rb
@@ -1044,6 +1091,9 @@ files:
 - app/interactors/spree_cm_commissioner/sms.rb
 - app/interactors/spree_cm_commissioner/sqs/media_convert_job_status.rb
 - app/interactors/spree_cm_commissioner/state_updater.rb
+- app/interactors/spree_cm_commissioner/stock/inventory_items_adjuster.rb
+- app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb
+- app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb
 - app/interactors/spree_cm_commissioner/subscriptions_order_creator.rb
 - app/interactors/spree_cm_commissioner/subscriptions_order_cron_executor.rb
 - app/interactors/spree_cm_commissioner/subscriptions_prepaid_order_creator.rb
@@ -1091,11 +1141,13 @@ files:
 - app/jobs/spree_cm_commissioner/customer_notification_cron_job.rb
 - app/jobs/spree_cm_commissioner/customer_notification_sender_job.rb
 - app/jobs/spree_cm_commissioner/enqueue_cart/add_item_job.rb
+- app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb
 - app/jobs/spree_cm_commissioner/ensure_event_id_for_guests_job.rb
 - app/jobs/spree_cm_commissioner/export_csv_job.rb
 - app/jobs/spree_cm_commissioner/firebase_email_fetcher_job.rb
 - app/jobs/spree_cm_commissioner/import_order_job.rb
 - app/jobs/spree_cm_commissioner/invalidate_cache_request_job.rb
+- app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb
 - app/jobs/spree_cm_commissioner/option_type_variants_public_metadata_updater_job.rb
 - app/jobs/spree_cm_commissioner/option_value_variants_public_metadata_updater_job.rb
 - app/jobs/spree_cm_commissioner/order_complete_telegram_sender_job.rb
@@ -1103,6 +1155,8 @@ files:
 - app/jobs/spree_cm_commissioner/sms_job.rb
 - app/jobs/spree_cm_commissioner/sms_pin_code_job.rb
 - app/jobs/spree_cm_commissioner/state_job.rb
+- app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb
+- app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb
 - app/jobs/spree_cm_commissioner/subscription_order_executor_job.rb
 - app/jobs/spree_cm_commissioner/telegram_debug_pin_code_sender_job.rb
 - app/jobs/spree_cm_commissioner/telegram_notification_sender_job.rb
@@ -1195,6 +1249,8 @@ files:
 - app/models/spree_cm_commissioner/image_methods_decorator.rb
 - app/models/spree_cm_commissioner/import.rb
 - app/models/spree_cm_commissioner/imports/import_order.rb
+- app/models/spree_cm_commissioner/inventory.rb
+- app/models/spree_cm_commissioner/inventory_item.rb
 - app/models/spree_cm_commissioner/invite.rb
 - app/models/spree_cm_commissioner/invite_user_event.rb
 - app/models/spree_cm_commissioner/invite_user_taxon.rb
@@ -1244,6 +1300,10 @@ files:
 - app/models/spree_cm_commissioner/promotion_decorator.rb
 - app/models/spree_cm_commissioner/property_decorator.rb
 - app/models/spree_cm_commissioner/prototype_decorator.rb
+- app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb
+- app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb
+- app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb
+- app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb
 - app/models/spree_cm_commissioner/role_decorator.rb
 - app/models/spree_cm_commissioner/role_permission.rb
 - app/models/spree_cm_commissioner/s3_presigned_url.rb
@@ -1256,6 +1316,7 @@ files:
 - app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb
 - app/models/spree_cm_commissioner/stock/inventory_unit_builder_decorator.rb
 - app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb
+- app/models/spree_cm_commissioner/stock/order_availability_checker.rb
 - app/models/spree_cm_commissioner/stock_item_decorator.rb
 - app/models/spree_cm_commissioner/stock_location_decorator.rb
 - app/models/spree_cm_commissioner/stop.rb
@@ -1267,6 +1328,8 @@ files:
 - app/models/spree_cm_commissioner/taxon_category_icon.rb
 - app/models/spree_cm_commissioner/taxon_decorator.rb
 - app/models/spree_cm_commissioner/taxon_home_banner.rb
+- app/models/spree_cm_commissioner/taxon_option_type.rb
+- app/models/spree_cm_commissioner/taxon_option_value.rb
 - app/models/spree_cm_commissioner/taxon_vendor.rb
 - app/models/spree_cm_commissioner/taxon_video_banner.rb
 - app/models/spree_cm_commissioner/taxon_web_banner.rb
@@ -1460,13 +1523,13 @@ files:
 - app/queries/spree_cm_commissioner/trip_search_query.rb
 - app/queries/spree_cm_commissioner/trip_seat_layout_query.rb
 - app/queries/spree_cm_commissioner/users_by_event_fetcher_query.rb
-- app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb
-- app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb
+- app/queries/spree_cm_commissioner/vendor_stop_place_query.rb
 - app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/application_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/profile_image_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/user_account_linkage_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/user_profile_request_schema.rb
+- app/request_schemas/spree_cm_commissioner/variant_request_schema.rb
 - app/serializables/spree_cm_commissioner/event_ticket_aggregator.rb
 - app/serializables/spree_cm_commissioner/pie_chart_event_aggregator.rb
 - app/serializables/spree_cm_commissioner/queue_item.rb
@@ -1791,7 +1854,9 @@ files:
 - app/views/spree/admin/shared/_video_on_demand_helper_script.html.erb
 - app/views/spree/admin/shared/sub_menu/_calendar.html.erb
 - app/views/spree/admin/shared/sub_menu/_homepage.html.erb
+- app/views/spree/admin/stock_managements/_events_popover.html.erb
 - app/views/spree/admin/stock_managements/_variant_stock_items.html.erb
+- app/views/spree/admin/stock_managements/calendar.html.erb
 - app/views/spree/admin/stock_managements/index.html.erb
 - app/views/spree/admin/system/show.html.erb
 - app/views/spree/admin/taxon_childrens/index.html.erb
@@ -2357,6 +2422,7 @@ files:
 - db/migrate/20250304101907_create_spree_cm_commissioner_invite.rb
 - db/migrate/20250304101946_create_spree_cm_commissioner_invite_user_taxon.rb
 - db/migrate/20250304155234_add_meta_data_to_spree_vendors.rb
+- db/migrate/20250304293518_create_cm_inventory_items.rb
 - db/migrate/20250307013422_add_parent_id_to_cm_place.rb
 - db/migrate/20250307073003_add_tenant_id_to_cm_customer_notifications.rb
 - db/migrate/20250307083809_remove_tenant_id_from_cm_notifications.rb
@@ -2372,9 +2438,17 @@ files:
 - db/migrate/20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb
 - db/migrate/20250404050117_add_archived_at_to_spree_orders.rb
 - db/migrate/20250407092556_add_variant_id_to_cm_trips.rb
+- db/migrate/20250418072528_add_nested_set_columns_to_places.rb
 - db/migrate/20250425084929_add_description_to_spree_prototypes.rb
 - db/migrate/20250425085938_add_preferences_to_spree_prototypes.rb
 - db/migrate/20250428025645_add_slug_to_spree_prototypes.rb
+- db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb
+- db/migrate/20250430091742_create_cm_taxon_option_types.rb
+- db/migrate/20250430092928_create_cm_taxon_option_values.rb
+- db/migrate/20250502025848_add_index_to_spree_products.rb
+- db/migrate/20250502030001_add_product_type_to_spree_variants.rb
+- db/migrate/20250502030002_add_product_type_to_spree_line_items.rb
+- db/migrate/20250506092929_add_trip_count_to_cm_vendor_stops.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2389,11 +2463,12 @@ files:
 - docs/webhook/sqs/params_job_submitted.json
 - lib/cm_app_logger.rb
 - lib/generators/spree_cm_commissioner/install/install_generator.rb
-- lib/generators/spree_cm_commissioner/install/templates/app/javascript/spree_cm_commissioner/utilities.js
+- lib/generators/spree_cm_commissioner/install/templates/app/javascript/spree_dashboard/spree_cm_commissioner/utilities.js
 - lib/generators/spree_cm_commissioner/install/templates/config/data/nationalities.yml
 - lib/generators/spree_cm_commissioner/install/templates/vendor/assets/javascript/spree_cm_commissioner/telegram/all.js
 - lib/generators/spree_cm_commissioner/install/templates/vendor/assets/stylesheets/spree_cm_commissioner/telegram/all.css
 - lib/spree_cm_commissioner.rb
+- lib/spree_cm_commissioner/cached_inventory_item.rb
 - lib/spree_cm_commissioner/calendar_event.rb
 - lib/spree_cm_commissioner/engine.rb
 - lib/spree_cm_commissioner/factories.rb
@@ -2428,6 +2503,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/id_card_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/image_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/inventory_item_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/invite_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/invite_user_event_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb
@@ -2482,15 +2558,20 @@ files:
 - lib/spree_cm_commissioner/trip_seat_layout_result.rb
 - lib/spree_cm_commissioner/user_session_jwt_token.rb
 - lib/spree_cm_commissioner/version.rb
+- lib/tasks/create_default_non_permanent_inventory_items.rake
 - lib/tasks/customer_notification_cron_scheduler.rake
+- lib/tasks/ensure_correct_product_type.rake
 - lib/tasks/ensure_event_for_guests.rake
 - lib/tasks/ensure_number_for_line_items.rake
 - lib/tasks/fetch_email.rake
+- lib/tasks/generate_inventory_items.rake
 - lib/tasks/kh_location_option_values.rake
 - lib/tasks/kh_provinces.rake
+- lib/tasks/migrate_and_rebuild_place_hierarchy.rake
 - lib/tasks/remove_duplicate_device_tokens.rake
 - lib/tasks/subscriptions_order_creator.rake
 - lib/tasks/update_gateway_status.rake
+- lib/tasks/update_orphan_root_places.rake
 - lib/tasks/update_taxons.rake
 - lib/tasks/variants_public_metadata_updater.rake
 - lib/tasks/vendor_updater.rake
@@ -2518,9 +2599,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1

data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb

@@ -1,45 +0,0 @@
-module SpreeCmCommissioner
-  module VariantAvailability
-    class NonPermanentStockQuery
-      attr_reader :variant, :except_line_item_id, :error_message
-
-      def initialize(variant:, except_line_item_id: nil)
-        @variant = variant
-        @except_line_item_id = except_line_item_id
-        @error_message = nil
-      end
-
-      def available?(quantity)
-        reserve_variants =
-          Spree::LineItem
-          .complete
-          .select('(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity')
-          .joins(variant: :stock_items)
-          .where(variant_id: variant.id)
-          .where.not(id: except_line_item_id)
-          .group(:variant_id)
-
-        # there is a case when variant does not have any purchaces yet, it will return empty & always available true.
-        # in this case, we check with stock items directly.
-
-        available_quantity = if reserve_variants.any?
-                               reserve_variants.sum(&:available_quantity)
-                             else
-                               variant.stock_items.sum(:count_on_hand)
-                             end
-        if available_quantity >= quantity
-          true
-        elsif available_quantity == 1
-          @error_message = I18n.t('variant_availability.item_available_instock')
-          false
-        elsif available_quantity <= 0
-          @error_message = I18n.t('variant_availability.items_out_of_stock')
-          false
-        else
-          @error_message = I18n.t('variant_availability.items_available_instock', available_quantity: available_quantity)
-          false
-        end
-      end
-    end
-  end
-end

data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb

@@ -1,55 +0,0 @@
-module SpreeCmCommissioner
-  module VariantAvailability
-    class PermanentStockQuery
-      attr_reader :variant, :from_date, :to_date, :except_line_item_id
-
-      def initialize(variant:, from_date:, to_date:, except_line_item_id: nil)
-        @variant = variant
-        @from_date = from_date
-        @to_date = to_date
-        @except_line_item_id = except_line_item_id
-      end
-
-      def available?(quantity)
-        (from_date..from_date).all? do |booking_date|
-          booked_date_quantity[booking_date].nil? ||
-            (booked_date_quantity[booking_date] - quantity) >= 0
-        end
-      end
-
-      def booked_date_quantity
-        dates_sql = ApplicationRecord.sanitize_sql_array(
-          [
-            'SELECT date FROM generate_series(?::date, ?::date, ?) AS date',
-            from_date,
-            to_date,
-            date_interval
-          ]
-        )
-
-        @booked_variants ||=
-          Spree::LineItem
-          .complete
-          .select(
-            '(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity',
-            'dates.date AS reservation_date'
-          )
-          .joins(variant: :stock_items)
-          .where(variant_id: variant.id)
-          .where.not(id: except_line_item_id)
-          .joins("INNER JOIN (#{dates_sql}) dates ON dates.date >= spree_line_items.from_date AND dates.date < spree_line_items.to_date")
-          .group(:variant_id, :reservation_date)
-          .order(:reservation_date)
-          .each_with_object({}) do |record, hash|
-            hash[record.reservation_date.to_date] = record.available_quantity
-          end
-      end
-
-      # override this for product that have
-      # different date time interval than 1 day.
-      def date_interval
-        '1 day'
-      end
-    end
-  end
-end