spree_cm_commissioner 1.10.0.pre.pre1 → 1.11.0.pre.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91babac12da4e1fc7e8083b3cb07936fd5a7b7af45217ef38b2a47fc3bed9ca
-  data.tar.gz: b5831b6964e0ea47ac4a6c7c2355330c9ed8386c160ec482ab8201100321a0cf
+  metadata.gz: 3c727894cc45a2d005e5c0254542ce6b8bfc054a30fe9d7b9fa6c7dfea61cfc4
+  data.tar.gz: 9d99d30cfc27e987bffda2e0462e91a8cbe4d9a88c44c18dc67df02e947f3278
 SHA512:
-  metadata.gz: 8f229d110a73433c448dece4554dfc99f60e0b9208e5260282b7b48c2f2869a9431700b8f418ba0ed0f00a6369924acf370506dc22234d678c157a4984b6d49d
-  data.tar.gz: b0913cc8c5bfc42042bd78bc23a3e13050b7cd39e9cbf315ae6f0f99dad38ce3984c1f042d34b95d29688c51ce9c9f67b38c450a857063659f395c297233bb3f
+  metadata.gz: 51065e106d1939327817aa8c54154d1711faee026b771010c9f104083da88aad01aa2f3ced6383c8f3c952e8c8cfba8035324271ee92548dc2e22449da601bf1
+  data.tar.gz: dbc3410043aea748600477cfdd6724d1916155df35e28b62495a53950475f122eac3bf8b80de97282c82214e60ee880e807629246467ca8872753c519eb4afad

data/.github/workflows/test_and_build_gem.yml

@@ -3,96 +3,117 @@ name: Commissioner Gem
 
 on:
   pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - reopened
     branches:
       - develop
+      - milestone-77-scalable-design
   push:
     tags:
       - "*"
 jobs:
-  validate-commits:
-    runs-on: ubuntu-latest
+  # validate-commits:
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #     - name: Check PR title format
+  #       uses: actions/github-script@v7
+  #       with:
+  #         script: |
+  #           const title = context.payload.pull_request.title.trim();
+
+  #           console.log("PR title: ", title);
+
+  #           const pattern = /^Close\s+#\d+\s.+/;
+
+  #           if (!pattern.test(title)) {
+  #             core.setFailed(
+  #               `PR title must start with "Close #issue_number message". Example: Close #123 Add login form`
+  #             );
+  #           } else {
+  #             console.log("PR title format is correct.");
+  #           }
+  #     - name: Check commit messages format
+  #       uses: actions/github-script@v7
+  #       with:
+  #         script: |
+  #           const pr = context.payload.pull_request;
+  #           const commits_url = pr.commits_url;
+
+  #           const commits = await github.request(commits_url);
+  #           const pattern = /^Close\s+#\d+\s.+/;
+
+  #           let invalidCommits = [];
+
+  #           for (const commit of commits.data) {
+  #             const msg = commit.commit.message.trim();
+
+  #             console.log("commit message: ", msg);
+
+  #             if (!pattern.test(msg)) {
+  #               invalidCommits.push(`- ${msg}`);
+  #             }
+  #           }
+
+  #           if (invalidCommits.length > 0) {
+  #             core.setFailed(
+  #               `The following commit messages are not in the correct format:\n\n${invalidCommits.join(
+  #                 '\n'
+  #               )}\n\nEach commit message must start with "Close #<issue_number> <message>"`
+  #             );
+  #           } else {
+  #             console.log("All commit messages are correctly formatted.");
+  #           }
+  #     - name: Check for unresolved review threads
+  #       uses: actions/github-script@v7
+  #       with:
+  #         script: |
+  #           const prNumber = context.payload.pull_request.number;
+  #           const { owner, repo } = context.repo;
+
+  #           const query = `
+  #             query($owner: String!, $repo: String!, $prNumber: Int!) {
+  #               repository(owner: $owner, name: $repo) {
+  #                 pullRequest(number: $prNumber) {
+  #                   reviewThreads(first: 100) {
+  #                     nodes {
+  #                       isResolved
+  #                       comments(first: 1) {
+  #                         nodes {
+  #                           body
+  #                           author {
+  #                             login
+  #                           }
+  #                         }
+  #                       }
+  #                     }
+  #                   }
+  #                 }
+  #               }
+  #             }
+  #           `;
+  #           const variables = { owner, repo, prNumber };
+  #           const result = await github.graphql(query, variables);
+  #           const threads = result.repository.pullRequest.reviewThreads.nodes;
+
+  #           const unresolved = threads.filter(t => !t.isResolved);
+
+  #           if (unresolved.length > 0) {
+  #             unresolved.forEach(thread => {
+  #               const comments = thread.comments.nodes;
+  #               if (comments.length > 0) {
+  #                 console.log(`💬 Comment by ${comments[0].author.login}: ${comments[0].body}`);
+  #               }
+  #             });
+  #             core.setFailed(`❌ There are ${unresolved.length} unresolved review thread(s). Please resolve them before merging.`);
+  #           } else {
+  #             console.log("✅ All review threads are resolved.");
+  #           }
 
