spree_cm_commissioner 1.18.2.pre.pre1 → 2.0.0.pre.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a65e24463b1ee3637a58c514292c89d69654bb50e80cc26654d334b235a1418f
-  data.tar.gz: 8082b3770111363b6e7100c01cfb1a2b31a78c6e5e211cb96af4278495a224dd
+  metadata.gz: 0c84700dfc0c91553426b4c3957ab2e2906f4327f9b968efe1d88ce590d69a63
+  data.tar.gz: c98479e1dd2ff5f4def2b7799ff2ffc894812dd737e52a6e2488839318ca514b
 SHA512:
-  metadata.gz: 9bbf56e0af387769a6030cc47eb6cc5c214b198d288262b6f997bfb0a93df3d6f45912a411693c89155faca7bc268d67bdf3000c4ead3f2fb7f881ee198790ef
-  data.tar.gz: d3bab592404b7495e5685c7da6f741c7f6aa3743e8aa46b68b6077d8e45f5e5bb35b66a22205977ecc57ae2438e251297806008c526d61e39babe7ab3ad17c6c
+  metadata.gz: ddc75d3e7e17ad18de9c620336c8233191f268bd2c18911455b6169f4a6a379b2d8d537e1a7cc6c2d8f280842772b787d19d3215263cf3a6856309f263712512
+  data.tar.gz: 551e01c90befa48ad8fa44adc40e9be2af4bda32319f05e562d66d099a0d729477f9ade32aee9c9256728481756e35ccec863782d033962756daba9720e868e8

data/.env.example

@@ -24,6 +24,3 @@ WAITING_ROOM_DISABLED=no
 # Vattanac Bank
 VATTANAC_AES_SECRET_KEY= ""
 VATTANAC_PUBLIC_KEY=""
-
-# Organizer URL
-ORGANIZER_URL=http://127.0.0.1:4000/organizer

data/.github/workflows/test_and_build_gem.yml

@@ -10,6 +10,7 @@ on:
       - reopened
     branches:
       - develop
+      - milestone-77-scalable-design
   push:
     tags:
       - "*"
@@ -37,7 +38,8 @@ jobs:
               console.log("PR title format is correct.");
             }
       - name: Check commit messages format
-        if: github.event_name == 'pull_request'
+        # 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'
         uses: actions/github-script@v7
         with:
           script: |
@@ -136,6 +138,17 @@ 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
 
@@ -171,8 +184,9 @@ 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' && github.event.pull_request.base.ref == 'develop'
+        if: github.event_name == 'pull_request'
         run: |
           bundle exec rake
 

data/.gitignore

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

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.18.2.pre.pre1)
+    spree_cm_commissioner (2.0.0.pre.pre)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -42,6 +42,7 @@ PATH
       aws-sdk-s3
       blazer (~> 3.0.4)
       byebug
+      connection_pool
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
       elasticsearch (~> 8.5)
@@ -54,9 +55,12 @@ 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)
@@ -584,6 +588,9 @@ 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)
@@ -619,6 +626,8 @@ 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)
@@ -662,13 +671,31 @@ 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/extension_rake'
+require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
@@ -14,8 +14,37 @@ 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
-  ENV['LIB_NAME'] = 'spree_cm_commissioner'
-  Rake::Task['extension:test_app'].invoke
+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'])
 end

data/app/assets/javascripts/spree_cm_commissioner/backend.js

@@ -11,4 +11,3 @@
 //= require spree_cm_commissioner/selected_field_filter_origin_destination
 //= require spree_cm_commissioner/location_checkbox_manager
 //= require spree_cm_commissioner/trip_stop_selection
-//= require spree_cm_commissioner/tenant_payment_icon_fields

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

@@ -55,8 +55,9 @@ $day-background: theme-color("light");
     }
   }
 
-  // .wday-0 {
-  // }
+  .wday-0 {
+    background-color: darken($day-background, 5%);
+  }
 
   // .wday-1 {
   // }
@@ -73,8 +74,9 @@ $day-background: theme-color("light");
   // .wday-5 {
   // }
 
-  // .wday-6 {
-  // }
+  .wday-6 {
+    background-color: darken($day-background, 5%);
+  }
 
   // .today {
   // }
@@ -86,9 +88,7 @@ $day-background: theme-color("light");
   // }
 
   // known as active-date
-  .start-date {
-    background-color: darken($day-background, 5%);
-  }
+  // .start-date {}
 
   // .prev-month {
   // }
@@ -159,11 +159,8 @@ $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: theme-color("warning");
+        background-color: rgba($dark, 0.1);
       }
     }
 

