spree_cm_commissioner 1.11.0.pre.pre4 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f178313a2ff417bbefb328e143380ba8c9d26b8d49f7e8081cfc99dd2d6cbbf0
-  data.tar.gz: f6820d0e682b0f8de8e3778b28bcba689b47aa8b02cefaba15c4c2a1bc5b2549
+  metadata.gz: 3da0bd043e4ceca1f57afecc1bab6fbc58c960ba296f7fffa42b449a2475f8f8
+  data.tar.gz: 974c8e19e026fa90254594447a9735be039371ae6d0bc11a24c9cdf3b86dfd8c
 SHA512:
-  metadata.gz: 41fe4581e7208130cde9df5116937357474159a9c51235e8497f15af6cb85659d1dd6261fb55dd86ae84fe0b5206db57467069cee22aa6aff0d9a520f90a9fd5
-  data.tar.gz: 9a63df1c9ed0bc588439950e3de8d8093e141a5fee4e5090f9003a22ccce7e801770a95eff2415b1abbfa6d215d654d80fc3c3c7a1eb062aad050eb7795f50de
+  metadata.gz: 4b1d418758d9880e50dd1481b095f4cad76cc106ca0a950b694d2a87c053bf7f48655029c52939f33bf099db0a7d84048f0482d488a20ac720f1b6f8015a687e
+  data.tar.gz: 93b3ffb94424ba4a4ed46e5cde3303dc33c54a58417dd1a0750a5cb56d3638778d1fa5ceb75cf812617c33e12ae3c38c6402b7719ddfa53b2ce9567a8bb860e4

data/.github/workflows/test_and_build_gem.yml

@@ -10,12 +10,113 @@ on:
       - reopened
     branches:
       - develop
-      - milestone-77-scalable-design
   push:
     tags:
       - "*"
 jobs:
+  validate-commits:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check PR title format
+        if: github.event_name == 'pull_request'
+        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
+        if: github.event_name == 'pull_request'
+        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
+        if: github.event_name == 'pull_request'
+        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:
+    needs: [validate-commits]
     # if: github.head_ref != '2572-enforce-pr-workflow' || github.base_ref != 'develop'
     runs-on: ubuntu-latest
 
@@ -35,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
 
@@ -66,6 +156,47 @@ 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
+
+        if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'develop'
+        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/.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 (1.11.0.pre.pre4)
+    spree_cm_commissioner (1.13.0)
       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)
@@ -58,8 +57,6 @@ PATH
       phonelib
       premailer-rails
       rails (~> 7.0.4)
-      redis
-      redis-rails
       rqrcode (~> 2.0)
       searchkick (~> 5.1)
       simple_calendar (~> 2.4)
@@ -620,8 +617,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)
@@ -665,24 +660,8 @@ 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)

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/controllers/spree/admin/cms_pages_controller_decorator.rb

@@ -0,0 +1,32 @@
+module Spree
+  module Admin
+    module CmsPagesControllerDecorator
+      def scope
+        return Spree::CmsPage.none unless current_store&.cms_pages
+
+        scope = current_store.cms_pages
+
+        case params[:tab]
+        when 'default'
+          scope = scope.where(tenant_id: nil)
+        when 'tenants'
+          scope = if params[:tenant_id].present?
+                    scope.where(tenant_id: params[:tenant_id])
+                  else
+                    scope.where.not(tenant_id: nil)
+                  end
+        end
+
+        scope
+      end
+
+      def permitted_resource_params
+        super.merge(tenant_id: params[:cms_page][:tenant_id])
+      end
+    end
+  end
+end
+
+unless Spree::Admin::CmsPagesController.included_modules.include?(Spree::Admin::CmsPagesControllerDecorator)
+  Spree::Admin::CmsPagesController.prepend(Spree::Admin::CmsPagesControllerDecorator)
+end

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

@@ -49,6 +49,8 @@ module Spree
         place_json = Base64.strict_decode64(place_base_64_content)
         place_hash = JSON.parse(place_json)
 
+        place_hash = place_hash.except('lft', 'rgt', 'parent_id', 'depth')
+
         @place = SpreeCmCommissioner::Place.where(reference: place_hash['reference']).first_or_initialize do |place|
           place.assign_attributes(place_hash)
         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,58 +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
-
-      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).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))
@@ -76,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/organizer/invite_guests_controller.rb