-    steps:
-      - name: Check PR title format
-        uses: actions/github-script@v7
-        if: github.event_name == 'pull_request'
-        with:
-          script: |
-            const title = context.payload.pull_request.title.trim();
-
-            console.log("PR title: ", title);
-
-            const pattern = /^Close\s+#\d+\s.+/;
-
-            if (!pattern.test(title)) {
-              core.setFailed(
-                `PR title must start with "Close #issue_number message". Example: Close #123 Add login form`
-              );
-            } else {
-              console.log("PR title format is correct.");
-            }
-      - name: Check commit messages format
-        uses: actions/github-script@v7
-        if: github.event_name == 'pull_request'
-        with:
-          script: |
-            const pr = context.payload.pull_request;
-            const commits_url = pr.commits_url;
-
-            const commits = await github.request(commits_url);
-            const pattern = /^Close\s+#\d+\s.+/;
-
-            let invalidCommits = [];
-
-            for (const commit of commits.data) {
-              const msg = commit.commit.message.trim();
-
-              console.log("commit message: ", msg);
-
-              if (!pattern.test(msg)) {
-                invalidCommits.push(`- ${msg}`);
-              }
-            }
-
-            if (invalidCommits.length > 0) {
-              core.setFailed(
-                `The following commit messages are not in the correct format:\n\n${invalidCommits.join(
-                  '\n'
-                )}\n\nEach commit message must start with "Close #<issue_number> <message>"`
-              );
-            } else {
-              console.log("All commit messages are correctly formatted.");
-            }
-      - name: Check for unresolved review threads
-        uses: actions/github-script@v7
-        if: github.event_name == 'pull_request'
-        with:
-          script: |
-            const pr = context.payload.pull_request;
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-
-            try {
-              const response = await github.rest.pulls.listReviewComments({
-                owner,
-                repo,
-                pull_number: pr.number,
-                per_page: 100
-              });
-
-              const unresolved = response.data.filter(comment => comment.in_reply_to_id && !comment.resolved);
-
-              if (unresolved.length > 0) {
-                core.setFailed(`There are ${unresolved.length} unresolved review comment(s). Please resolve all threads before merging.`);
-              } else {
-                console.log("All review comments are resolved.");
-              }
-            } catch (error) {
-              console.error("Error fetching review comments:", error.message);
-              core.setFailed("Failed to check for unresolved review threads.");
-            }
   test_and_build_gem:
-    needs: [validate-commits]
     # if: github.head_ref != '2572-enforce-pr-workflow' || github.base_ref != 'develop'
     runs-on: ubuntu-latest
 
@@ -112,6 +133,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
 
@@ -132,27 +164,26 @@ jobs:
           gem install bundler
           bundle install --jobs 4 --retry 3
 
-      - name: Quality
-        if: github.event_name == 'pull_request'
-        env:
-          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-        run: |
-          bundle exec rubocop
+      # - name: Quality
+      #   env:
+      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+      #   run: |
+      #     bundle exec rubocop
 
