spree_cm_commissioner 2.0.3.pre.pre3 → 2.0.3.pre.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5002e62ca5423aa0f8f048cc8c1f5aa1d5e6ad8cfa432a0db2c0f7d4ef5aabde
-  data.tar.gz: d640c0e1e081b49f5317491c4bfb1a0a66903db15c22d97354f274d3fa4200b8
+  metadata.gz: 77b1bb538cec3e8a50a719a2cbe1661a89764c047fd541e9708b28f9e44d2558
+  data.tar.gz: cc538f4c9186d518ca763b81249d9523ac90ccd630f59a23f9fdc84cc36d7e1b
 SHA512:
-  metadata.gz: 71efbcfc0e5960c3a8a80eb18791c0095d52f476c5a69a068df695524e5352372070dca03279df3961536ba0de88ffca48bff6c5b53597b29be2b513cf9d9ce3
-  data.tar.gz: 5c5632425f155a19970e0ea0d61d9e3d492fc56986bef12802158fc808099d4f8e71f2749116712bcbce87f6dc79ef500922fceff5c68d99177cf83a393d2c2f
+  metadata.gz: a77f8248919f1ab8c7d809b8bbed56507fdfb24d90af9b12560d1f8eb8545f579dd6c9d49828b1ed44aee17424f4ef33a558adadd15b8a0f5e4c37f01160b528
+  data.tar.gz: ca845ddc028be9cebd749cae86cb1e3a72b563c98413f0d10edd2ea92b2efe1e4cc09f44b47a691274e4dfffd15a5c526ce4e4f2c711ca580ff3a8ec8289a480

data/.github/workflows/test_and_build_gem.yml

@@ -10,7 +10,6 @@ on:
       - reopened
     branches:
       - develop
-      - milestone-77-scalable-design
   push:
     tags:
       - "*"
@@ -38,8 +37,7 @@ jobs:
               console.log("PR title format is correct.");
             }
       - name: Check commit messages format
-        # skip validation if the PR is from the milestone-77-scalable-design branch for temporary
-        if: github.event_name == 'pull_request' && github.head_ref != 'milestone-77-scalable-design'
+        if: github.event_name == 'pull_request'
         uses: actions/github-script@v7
         with:
           script: |
@@ -138,17 +136,6 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
-      redis:
-        image: redis
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379 # Maps port 6379 on service container to the host
-
     steps:
       - uses: actions/checkout@v3
 
@@ -184,9 +171,8 @@ jobs:
       - name: Run test
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-          REDIS_URL: redis://localhost:6379/0
 
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'develop'
         run: |
           bundle exec rake
 

data/.gitignore

@@ -28,5 +28,4 @@ node_modules
 # VScode
 .vscode
 !.vscode/.settings.json
-.env
-vendor/bundle/
+.env

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.0.3.pre.pre3)
+    spree_cm_commissioner (2.0.3.pre.pre4)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -42,7 +42,6 @@ PATH
       aws-sdk-s3
       blazer (~> 3.0.4)
       byebug
-      connection_pool
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
       elasticsearch (~> 8.5)
@@ -55,12 +54,9 @@ PATH
       interactor (~> 3.1)
       jwt (>= 2.5.0)
       noticed (~> 1.6)
-      paper_trail (~> 16.0)
       phonelib
       premailer-rails
       rails (~> 7.0.4)
-      redis
-      redis-rails
       rqrcode (~> 2.0)
       searchkick (~> 5.1)
       simple_calendar (~> 2.4)
@@ -588,9 +584,6 @@ GEM
       sawyer (~> 0.9)
     orm_adapter (0.5.0)
     os (1.1.4)
-    paper_trail (16.0.0)
-      activerecord (>= 6.1)
-      request_store (~> 1.4)
     parallel (1.23.0)
     paranoia (2.6.3)
       activerecord (>= 5.1, < 7.2)
