spree_cm_commissioner 1.10.0.pre.pre1 → 1.10.0.pre.hotfix.pre.sms

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91babac12da4e1fc7e8083b3cb07936fd5a7b7af45217ef38b2a47fc3bed9ca
-  data.tar.gz: b5831b6964e0ea47ac4a6c7c2355330c9ed8386c160ec482ab8201100321a0cf
+  metadata.gz: 9c251d1cc34649b5f829ebbc62bda4569e1a6358fa05ff26f44f39455de799e6
+  data.tar.gz: bee3ddf20b6cfb452f8d17eaa166d3e8f7b31d7d2be1d71160275f40527164e1
 SHA512:
-  metadata.gz: 8f229d110a73433c448dece4554dfc99f60e0b9208e5260282b7b48c2f2869a9431700b8f418ba0ed0f00a6369924acf370506dc22234d678c157a4984b6d49d
-  data.tar.gz: b0913cc8c5bfc42042bd78bc23a3e13050b7cd39e9cbf315ae6f0f99dad38ce3984c1f042d34b95d29688c51ce9c9f67b38c450a857063659f395c297233bb3f
+  metadata.gz: 734bb93b3cad9b411ced875bf2d05b23ca837534e630f358e3eb15687d0daed05486e82225fd78505f8a71583127e6cbadac9fb0d3a4e3f0492903e36bf5a2b0
+  data.tar.gz: f3b0d288ba9cd62d5d79ee8cae5b514b9d126d29c7563a40b14abf0b5342416940eac9c93a8a7c7aea90eb8c4e4f08f490a2bad22ad82bb86c435c2010686dbd

data/.github/workflows/test_and_build_gem.yml

@@ -3,6 +3,11 @@ name: Commissioner Gem
 
 on:
   pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - reopened
     branches:
       - develop
   push:
@@ -14,8 +19,8 @@ jobs:
 
     steps:
       - name: Check PR title format
-        uses: actions/github-script@v7
         if: github.event_name == 'pull_request'
+        uses: actions/github-script@v7
         with:
           script: |
             const title = context.payload.pull_request.title.trim();
@@ -32,8 +37,8 @@ jobs:
               console.log("PR title format is correct.");
             }
       - name: Check commit messages format
-        uses: actions/github-script@v7
         if: github.event_name == 'pull_request'
+        uses: actions/github-script@v7
         with:
           script: |
             const pr = context.payload.pull_request;
@@ -64,33 +69,52 @@ jobs:
               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'
+        uses: actions/github-script@v7
         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.");
+            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
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
               }