-      - name: Security
-        if: github.event_name == 'pull_request'
-        env:
-          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-        run: |
-          bundle exec brakeman
+      # - name: Security
+      #   env:
+      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+      #   run: |
+      #     bundle exec brakeman
 
-      - name: Run test
-        env:
-          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+      # - 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'
-        run: |
-          bundle exec rake
+      #   if: github.event_name == 'pull_request'
+      #   run: |
+      #     bundle exec rake
 
       # 2405-build-and-publish-gem
       # - name: Rename long migration files

data/.vscode/settings.json

@@ -3,6 +3,6 @@
   "files.trimTrailingWhitespace": true,
   "editor.formatOnSave": true,
   "[yaml]": {
-    "editor.defaultFormatter": "aaron-bond.better-comments"
+    "editor.defaultFormatter": "redhat.vscode-yaml"
   },
 }

data/Gemfile.lock

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

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/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
@@ -17,6 +19,23 @@ module Spree
         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
+
       def calendar
         @year = params[:year].present? ? params[:year].to_i : Time.zone.today.year
 
@@ -24,13 +43,29 @@ module Spree
         to_date = Date.new(@year, 1, 1).end_of_year
 
         @inventory_items = @product.inventory_items.includes(:variant).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))
@@ -41,6 +76,10 @@ module Spree
       def model_class
         Spree::StockItem
       end
+
+      def stock_movement_params
+        params.require(:stock_movement).permit(permitted_stock_movement_attributes)
+      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/interactors/spree_cm_commissioner/create_event.rb

@@ -10,6 +10,8 @@ module SpreeCmCommissioner
         assign_prototype
         create_child_taxon
         build_home_banner
+        assign_option_types
+        assign_option_values
       end
     end
 
@@ -61,5 +63,26 @@ module SpreeCmCommissioner
 
       context.fail!(message: 'Home banner upload failed') unless banner.persisted?
     end
+
+    def assign_options(model_class, param_key, foreign_key)
+      return unless params[param_key]
+
+      params[param_key].each do |id|
+        record = model_class.new(
+          taxon_id: @parent_taxon.id,
+          foreign_key => id
+        )
+
+        context.fail!(message: record.errors.full_messages.join(', ')) unless record.save
+      end
+    end
+
+    def assign_option_types
+      assign_options(SpreeCmCommissioner::TaxonOptionType, :option_type_id, :option_type_id)
+    end
+
+    def assign_option_values
+      assign_options(SpreeCmCommissioner::TaxonOptionValue, :option_value_id, :option_value_id)
+    end
   end
 end

data/app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb

@@ -0,0 +1,40 @@
+module SpreeCmCommissioner
+  class EnsureCorrectProductType < BaseInteractor
+    def call
+      Spree::Product
+        .left_joins(variants_including_master: %i[inventory_items line_items])
+        .where(
+          'spree_variants.product_type IS NULL OR
+          spree_variants.product_type != spree_products.product_type OR
+
+          cm_inventory_items.product_type IS NULL OR
+          cm_inventory_items.product_type != spree_products.product_type OR
+
+          spree_line_items.product_type IS NULL OR
+          spree_line_items.product_type != spree_products.product_type OR
+
+          spree_products.product_type IS NOT NULL
+          '
+        )
+        .distinct.find_each do |product|
+        sync_product_type_for(product)
+      end
+    end
+
+    def sync_product_type_for(product)
+      product_type = Spree::Variant.product_types[product.product_type]
+
+      product.variants_including_master
+             .where('spree_variants.product_type IS NULL OR spree_variants.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+
+      product.line_items
+             .where('spree_line_items.product_type IS NULL OR spree_line_items.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+
+      product.inventory_items
+             .where('cm_inventory_items.product_type IS NULL OR cm_inventory_items.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsAdjuster < BaseInteractor
+      delegate :variant, :quantity, to: :context
+
+      def call
+        variant.inventory_items.active.find_each do |inventory_item|
+          inventory_item.adjust_quantity!(quantity)
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,10 @@ module SpreeCmCommissioner
 
       def variants_per_batch = 1000
 
+      def pre_inventory_days_for(variant)
+        context.pre_inventory_days || variant.pre_inventory_days
+      end
+
       def call
         variants.in_batches(of: variants_per_batch) do |batch|
           generate_inventory_items_for_batch(batch)
@@ -31,7 +35,7 @@ module SpreeCmCommissioner
 
       def inventory_dates_for(variant)
         start_date = Time.zone.tomorrow
-        end_date = Time.zone.today + variant.pre_inventory_days
+        end_date = Time.zone.today + pre_inventory_days_for(variant)
 
         (start_date..end_date)
       end
@@ -62,7 +66,7 @@ module SpreeCmCommissioner
       end
 
       def variants
-        scope = Spree::Variant.active.with_permanent_stock.where(is_master: false).includes(:product)
+        scope = Spree::Variant.active.with_permanent_stock.where(is_master: false)
         scope = scope.where(id: variant_ids) if variant_ids.present?
         scope
       end

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

@@ -0,0 +1,24 @@
+module SpreeCmCommissioner
+  module Stock
+    class StockMovementCreator < BaseInteractor
+      delegate :variant_id, :stock_location_id, :current_store, :stock_movement_params, to: :context
+
+      def call
+        variant = current_store.variants.find(variant_id)
+
+        return context.fail!(message: Spree.t(:doesnt_track_inventory)) unless variant.track_inventory?
+
+        stock_location = Spree::StockLocation.find(stock_location_id)
+        stock_movement = stock_location.stock_movements.build(stock_movement_params)
+        stock_movement.stock_item = stock_location.set_up_stock_item(variant)
+
+        if stock_movement.save
+          SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(variant_id: variant.id, quantity: stock_movement.quantity)
+          context.stock_movement = stock_movement
+        else
+          context.fail!(message: stock_movement.errors.full_messages.join(', '))
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -53,7 +53,7 @@ module SpreeCmCommissioner
       user_data = context.user_data
 
       identity = SpreeCmCommissioner::UserIdentityProvider.vattanac_bank
-                                                          .find_or_initialize_by(sub: user_data['id'])
+                                                          .find_or_initialize_by(sub: user_data['phoneNum'])
 
       if identity.persisted?
         context.user = identity.user
@@ -78,7 +78,7 @@ module SpreeCmCommissioner
       identity = context.identity
 
       identity.name = full_name
-
+      identity.email = user_data['email']
       context.user = Spree::User.new(
         first_name: user_data['firstName'],
         last_name: user_data['lastName'],

data/app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb

@@ -0,0 +1,7 @@
+module SpreeCmCommissioner
+  class EnsureCorrectProductTypeJob < ApplicationJob
+    def perform
+      SpreeCmCommissioner::EnsureCorrectProductType.call
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsAdjusterJob < ApplicationUniqueJob
+      def perform(variant_id:, quantity:)
+        variant = Spree::Variant.find(variant_id)
+
+        SpreeCmCommissioner::Stock::InventoryItemsAdjuster.call(variant: variant, quantity: quantity)
+      end
+    end
+  end
+end

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

@@ -20,6 +20,7 @@ module SpreeCmCommissioner
       vehicle_id
       origin
       destination
+      place_id
     ].freeze
 
     RESERVED_OPTIONS = {
@@ -47,8 +48,8 @@ module SpreeCmCommissioner
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
       'seat-number-positions' => 'array',
-      'origin' => 'origin',
-      'destination' => 'destination',
+      'origin' => 'place_id',
+      'destination' => 'place_id',
       'departure-time' => 'time',
       'vehicle' => 'vehicle_id',
       'allow-seat-selection' => 'boolean'

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

@@ -3,12 +3,10 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      delegate :product_type,
-               :subscribable?,
+      delegate :subscribable?,
                :allowed_upload_later?,
                :need_confirmation?, :need_confirmation, :kyc,
                :allow_anonymous_booking,
-               :accommodation?, :service?, :ecommerce?,
                :associated_event,
                :allow_self_check_in,
                :allow_self_check_in?,