spree_cm_commissioner 1.11.0.pre.pre → 1.11.0.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c727894cc45a2d005e5c0254542ce6b8bfc054a30fe9d7b9fa6c7dfea61cfc4
-  data.tar.gz: 9d99d30cfc27e987bffda2e0462e91a8cbe4d9a88c44c18dc67df02e947f3278
+  metadata.gz: 72b30d2dd7e38275035e90f40357f304bf844828ef18cd7076a737b467f2d1ac
+  data.tar.gz: 21d98612977148a431c77fd26633c0011cc0be1325b75a0dd9175b3b7bbe11e3
 SHA512:
-  metadata.gz: 51065e106d1939327817aa8c54154d1711faee026b771010c9f104083da88aad01aa2f3ced6383c8f3c952e8c8cfba8035324271ee92548dc2e22449da601bf1
-  data.tar.gz: dbc3410043aea748600477cfdd6724d1916155df35e28b62495a53950475f122eac3bf8b80de97282c82214e60ee880e807629246467ca8872753c519eb4afad
+  metadata.gz: fceca341a978f1022e8420f7a5b96e405de662fdb0cb1ea8fb745b4ceca48271aeaf9179e04e7512f3a7ee4049d93fb0b80443bcea1473d89b02b7d709f0f7dd
+  data.tar.gz: 3f15f7304214c925f4257cab2eb802211eb0ddde0af8e13bf6378ada2f668af6d509499df2be71eb9cd0aaa923c586b5843757101c4cb16c950fdc1e585d0351

data/.github/workflows/test_and_build_gem.yml

@@ -15,104 +15,6 @@ on:
     tags:
       - "*"
 jobs:
-  # 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.");
-  #           }
-
   test_and_build_gem:
     # if: github.head_ref != '2572-enforce-pr-workflow' || github.base_ref != 'develop'
     runs-on: ubuntu-latest
@@ -164,48 +66,6 @@ jobs:
           gem install bundler
           bundle install --jobs 4 --retry 3
 
-      # - name: Quality
-      #   env:
-      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-      #   run: |
-      #     bundle exec rubocop
-
-      # - 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
-      #     REDIS_URL: redis://localhost:6379/0
-
-      #   if: github.event_name == 'pull_request'
-      #   run: |
-      #     bundle exec rake
-
-      # 2405-build-and-publish-gem
-      # - name: Rename long migration files
-      #   env:
-      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-      #   # if: startsWith(github.ref, 'refs/tags/') # Only on tag pushes
-      #   if: github.ref == 'refs/heads/2405-build-and-publish-gem'
-
-      #   run: |
-      #     cd db/migrate
-      #     for file in *.rb; do
-      #       if [ ${#file} -gt 60 ]; then  # Adjust threshold if needed
-      #         # Extract timestamp (first 14 chars) and shorten the rest
-      #         timestamp=${file:0:14}
-      #         suffix=$(echo "$file" | sed 's/^[0-9]\{14\}_//' | sed 's/\.rb$//')
-      #         short_suffix=$(echo "$suffix" | cut -c1-40) # Limit suffix to 40 chars
-      #         new_name="${timestamp}_${short_suffix}.rb"
-      #         mv "$file" "$new_name"
-      #         echo "Renamed $file to $new_name"
-      #       fi
-      #     done
-
       # Build the gem
       - name: Build gem
         env:

data/Gemfile.lock

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

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

@@ -77,6 +77,12 @@ module Spree
         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

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

@@ -10,9 +10,9 @@ module Spree
             @collection ||= SpreeCmCommissioner::Accommodations::Find.new(
               from_date: params[:from_date]&.to_date,
               to_date: params[:to_date]&.to_date,
-              state_id: params[:state_id],
-              number_of_adults: params[:number_of_adults].to_i,
-              number_of_kids: params[:number_of_kids].to_i
+              state_id: params[:province_id],
+              number_of_adults: params[:adult].to_i,
+              number_of_kids: params[:children].to_i
             ).execute
           end
 

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

@@ -0,0 +1,15 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsGenerator < BaseInteractor
+      delegate :variant, to: :context
+
+      def call
+        if variant.permanent_stock?
+          SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(variant_ids: [variant.id])
+        else
+          variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
+        end
+      end
+    end
+  end
+end

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

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

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -16,6 +16,7 @@ module SpreeCmCommissioner
 
     before_save -> { self.product_type = variant.product_type }, if: -> { product_type.nil? }
 
+    # This method is only used when admin update stock
     def adjust_quantity!(quantity)
       with_lock do
         self.max_capacity = max_capacity + quantity

data/app/models/spree_cm_commissioner/stock_item_decorator.rb

@@ -15,11 +15,7 @@ module SpreeCmCommissioner
     private
 
     def create_inventory_items
-      if variant.permanent_stock?
-        SpreeCmCommissioner::Stock::PermanentInventoryItemsGeneratorJob.perform_later(variant_ids: [variant.id])
-      else
-        variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
-      end
+      SpreeCmCommissioner::Stock::InventoryItemsGeneratorJob.perform_later(variant_id: variant.id)
     end
 
     # When admin delete stock item, it will deduct stock from inventory item

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

@@ -14,12 +14,14 @@ FactoryBot.define do
       variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
       variant.stock_items.update_all(backorderable: evaluator.backorderable)
 
+      # stock_items is created then enqueue create inventory items job
+      # but we want to create inventory items directly in this factory without waiting for job
       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
+        if variant.permanent_stock?
+          SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(variant_ids: [variant.id], pre_inventory_days: evaluator.pre_inventory_days || 3)
+        else
+          variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
+        end
       end
     end
   end

data/lib/spree_cm_commissioner/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.11.0.pre.pre
+  version: 1.11.0.pre.pre2
 platform: ruby
 authors:
 - You
@@ -1092,6 +1092,7 @@ files:
 - 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/inventory_items_generator.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
@@ -1156,6 +1157,7 @@ files:
 - 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/inventory_items_generator_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