@@ -0,0 +1,70 @@
+module Spree
+  module Api
+    module V2
+      module Organizer
+        class InviteGuestsController < ::Spree::Api::V2::Organizer::BaseController
+          before_action :load_invite_guest_by_token, only: :show
+          before_action :load_invite_guest, :assign_line_item_data, only: :update
+
+          def show
+            render_serialized_payload { serialize_resource(@invite_guest) }
+          end
+
+          def update
+            return render_error(:revoked) if @invite_guest.revoked?
+            return render_error(:closed) if @invite_guest.expired?
+            return render_error(:fully_claimed) if @invite_guest.fully_claimed?
+
+            guest = @line_item.guests.new(guest_params)
+
+            if guest.save
+              @invite_guest.update(claimed_status: :claimed) if @line_item.guests.count == @invite_guest.quantity
+              render json: SpreeCmCommissioner::V2::Storefront::GuestSerializer.new(guest.reload).serializable_hash
+            else
+              render_error_payload(guest.errors.full_messages.to_sentence)
+            end
+          end
+
+          private
+
+          def load_invite_guest_by_token
+            @invite_guest = SpreeCmCommissioner::InviteGuest.find_by(token: params[:id])
+          rescue ActiveRecord::RecordNotFound
+            render_error_payload(I18n.t('invite.url_not_found'))
+          end
+
+          def load_invite_guest
+            @invite_guest = SpreeCmCommissioner::InviteGuest.find(params[:id])
+          end
+
+          def assign_line_item_data
+            @line_item = @invite_guest.order.line_items.first
+            @guests = @line_item.guests
+          end
+
+          def render_error(message)
+            render json: { errors: message }
+          end
+
+          def guest_params
+            params.require(:invite_guest).permit(
+              :first_name,
+              :last_name,
+              :dob,
+              :gender,
+              :age,
+              :emergency_contact,
+              :phone_number,
+              :address,
+              :other_organization
+            )
+          end
+
+          def resource_serializer
+            ::Spree::V2::Organizer::InviteGuestSerializer
+          end
+        end
+      end
+    end
+  end
+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(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/controllers/spree/api/v2/storefront/waiting_room_sessions_controller.rb

@@ -11,6 +11,7 @@ module Spree
 
           def create
             context = SpreeCmCommissioner::WaitingRoomSessionCreator.call(
+              tenant_id: nil,
               remote_ip: request.remote_ip,
               waiting_guest_firebase_doc_id: params[:waiting_guest_firebase_doc_id],
               page_path: params[:page_path]

data/app/controllers/spree/api/v2/tenant/account_checker_controller.rb

@@ -14,7 +14,7 @@ module Spree
           end
 
           def filter_params
-            params.permit(:login, :locale, :format)
+            params.permit(:login, :locale, :format).merge(tenant_id: MultiTenant.current_tenant_id)
           end
         end
       end

data/app/controllers/spree/api/v2/tenant/account_recovers_controller.rb

@@ -4,7 +4,7 @@ module Spree
       module Tenant
         class AccountRecoversController < BaseController
           def update
-            context = SpreeCmCommissioner::AccountRecover.call(**filter_params.slice(:id_token, :login, :password))
+            context = SpreeCmCommissioner::AccountRecover.call(**filter_params.slice(:id_token, :login, :password, :tenant_id))
             if context.success?
               render json: { message: 'Account Recovered successfully' }, status: :ok
             else
@@ -15,7 +15,7 @@ module Spree
           private
 
           def filter_params
-            params.permit(:id_token, :login, :password)
+            params.permit(:id_token, :login, :password).merge(tenant_id: MultiTenant.current_tenant_id)
           end
         end
       end

data/app/controllers/spree/api/v2/tenant/cms_pages_controller.rb

@@ -0,0 +1,41 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class CmsPagesController < BaseController
+          private
+
+          def model_class
+            Spree::CmsPage
+          end
+
+          def resource
+            @resource ||= scope.find_by(slug: params[:id]) || scope.find(params[:id])
+          end
+
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_cms_page_serializer.constantize
+          end
+
+          def collection_serializer
+            Spree::Api::Dependencies.storefront_cms_page_serializer.constantize
+          end
+
+          def collection_finder
+            Spree::Api::Dependencies.storefront_cms_page_finder.constantize
+          end
+
+          def scope
+            model_class.by_locale(I18n.locale).where(tenant_id: MultiTenant.current_tenant_id)
+          end
+
+          def scope_includes
+            {
+              cms_sections: :linked_resource
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/reset_passwords_controller.rb

@@ -26,7 +26,7 @@ module Spree
               :pin_code_token,
               :password,
               :password_confirmation
-            )
+            ).merge(tenant_id: MultiTenant.current_tenant_id)
           end
         end
       end