-            } catch (error) {
-              console.error("Error fetching review comments:", error.message);
-              core.setFailed("Failed to check for unresolved review threads.");
+            `;
+            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'
@@ -133,14 +157,12 @@ jobs:
           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: Security
-        if: github.event_name == 'pull_request'
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
         run: |

data/.gitignore

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

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.10.0.pre.hotfix.pre.sms)
       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/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/stock_managements_controller.rb

@@ -12,25 +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 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
-        @events = SpreeCmCommissioner::CalendarEvent.from_inventory_items(@inventory_items)
-      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 }
         @reserved_stocks = Spree::LineItem
                            .complete
                            .where(variant_id: @variants.pluck(:id))

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[:state_id],
-              number_of_adults: params[:number_of_adults].to_i,
-              number_of_kids: params[:number_of_kids].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/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

data/app/controllers/spree_cm_commissioner/api/v2/storefront/cms_pages_controller_decorator.rb

@@ -0,0 +1,18 @@
+module SpreeCmCommissioner
+  module Api
+    module V2
+      module Storefront
+        module CmsPagesControllerDecorator
+          def scope
+            super.by_locale(I18n.locale).where(tenant_id: nil)
+          end
+        end
+      end
+    end
+  end
+end
+
+# Prepend the decorator to the CmsPagesController
+unless Spree::Api::V2::Storefront::CmsPagesController.ancestors.include?(SpreeCmCommissioner::Api::V2::Storefront::CmsPagesControllerDecorator)
+  Spree::Api::V2::Storefront::CmsPagesController.prepend(SpreeCmCommissioner::Api::V2::Storefront::CmsPagesControllerDecorator)
+end

data/app/interactors/spree_cm_commissioner/account_recover.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class AccountRecover < BaseInteractor
-    delegate :id_token, :login, :password, to: :context
+    delegate :id_token, :login, :password, :tenant_id, to: :context
 
     def call
       validate_user
@@ -15,7 +15,7 @@ module SpreeCmCommissioner
     def validate_user
       # get email password user
       if login.present? && password.present?
-        context.user = Spree.user_class.find_user_by_login(login)
+        context.user = Spree.user_class.find_user_by_login(login, tenant_id)
       # get social user
       elsif id_token.present?
         checker_context = SpreeCmCommissioner::UserIdTokenChecker.call(id_token: id_token)

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/existing_account_checker.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     include Interactor
 
     def call
-      user = Spree.user_class.find_user_by_login(context.login) if context.login.present?
+      user = Spree.user_class.find_user_by_login(context.login, context.tenant_id) if context.login.present?
 
       context.fail!(message: I18n.t('account_checker.verify.already_exist', login: context.login)) if user.present?
     end

data/app/interactors/spree_cm_commissioner/pin_code_sender.rb

@@ -1,5 +1,7 @@
 module  SpreeCmCommissioner
   class PinCodeSender < BaseInteractor
+    include SpreeCmCommissioner::PinCodeSenderHelper
+
     def call
       context.fail!(message: I18n.t('pincode_sender.pincode.blank')) if context.pin_code.nil?
 
@@ -15,10 +17,8 @@ module  SpreeCmCommissioner
     private
 
     def send_sms
-      from = context.tenant || Spree::Store.default
-
       options = {
-        from: from,
+        from: sender_name(context.tenant),
         to: context.pin_code.contact,
         body: I18n.t('pincode_sender.sms.body', code: context.pin_code.code, readable_type: context.pin_code.readable_type)
       }

data/app/interactors/spree_cm_commissioner/sms.rb

@@ -11,6 +11,8 @@ module  SpreeCmCommissioner
         context.sms_log.error = e.message
         context.sms_log.save
         context.fail!(message: e.message)
+
+        log_error_to_telegram(e.message)
       end
     end
 
@@ -57,5 +59,17 @@ module  SpreeCmCommissioner
       result = SpreeCmCommissioner::InternationalMobileFormatter.call(phone_number: number)
       result.formatted_phone_number
     end
+
+    def log_error_to_telegram(message)
+      return unless ENV['PIN_CODE_DEBUG_NOTIFIY_TELEGRAM_ENABLE'] == 'yes'
+
+      options = {
+        pin_code_id: context.pin_code.id,
+        tenant_id: context.tenant&.id,
+        error_message: message
+      }
+
+      SpreeCmCommissioner::TelegramDebugPinCodeSenderJob.perform_later(options)
+    end
   end
 end

data/app/interactors/spree_cm_commissioner/telegram_debug_pin_code_sender.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class TelegramDebugPinCodeSender < BaseInteractor
-    delegate :pin_code, :name, to: :context
+    delegate :pin_code, :name, :error_message, to: :context
 
     def call
       telegram_client.send_message(
@@ -16,6 +16,7 @@ module SpreeCmCommissioner
       text << "<b>From: #{name}</b>"
       text << "<b>PIN CODE sent to #{pin_code.contact}</b>"
       text << "<code>#{pin_code.code}</code> is your #{pin_code.readable_type}"
+      text << "⚠️ Error: <code>#{error_message}<code> ⚠️" if error_message.present?
 
       text.compact.join("\n")
     end

data/app/interactors/spree_cm_commissioner/user_forgotten_password_updater.rb

@@ -1,6 +1,7 @@
 module SpreeCmCommissioner
   class UserForgottenPasswordUpdater < BaseInteractor
     # :email, :phone_number, :country_code :pin_code, :pin_code_token, :password, :password_confirmation
+    delegate :tenant_id, to: :context
 
     def call
       find_user_by_login!
@@ -19,7 +20,7 @@ module SpreeCmCommissioner
     def find_user_by_login!
       login = phone_number || email
 
-      context.user = Spree.user_class.find_user_by_login(login)
+      context.user = Spree.user_class.find_user_by_login(login, tenant_id)
       context.fail!(message: I18n.t('account_checker.verify.not_exist', login: login)) if context.user.blank?
     end
 

data/app/interactors/spree_cm_commissioner/user_password_authenticator.rb

@@ -1,13 +1,15 @@
 module SpreeCmCommissioner
   class UserPasswordAuthenticator < BaseInteractor
-    delegate :login, :password, to: :context
+    delegate :login, :password, :tenant_id, to: :context
 
     def call
-      context.user = Spree.user_class.find_user_by_login(login)
+      context.user = Spree.user_class.find_user_by_login(login, tenant_id)
       context.fail!(message: I18n.t('authenticator.incorrect_login')) if context.user.nil?
+
       if spree_confirmable? && active_for_authentication? && !validate_password(user)
         context.fail!(message: I18n.t('authenticator.incorrect_password'))
       end
+
       context.fail!(message: I18n.t('authenticator.incorrect_password')) unless validate_password(context.user)
       context.fail!(message: 'account_temporarily_deleted') if context.user.soft_deleted?
     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/telegram_debug_pin_code_sender_job.rb

@@ -5,12 +5,14 @@ module SpreeCmCommissioner
     def perform(options)
       pin_code = SpreeCmCommissioner::PinCode.find(options[:pin_code_id])
       tenant = SpreeCmCommissioner::Tenant.find_by(id: options[:tenant_id])
+      error_message = options[:error_message]
 
       name = sender_name(tenant)
 
       SpreeCmCommissioner::TelegramDebugPinCodeSender.call(
         pin_code: pin_code,
-        name: name
+        name: name,
+        error_message: error_message
       )
     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'