@@ -626,8 +619,6 @@ GEM
       activesupport (>= 2.3.14)
     racc (1.7.1)
     rack (2.2.8)
-    rack-session (1.0.2)
-      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -671,31 +662,13 @@ GEM
     rbtree (0.4.6)
     redis (5.0.7)
       redis-client (>= 0.9.0)
-    redis-actionpack (5.5.0)
-      actionpack (>= 5)
-      redis-rack (>= 2.1.0, < 4)
-      redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.3.0)
-      activesupport (>= 3, < 8)
-      redis-store (>= 1.3, < 2)
     redis-client (0.17.0)
       connection_pool
-    redis-rack (3.0.0)
-      rack-session (>= 0.2.0)
-      redis-store (>= 1.2, < 2)
-    redis-rails (5.0.2)
-      redis-actionpack (>= 5.0, < 6)
-      redis-activesupport (>= 5.0, < 6)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.11.0)
-      redis (>= 4, < 6)
     regexp_parser (2.8.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    request_store (1.7.0)
-      rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
@@ -14,37 +14,8 @@ task :default do
   Rake::Task[:spec].invoke
 end
 
-# Copied from:
-# spree_core:lib/spree/testing_support/common_rake.rb
-# But refactored to skip frontend & backend setup.
 desc 'Generates a dummy app for testing'
-task :test_app do |_t, args|
-  require 'spree_cm_commissioner'
-  require "generators/spree_cm_commissioner/install/install_generator"
-
-  Rails.env = ENV['RAILS_ENV'] = 'test'
-
-  Spree::DummyGeneratorHelper.inject_extension_requirements = true
-  Spree::DummyGenerator.start ["--lib_name=spree_cm_commissioner", '--quiet']
-  Spree::InstallGenerator.start [
-    "--lib_name=spree_cm_commissioner",
-    '--auto-accept',
-    '--migrate=false',
-    '--seed=false',
-    '--sample=false',
-    '--quiet',
-    '--copy_storefront=false',
-    "--install_storefront=false",
-    "--install_admin=false",
-    "--user_class=Spree::User"
-  ]
-
-  puts 'Setting up dummy database...'
-  system('bin/rails db:environment:set RAILS_ENV=test')
-  system('bundle exec rake db:drop db:create')
-  Spree::DummyModelGenerator.start
-  system('bundle exec rake db:migrate')
-
-  puts 'Running extension installation generator...'
-  SpreeCmCommissioner::Generators::InstallGenerator.start(['--auto-run-migrations'])
+task :test_app do
+  ENV['LIB_NAME'] = 'spree_cm_commissioner'
+  Rake::Task['extension:test_app'].invoke
 end

data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss

@@ -55,9 +55,8 @@ $day-background: theme-color("light");
     }
   }
 
-  .wday-0 {
-    background-color: darken($day-background, 5%);
-  }
+  // .wday-0 {
+  // }
 
   // .wday-1 {
   // }
@@ -74,9 +73,8 @@ $day-background: theme-color("light");
   // .wday-5 {
   // }
 
-  .wday-6 {
-    background-color: darken($day-background, 5%);
-  }
+  // .wday-6 {
+  // }
 
   // .today {
   // }
@@ -88,7 +86,9 @@ $day-background: theme-color("light");
   // }
 
   // known as active-date
-  // .start-date {}
+  .start-date {
+    background-color: darken($day-background, 5%);
+  }
 
   // .prev-month {
   // }
@@ -159,8 +159,11 @@ $day-background: theme-color("light");
 
     // .current-month {}
     .has-events {
+      background-color: lighten(theme-color("warning"), 30%);
+      color: darken(theme-color("warning"), 50%);
+
       @include hover {
-        background-color: rgba($dark, 0.1);
+        background-color: theme-color("warning");
       }
     }
 

data/app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb

@@ -0,0 +1,44 @@
+module SpreeCmCommissioner
+  module Transit
+    module TaxonBitwise
+      extend ActiveSupport::Concern
+
+      BIT_STOP = 0b001
+      BIT_STATION = 0b010
+      BIT_BRANCH = 0b100
+      BIT_LOCATION = 0b1000
+
+      included do
+        attr_accessor :stop, :station, :branch, :location
+
+        before_validation :at_least_one_checkbox_selected
+      end
+
+      def stop?
+        data_type & BIT_STOP != 0
+      end
+
+      def station?
+        data_type & BIT_STATION != 0
+      end
+
+      def branch?
+        data_type & BIT_BRANCH != 0
+      end
+
+      def location?
+        data_type & BIT_LOCATION != 0
+      end
+
+      private
+
+      def at_least_one_checkbox_selected
+        if stop.nil? && station.nil? && branch.nil? && location.nil?
+          nil
+        elsif stop.to_i.zero? && station.to_i.zero? && branch.to_i.zero? && location.to_i.zero?
+          errors.add(:base, 'At least one checkbox (stop, branch, or location) must be selected')
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/stock_managements_controller.rb

@@ -5,8 +5,6 @@ module Spree
 
       before_action :load_parent
 
-      helper_method :inventory_item_message
-
       def load_parent
         @product = Spree::Product.find_by(slug: params[:product_id])
       end
@@ -14,59 +12,9 @@ module Spree
       def index
         @variants = @product.variants.includes(:images, stock_items: :stock_location, option_values: :option_type)
         @variants = [@product.master] if @variants.empty?
-        @stock_locations = (@variants.flat_map(&:stock_locations) + @product.vendor.stock_locations).uniq
-
-        load_inventories unless @product.permanent_stock?
-      end
-
-      def create
-        result = SpreeCmCommissioner::Stock::StockMovementCreator.call(
-          variant_id: params[:variant_id],
-          stock_location_id: params[:stock_location_id],
-          current_store: current_store,
-          stock_movement_params: stock_movement_params
-        )
-
-        if result.success?
-          flash[:success] = flash_message_for(result.stock_movement, :successfully_created)
-        else
-          flash[:error] = result.message
-        end
-
-        redirect_back fallback_location: admin_product_stock_managements_path(@product)
-      end
-
-      # GET /products/:slug/stock_managements/calendar?year=
-      def calendar
-        @year = params[:year].present? ? params[:year].to_i : Time.zone.today.year
 
-        from_date = Date.new(@year, 1, 1).beginning_of_year
-        to_date = Date.new(@year, 1, 1).end_of_year
-
-        @inventory_items = @product.inventory_items.includes(:variant, :prices).where(inventory_date: from_date..to_date).to_a
-        @cached_inventory_items = ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(@inventory_items)
-                                                                                                .call
-                                                                                                .index_by(&:inventory_item_id)
-        @events = SpreeCmCommissioner::CalendarEvent.from_inventory_items(@inventory_items)
-      end
-
-      def inventory_item_message(inventory_item, cached_inventory_item)
-        synced = inventory_item.quantity_available == cached_inventory_item.quantity_available
-
-        if synced
-          "Synced: Quantity available matches in both DB and Redis (#{cached_inventory_item.quantity_available})."
-        else
-          "Out of sync: Redis shows #{cached_inventory_item.quantity_available} available, which doesn't match the database."
-        end
-      end
-
-      private
+        @stock_locations = (@variants.flat_map(&:stock_locations) + @product.vendor.stock_locations).uniq
 
-      def load_inventories
-        @inventory_items = @product.inventory_items.group_by { |item| item.variant.id }
-        @cached_inventory_items = ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(@product.inventory_items)
-                                                                                                .call
-                                                                                                .index_by(&:inventory_item_id)
         @reserved_stocks = Spree::LineItem
                            .complete
                            .where(variant_id: @variants.pluck(:id))
@@ -77,16 +25,6 @@ module Spree
       def model_class
         Spree::StockItem
       end