data/app/assets/stylesheets/spree_cm_commissioner/backend/commissioner_admin.css.scss

@@ -3,4 +3,3 @@
 @import "spree_cm_commissioner/backend/service_calendar";
 @import "spree_cm_commissioner/backend/guest_qr_code";
 @import "spree_cm_commissioner/backend/vehicle_seat";
-@import "spree_cm_commissioner/backend/tenant_payment_icon_fields";

data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb

@@ -6,9 +6,8 @@ module SpreeCmCommissioner
       after_action :set_cache_control_for_cdn
     end
 
-    # Override This Method based on your UseCase
     def max_age
-      ENV.fetch('CONTENT_CACHE_MAX_AGE', 1.day.to_i).to_i
+      ENV.fetch('CONTENT_CACHE_MAX_AGE', '180')
     end
 
     def set_cache_control_for_cdn

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

@@ -0,0 +1,83 @@
+module Spree
+  module Admin
+    class InventoryItemsController < StockManagementsController
+      before_action :load_parent
+
+      # GET /products/:slug/variants/:variant_id/inventory_items/:id
+      def show
+        @inventory_item = @product.inventory_items.find(params[:id])
+        @default_prices = @inventory_item.variant.prices.to_a.index_by(&:currency)
+
+        @prices = @inventory_item.prices.to_a
+        supported_currencies_for_all_stores.each do |currency|
+          @prices << @inventory_item.prices.new(currency: currency) if @prices.none? { |price| price.currency == currency }
+        end
+
+        @cached_inventory_item = ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new([@inventory_item])
+                                                                                               .call
+                                                                                               .index_by(&:inventory_item_id)[@inventory_item.id]
+      end
+
+      # POST /products/:slug/variants/:variant_id/inventory_items
+      def create
+        variant = @product.variants.find(params[:variant_id])
+        inventory_item = variant.create_default_non_permanent_inventory_item!
+
+        if inventory_item.present?
+          result = SpreeCmCommissioner::Stock::InventoryItemResetter.call(inventory_item: inventory_item)
+
+          if result.success?
+            flash[:success] = flash_message_for(result.inventory_item, :successfully_created)
+          else
+            flash[:error] = result.message
+          end
+        end
+
+        redirect_back fallback_location: admin_product_stock_managements_path(@product)
+      end
+
+      # PATCH /products/:slug/variants/:variant_id/inventory_items/:id/reset
+      def reset
+        inventory_item = @product.inventory_items.find(params[:id])
+        result = SpreeCmCommissioner::Stock::InventoryItemResetter.call(inventory_item: inventory_item)
+
+        if result.success?
+          flash[:success] = flash_message_for(result.inventory_item, :successfully_updated)
+        else
+          flash[:error] = result.message
+        end
+
+        redirect_back fallback_location: admin_product_stock_managements_path(@product)
+      end
+
+      # PATCH /products/:slug/variants/:variant_id/inventory_items/:id/update_prices
+      def update_prices
+        inventory_item = @product.inventory_items.find(params[:id])
+
+        params[:prices]&.values&.each do |price_params|
+          price = inventory_item.prices.find_or_initialize_by(currency: price_params[:currency])
+          price.price = price_params[:price].empty? ? nil : price_params[:price]
+          price.compare_at_price = price_params[:compare_at_price].empty? ? nil : price_params[:compare_at_price]
+          price.variant_id = inventory_item.variant_id
+          price.save! if (price.new_record? && price.price) || (!price.new_record? && price.changed?)
+        end
+
+        flash[:success] = flash_message_for(inventory_item, :successfully_updated)
+        redirect_back fallback_location: admin_product_stock_managements_path(@product)
+      end
+
+      # PATCH /products/:slug/variants/:variant_id/inventory_items/:id/delete_prices
+      def delete_prices
+        inventory_item = @product.inventory_items.find(params[:id])
+
+        if inventory_item.prices.destroy_all
+          flash[:success] = flash_message_for(inventory_item, :successfully_removed)
+        else
+          flash[:error] = inventory_item.errors.full_messages.join(', ')
+        end
+
+        redirect_back fallback_location: admin_product_stock_managements_path(@product)
+      end
+    end
+  end
+end

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

@@ -5,6 +5,8 @@ module Spree
 
       before_action :load_parent
 
+      helper_method :inventory_item_message
+
       def load_parent
         @product = Spree::Product.find_by(slug: params[:product_id])
       end
@@ -12,9 +14,59 @@ 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
+
+      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))
@@ -25,6 +77,16 @@ 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/admin/tenants_controller.rb

@@ -1,8 +1,6 @@
 module Spree
   module Admin
     class TenantsController < Spree::Admin::ResourceController