-
-      # This method processes the parameters for stock movement creation.
-      # Expected attributes for `stock_movement` include:
-      # - :quantity (Integer): The quantity of stock to move.
-      # - :action (String): The type of stock movement (e.g., "add" or "remove").
-      # - :originator_id, :originator_ty (String, optional): The ID and type of the entity creating the stock movement.
-      # Ensure that `permitted_stock_movement_attributes` is updated to reflect any changes.
-      def stock_movement_params
-        params.require(:stock_movement).permit(permitted_stock_movement_attributes)
-      end
     end
   end
 end

data/app/controllers/spree/api/v2/operator/event_charts_controller.rb

@@ -11,17 +11,11 @@ module Spree
             types = ADDITIONAL_FIELDS + kyc_fields
 
             resources = types.map do |type|
-              event_chart = SpreeCmCommissioner::EventChartQueries.new(
-                taxon_id: params[:taxon_id],
-                chart_type: type,
-                refreshed: params[:refreshed] || false
-              ).call
-
               # Create unique ID by using chart_type as the identifier
               SpreeCmCommissioner::EventChart.new(
                 id: type.to_s,
-                chart_type: event_chart.chart_type,
-                product_charts: event_chart.product_charts
+                chart_type: type,
+                product_charts: nil
               )
             end
 

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

@@ -5,38 +5,55 @@ module Spree
         class AccommodationsController < ::Spree::Api::V2::ResourceController
           private
 
-          # override
           def collection
-            @collection ||= SpreeCmCommissioner::Accommodations::Find.new(
-              from_date: params[:from_date]&.to_date,
-              to_date: params[:to_date]&.to_date,
-              state_id: params[:province_id],
-              number_of_adults: params[:adult].to_i,
-              number_of_kids: params[:children].to_i
-            ).execute
+            @collection ||= collection_finder.call(params: params).value
+          end
+
+          def paginated_collection
+            return @paginated_collection if defined?(@paginated_collection)
+
+            @paginated_collection = super
+            @paginated_collection = apply_service_availability(@paginated_collection)
           end
 
-          # override
           def resource
-            @resource ||= collection.find_by!(slug: params[:id])
+            resource = resource_finder.call(params: params).value
+            raise ActiveRecord::RecordNotFound if resource.nil?
+
+            apply_service_availability(resource)
+          end
+
+          def apply_service_availability(resource)
+            SpreeCmCommissioner::ApplyServiceAvailability.call(calendarable: resource,
+                                                               from_date: params[:from_date].to_date,
+                                                               to_date: params[:to_date].to_date
+                                                              ).value
           end
 
-          # override
           def allowed_sort_attributes
             super << :min_price << :max_price
           end
 
-          # override
+          def model_class
+            Spree::Vendor
+          end
+
           def resource_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
-          # override
           def collection_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
-          # override
+          def collection_finder
+            SpreeCmCommissioner::AccommodationSearchDetail
+          end
+
+          def resource_finder
+            SpreeCmCommissioner::AccommodationSearchDetail
+          end
+
           def required_schema
             SpreeCmCommissioner::AccommodationRequestSchema
           end

data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb

@@ -12,9 +12,9 @@ module Spree
               spree_authorize! :update, spree_current_order, order_token
               spree_authorize! :show, @variant
 
-              availability_checker = SpreeCmCommissioner::Stock::AvailabilityChecker.new(@variant, add_item_params[:options])
+              availability_checker = SpreeCmCommissioner::Stock::AvailabilityChecker.new(@variant)
 
-              unless availability_checker.can_supply?(add_item_params[:quantity].to_i)
+              unless availability_checker.can_supply?(add_item_params[:quantity].to_i, add_item_params[:options])
                 return render_error_payload(availability_checker.error_message || I18n.t('variant_availability.items_out_of_stock'))
               end
 

data/app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb

@@ -0,0 +1,20 @@
+module SpreeCmCommissioner
+  module LineItems
+    module FindByVariantDecorator
+      # ovveride
+      def execute(order:, variant:, options: {})
+        return super unless variant.product.product_type == 'transit'
+
+        order.line_items.detect do |line_item|
+          next if options[:date].present? && !(line_item.variant_id == variant.id && line_item.date == options[:date])
+
+          Spree::Dependencies.cart_compare_line_items_service.constantize.call(order: order, line_item: line_item, options: options).value
+        end
+      end
+    end
+  end
+end
+
+unless Spree::LineItems::FindByVariant.included_modules.include?(SpreeCmCommissioner::LineItems::FindByVariantDecorator)
+  Spree::LineItems::FindByVariant.prepend(SpreeCmCommissioner::LineItems::FindByVariantDecorator)
+end

data/app/jobs/spree_cm_commissioner/application_job.rb

@@ -1,25 +1,5 @@
 module SpreeCmCommissioner
   class ApplicationJob < ::ApplicationJob
     queue_as :default
-
-    around_perform :log_exceptions
-
-    private
-
-    def log_exceptions
-      yield
-    rescue StandardError => e
-      CmAppLogger.log(
-        label: "#{self.class.name} failed",
-        data: {
-          error_class: e.class.name,
-          error_message: e.message,
-          arguments: arguments.inspect,
-          backtrace: e.backtrace&.first(5)&.join("\n")
-        }
-      )
-
-      raise # Re-raise the exception to let Sidekiq handle retries or failure
-    end
   end
 end

data/app/jobs/spree_cm_commissioner/application_unique_job.rb

@@ -2,25 +2,5 @@
 module SpreeCmCommissioner
   class ApplicationUniqueJob < ::ApplicationUniqueJob
     queue_as :default
-
-    around_perform :log_exceptions
-
-    private
-
-    def log_exceptions
-      yield
-    rescue StandardError => e
-      CmAppLogger.log(
-        label: "#{self.class.name} failed",
-        data: {
-          error_class: e.class.name,
-          error_message: e.message,
-          arguments: arguments.inspect,
-          backtrace: e.backtrace&.first(5)&.join("\n")
-        }
-      )
-
-      raise # Re-raise the exception to let Sidekiq handle retries or failure
-    end
   end
 end

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

@@ -18,23 +18,29 @@ module SpreeCmCommissioner
     def date_unit
       return nil unless permanent_stock?
 
-      date_range.size
+      date_range_excluding_checkout.size if accommodation?
     end
 
-    def date_range
+    def date_range_excluding_checkout
       return [] unless date_present?
 
-      (from_date.to_date..to_date.to_date).to_a
+      date_range = (from_date.to_date..to_date.to_date).to_a
+      date_range.pop if date_range.size > 1
+      date_range
     end
 
-    def checkin_date
-      from_date&.to_date
-    end
+    def date_range_including_checkout
+      return [] unless date_present?
 
-    def checkout_date
-      return to_date ? to_date.to_date - 1.day : nil if accommodation?
+      (from_date.to_date..to_date.to_date).to_a
+    end
 
-      to_date&.to_date
+    def date_range
+      if accommodation?
+        date_range_excluding_checkout
+      else
+        date_range_including_checkout
+      end
     end
 
     private

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

@@ -14,6 +14,13 @@ module SpreeCmCommissioner
       state_selection
       payment_option
       delivery_option
+      amenity
+      departure_time
+      duration
+      vehicle_id
+      origin
+      destination
+      place_id
     ].freeze
 
     RESERVED_OPTIONS = {
@@ -41,8 +48,11 @@ module SpreeCmCommissioner
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
       'seat-number-positions' => 'array',
-      'seat-type' => 'string',
-      'intercity-taxi' => 'string'
+      'origin' => 'place_id',
+      'destination' => 'place_id',
+      'departure-time' => 'time',
+      'vehicle' => 'vehicle_id',
+      'allow-seat-selection' => 'boolean'
     }.freeze
 
     included do