-      before_action :load_vector_icons, only: %i[new edit]
-
       # override
       def collection
         params[:q] = {} if params[:q].blank?
@@ -33,12 +31,6 @@ module Spree
       def collection_url(options = {})
         admin_tenants_url(options)
       end
-
-      private
-
-      def load_vector_icons
-        @vector_icons = SpreeCmCommissioner::VectorIcon.all
-      end
     end
   end
 end

data/app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb

@@ -0,0 +1,42 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class Accommodations::VariantsController < ::Spree::Api::V2::ResourceController
+          private
+
+          # override
+          def collection
+            @collection ||= SpreeCmCommissioner::Accommodations::FindVariant.new(
+              from_date: params[:from_date]&.to_date,
+              to_date: params[:to_date]&.to_date,
+              vendor_id: params[:accommodation_id],
+              number_of_adults: params[:adult].to_i,
+              number_of_kids: params[:children].to_i
+            ).execute
+          end
+
+          # override
+          def resource
+            @resource ||= collection.find(params[:id])
+          end
+
+          # override
+          def resource_serializer
+            Spree::V2::Storefront::VariantSerializer
+          end
+
+          # override
+          def collection_serializer
+            Spree::V2::Storefront::VariantSerializer
+          end
+
+          # override
+          def required_schema
+            SpreeCmCommissioner::VariantRequestSchema
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,55 +5,38 @@ module Spree
         class AccommodationsController < ::Spree::Api::V2::ResourceController
           private
 
+          # override
           def collection
-            @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)
+            @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
           end
 
+          # override
           def resource
-            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
+            @resource ||= collection.find_by!(slug: params[:id])
           end
 
+          # override
           def allowed_sort_attributes
             super << :min_price << :max_price
           end
 
-          def model_class
-            Spree::Vendor
-          end
-
+          # override
           def resource_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
+          # override
           def collection_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
-          def collection_finder
-            SpreeCmCommissioner::AccommodationSearchDetail
-          end
-
-          def resource_finder
-            SpreeCmCommissioner::AccommodationSearchDetail
-          end
-
+          # override
           def required_schema
             SpreeCmCommissioner::AccommodationRequestSchema
           end

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

@@ -38,25 +38,10 @@ module Spree
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            begin
-              if guest_params[:guest_dynamic_fields_attributes]
-                resource.guest_dynamic_fields.destroy_all
-
-                guest_params[:guest_dynamic_fields_attributes].each do |attr|
-                  field = build_dynamic_field(attr)
-                  field.save!
-                end
-              end
-
-              resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
-
-              if resource.save
-                render_serialized_payload { serialize_resource(resource) }
-              else
-                render_error_payload(resource.errors, 400)
-              end
-            rescue ActiveRecord::RecordInvalid => e
-              render_error_payload(e.record.errors, 400)
+            if resource.update(guest_params)
+              render_serialized_payload { serialize_resource(resource) }
+            else
+              render_error_payload(resource, 400)
             end
           end
 
@@ -91,20 +76,9 @@ module Spree
               :upload_later,
               :country_code,
               :contact,
-              guest_dynamic_fields_attributes: %i[id dynamic_field_id dynamic_field_option_id value _destroy]
+              guest_dynamic_fields_attributes: %i[id dynamic_field_id value _destroy]
             )
           end
-
-          def build_dynamic_field(attr)
-            field = resource.guest_dynamic_fields.build(attr.except(:id))
-
-            if field.dynamic_field.requires_dynamic_field_options?
-              option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
-              field.dynamic_field_option = option if option
-            end
-
-            field
-          end
         end
       end
     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)
+              availability_checker = SpreeCmCommissioner::Stock::AvailabilityChecker.new(@variant, add_item_params[:options])
 
-              unless availability_checker.can_supply?(add_item_params[:quantity].to_i, add_item_params[:options])
+              unless availability_checker.can_supply?(add_item_params[:quantity].to_i)
                 return render_error_payload(availability_checker.error_message || I18n.t('variant_availability.items_out_of_stock'))
               end
 

data/app/controllers/spree_cm_commissioner/admin/variants_controller_decorator.rb

@@ -37,7 +37,7 @@ module SpreeCmCommissioner
         bit_fields = SpreeCmCommissioner::KycBitwise::BIT_FIELDS.keys
 
         if permitted_resource_params[:use_product_kyc] == '1'
-          permitted_resource_params[:kyc] = nil
+          permitted_resource_params[:kyc] = @product.kyc
         else
           @kyc_result = calculate_kyc_value(params[:variant])
           permitted_resource_params[:kyc] = @kyc_result