spree_cm_commissioner 1.19.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe05a913d5525e83a57e29a837c4c1d5b9eec1607daba170f5ce305079b340b
-  data.tar.gz: '096d9299fd1faf8d19d7ca1ba00c82fbef35f1e1a938e48b0742f38a1f017aa8'
+  metadata.gz: 7043a8acbe6da011c50dcf6d5f9c4fa4c09d44f0c273c7d8c5f35e9da6430628
+  data.tar.gz: '049dc2649fbb41b2e43945741baf9c7815ddc11b38a83cec8157c2eac5ed8431'
 SHA512:
-  metadata.gz: a5b1efce06f85b8b0439b3d9bba50066547f386c7960fe808014ee29f52598f307407d4f3e40f8320b337adcb1776882bc5d31f9f30da2b8600ecef19e74b3db
-  data.tar.gz: 1a8bbf21cce85c8d0ce52acd9e1fe9a54f48e90a010829514f1a2e192542f4b03eb9ca40fc6e91d4a2450cd2b477d380aa9bd0dfdc23f748a07e78381f7fe810
+  metadata.gz: 17233d10bfd72385a100faf262a0c236017970a4429e33098a7992dd64c217ff02c06168931f3472ef8e5a3245786df65c72f0123f2cacca58223b66c5ca6a3f
+  data.tar.gz: 68bac4de8bf2b866b75ccbcfef5c53b50786427d7cbe87e4d17fa0b284186cfbd08d71fbe8c5fe496dfce6b1e6340a6bb0be4cbac00103388c7545397ad417d1

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.19.0)
+    spree_cm_commissioner (1.21.0)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -572,6 +572,10 @@ GEM
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
     noticed (1.6.3)
       http (>= 4.0.0)
       rails (>= 5.2.0)

data/app/controllers/spree/api/v2/organizer/invite_guests_controller.rb

@@ -20,7 +20,7 @@ module Spree
 
             if guest.save
               @invite_guest.update(claimed_status: :claimed) if @line_item.guests.count == @invite_guest.quantity
-              send_guest_claimed_invitation_telegram_alert_to_vendor(guest)
+              send_guest_claimed_invitation_telegram_alert_to_vendor(guest) if guest.event.vendor.preferred_telegram_chat_id.present?
 
               render json: SpreeCmCommissioner::V2::Storefront::GuestSerializer.new(guest.reload).serializable_hash
             else

data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb

@@ -1,26 +1,17 @@
-# 🎟️ --- [TICKET CLAIMED] ---
-#
-# Order Number:
-# <code>R621016753</code>
-#
-# ✅ <b>Ticket Successfully Claimed!</b>
-#
-# [ x1 ]
-# <b>5km Running Ticket</b>
-# <i>👉 Distance: 5km, T-shirt: M</i>
-# <i>🗓️ Nov 15, 2023</i>
-# <i>🏪 Temple Run with Sai</i>
-#
-# [ x2 ]
-# <b>5km Running Ticket</b>
-# <i>👉 Distance: 5km, T-shirt: S</i>
-# <i>🗓️ Nov 15, 2023 -> Nov 17, 2023</i>
-# <i>🏪 Temple Run with Sai</i>
-#
-# <b>🙍 Claimed By</b>
-# Name: Vaneath Awesome
-# Tel: <code>+85570760548</code>
-# Email: <code>admin_dev@cm.com</code>
+# <p>📣 --- <b>[NEW GUEST CLAIMED INVITATION]</b> ---</p>
+
+# <p>✨ <b>Ticket Successfully Claimed!</b> ✨</p>
+
+# <p><b>🙍 Claimed By</b><br>
+# Name: Orng SreyMoch<br>
+# Tel: <code>0966827830</code></p>
+
+# <p><b>Run Ticket + 2 way bus ticket + Tent</b><br>
+# <i>👉 Distance: 5km, Tent: tent (1 people), and T-shirt: S</i><br>
+# <i>🗓️ May 30, 2025 -> Jun 30, 2025</i></p>
+
+# <p><b>📑 Order Number:</b><br>
+# <code>R172627517</code></p>
 
 module SpreeCmCommissioner
   class InviteGuestClaimedTelegramMessageFactory < TelegramMessageFactory
@@ -44,77 +35,39 @@ module SpreeCmCommissioner
     # override
     def body
       text = []
-      text << "Order Number:\n<code>#{order.number}</code>\n"
-      text << "\n✅ <b>Ticket Successfully Claimed!</b>\n"
-      text << selected_line_items.map { |item| line_item_content(item) }.compact.join("\n\n")
-      text.compact.join("\n")
+      text << '<p>📣 --- <b>[NEW GUEST CLAIMED INVITATION]</b> ---</p>'
+      text << '<p>✨ <b>Ticket Successfully Claimed!</b> ✨</p>'
+      text << '<p><b>🙍 Claimed By</b><br>'
+      text << "Name: #{guest.first_name} #{guest.last_name}<br>"
+      text << "Tel: <code>#{guest.phone_number}</code></p>"
+
+      selected_line_items.each do |item|
+        text << line_item_block(item)
+      end
+
+      text << "<p><b>📑 Order Number:</b><br><code>#{order.number}</code></p>"
+
+      text.join("\n")
     end
 
-    def line_item_content(line_item)
-      text = []
+    def line_item_block(item)
+      parts = []
+      parts << "<p><b>#{item.product.name}</b><br>"
 
-      text << bold(line_item.product.name.to_s)
-      text << "Quantity: #{line_item.quantity}"
-      text << italic("👉 #{line_item.options_text}") if line_item.options_text.present?
-      text << italic(pretty_date_for(line_item)) if pretty_date_for(line_item).present?
-      text << italic("🏪 #{line_item.vendor.name}") if line_item.vendor&.name.present? && vendor.blank?
+      details = []
+      details << "👉 #{item.options_text}" if item.options_text.present?
+      details << pretty_date_for(item) if item.date_present?
 
-      text.compact.join("\n")
+      parts << details.map { |d| "<i>#{d}</i><br>" }.join
+      parts << '</p>'
+      parts.join("\n")
     end
 
     def pretty_date_for(line_item)
-      return nil unless line_item.date_present?
-
       from_date = pretty_date(line_item.from_date)
       to_date = pretty_date(line_item.to_date)
 
-      if from_date == to_date
-        "🗓️ #{from_date}"
-      else
-        "🗓️ #{from_date} -> #{to_date}"
-      end
-    end
-
-    # override
-    def footer
-      text = []
-
-      text << bold('🙍 Claimed By')
-      text << "Name: #{guest.first_name} #{guest.last_name}" if guest.first_name.present? || guest.last_name.present?
-      text << "Tel: #{inline_code(guest.intel_phone_number)}" if guest.intel_phone_number.present?
-
-      if show_details_link && order.guests.any?
-        text << ''
-        text << 'View Tickets:'
-        text += generate_guests_links(order.guests)
-      end
-
-      text.compact.join("\n")
-    end
-
-    # Result:
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 |
-    def generate_guests_links(guests, guests_per_row = 2)
-      rows = (guests.size.to_f / guests_per_row).ceil
-      formatted_rows = []
-
-      rows.times do |i|
-        row_guests = guests.slice(i * guests_per_row, guests_per_row)
-        formatted_row = row_guests.map do |guest|
-          button_label = guest.seat_number.present? ? "No. #{guest.seat_number}" : "No. #{guest.formatted_bib_number || 'N/A'}"
-          link = Rails.application.routes.url_helpers.guest_cards_url(guest.token)
-          "| <a href='#{link}'>#{button_label}</a>"
-        end.join(' ')
-
-        formatted_rows << ("#{formatted_row} |")
-      end
-
-      formatted_rows
+      from_date == to_date ? "🗓️ #{from_date}" : "🗓️ #{from_date} -> #{to_date}"
     end
   end
 end

data/app/interactors/spree_cm_commissioner/pin_code_sender.rb

@@ -18,7 +18,6 @@ module  SpreeCmCommissioner
 
     def send_sms
       options = {
-        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

@@ -42,7 +42,7 @@ module  SpreeCmCommissioner
     end
 
     def sms_options
-      opts = { from: context.from, to: context.to, body: context.body }
+      opts = { to: context.to, body: context.body }
       opts[:to] = sanitize(opts[:to]) if opts[:to].present?
       opts[:from] = from_number
       opts

data/app/interactors/spree_cm_commissioner/user_id_token_authenticator.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class UserIdTokenAuthenticator < BaseInteractor
-    # :id_token
+    # :id_token, :tenant_id (optional)
     def call
       context.user = if checker.user.nil?
                        register_user
@@ -14,7 +14,11 @@ module SpreeCmCommissioner
     end
 
     def register_user
-      register_context = SpreeCmCommissioner::UserRegistrationWithIdToken.call(id_token: context.id_token)
+      register_context = SpreeCmCommissioner::UserRegistrationWithIdToken.call(
+        id_token: context.id_token,
+        tenant_id: context.tenant_id
+      )
+
       register_context.user
     end
 
@@ -27,7 +31,7 @@ module SpreeCmCommissioner
     end
 
     def checker
-      @checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token)
+      @checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token, tenant_id: context.tenant_id)
       @checker
     end
   end

data/app/interactors/spree_cm_commissioner/user_id_token_checker.rb

@@ -1,6 +1,9 @@
 module SpreeCmCommissioner
   class UserIdTokenChecker < BaseInteractor
-    # :id_token
+    # expects:
+    #   context.id_token
+    #   context.tenant_id (optional)
+
     def call
       firebase_id_token_context = SpreeCmCommissioner::FirebaseIdTokenProvider.call(id_token: context.id_token)
 
@@ -11,9 +14,14 @@ module SpreeCmCommissioner
       end
     end
 
-    # :identity_type, :sub
+    # :identity_type, :sub, :tenant_id
     def validate_user_by_provider(provider)
-      identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(provider)
+      identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(
+        identity_type: provider[:identity_type],
+        sub: provider[:sub],
+        tenant_id: context.tenant_id
+      )
+
       if identity_checker.success?
         context.user = identity_checker.user
       else

data/app/interactors/spree_cm_commissioner/user_identity_checker.rb

@@ -1,6 +1,10 @@
 module SpreeCmCommissioner
   class UserIdentityChecker < BaseInteractor
-    # :identity_type, :sub
+    # expects:
+    #   context.identity_type
+    #   context.sub
+    #   context.tenant_id (optional)
+
     def call
       load_user
 
@@ -11,12 +15,14 @@ module SpreeCmCommissioner
     end
 
     def load_user
-      user_identity_provider = UserIdentityProvider.where(
-        identity_type: context.identity_type,
-        sub: context.sub
-      ).first
+      return if context.sub.blank? || context.identity_type.blank?
+
+      user_identity_provider = UserIdentityProvider.joins(:user)
+                                                   .where(identity_type: context.identity_type, sub: context.sub)
+                                                   .where(spree_users: { tenant_id: context.tenant_id })
+                                                   .first
 
-      context.user = (user_identity_provider.user if user_identity_provider.present?)
+      context.user = user_identity_provider&.user
     end
   end
 end

data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb

@@ -15,7 +15,13 @@ module SpreeCmCommissioner
     end
 
     def register_user!(name, email)
-      user = Spree.user_class.new(password: SecureRandom.base64(16), email: email, **name_attributes(name))
+      user = Spree.user_class.new(
+        password: SecureRandom.base64(16),
+        email: email,
+        tenant_id: context.tenant_id,
+        **name_attributes(name)
+      )
+
       if user.save(validate: false)
         context.user = user
       else

data/app/jobs/spree_cm_commissioner/sms_pin_code_job.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class SmsPinCodeJob < SpreeCmCommissioner::SmsJob
-    # options = { from: xxx, to: xxxx, body: xxxx }
+    # options = { to: xxxx, body: xxxx }
     def perform(options)
       SpreeCmCommissioner::Sms.call(options)
     end

data/app/models/spree_cm_commissioner/user_identity_provider.rb

@@ -3,15 +3,17 @@ module SpreeCmCommissioner
     enum identity_type: { :google => 0, :apple => 1, :facebook => 2, :telegram => 3, :vattanac_bank => 4 }
 
     belongs_to :user, class_name: Spree.user_class.to_s, optional: false
+    has_one :tenant, through: :user
 
-    validates :sub, presence: true
-    validates :sub, uniqueness: { scope: :identity_type }
+    has_many :user_identity_provider_telegram_bots
+    has_many :telegram_bots, through: :user_identity_provider_telegram_bots
 
+    validates :sub, presence: true
     validates :identity_type, presence: true
     validates :identity_type, uniqueness: { scope: :user_id }
 
-    has_many :user_identity_provider_telegram_bots
-    has_many :telegram_bots, through: :user_identity_provider_telegram_bots
+    # custom validation to ensure that the sub is unique per identity_type and spree_users.tenant
+    validate :unique_sub_per_identity_type_and_tenant
 
     # sub is a telegram uid, which telegram considered a chatID if
     # user have /started with bot.
@@ -20,5 +22,25 @@ module SpreeCmCommissioner
 
       nil
     end
+
+    private
+
+    def unique_sub_per_identity_type_and_tenant
+      return if user.nil? || sub.blank? || identity_type.blank?
+
+      tenant_id = user.tenant_id
+
+      # Check for duplicates in the same tenant
+      scope = self.class
+                  .joins(:user)
+                  .where(sub: sub, identity_type: identity_type)
+                  .where(spree_users: { tenant_id: tenant_id })
+
+      scope = scope.where.not(id: id) if persisted?
+
+      return unless scope.exists?
+
+      errors.add(:sub, 'must be unique per identity_type and tenant')
+    end
   end
 end

data/app/serializers/spree/v2/tenant/user_serializer.rb

@@ -11,6 +11,7 @@ module Spree
         has_one :profile, serializer: Spree::V2::Tenant::AssetSerializer
         has_many :device_tokens, serializer: Spree::V2::Tenant::UserDeviceTokenSerializer
         has_many :spree_roles, serializer: Spree::V2::Tenant::RoleSerializer
+        has_many :user_identity_providers, serializer: Spree::V2::Tenant::UserIdentityProviderSerializer
 
         attribute :store_credits, &:total_available_store_credit
 

data/app/services/spree_cm_commissioner/user_authenticator.rb

@@ -32,7 +32,7 @@ module SpreeCmCommissioner
         options = { login: params[:username], password: params[:password], tenant_id: tenant_id }
         SpreeCmCommissioner::UserPasswordAuthenticator.call(options)
       when 'social_auth'
-        options = { id_token: params[:id_token] }
+        options = { id_token: params[:id_token], tenant_id: tenant_id }
         SpreeCmCommissioner::UserIdTokenAuthenticator.call(options)
       when 'telegram_web_app_auth'
         options = { telegram_init_data: params[:telegram_init_data], telegram_bot_username: params[:tg_bot] }

data/db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb

@@ -0,0 +1,13 @@
+class RemoveIndexesFromCmUserIdentityProviders < ActiveRecord::Migration[7.0]
+  def change
+    execute <<-SQL
+      ALTER TABLE cm_user_identity_providers
+      DROP CONSTRAINT IF EXISTS index_cm_user_identity_providers_on_identity_type_and_sub;
+    SQL
+
+    execute <<-SQL
+      ALTER TABLE cm_user_identity_providers
+      DROP CONSTRAINT IF EXISTS index_cm_user_identity_providers_on_user_id_and_identity_type;
+    SQL
+  end
+end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :user_identity_provider, class: SpreeCmCommissioner::UserIdentityProvider do
+  factory :cm_user_identity_provider, class: SpreeCmCommissioner::UserIdentityProvider do
     sequence(:sub) { |n| "sub-#{n}" }
     identity_type { SpreeCmCommissioner::UserIdentityProvider.identity_types[:google] }
     email { 'fake@example.com' }

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.19.0'.freeze
+  VERSION = '1.21.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.21.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-18 00:00:00.000000000 Z
+date: 2025-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2537,6 +2537,7 @@ files:
 - db/migrate/20250711093045_add_position_to_cm_dynamic_field_options.rb
 - db/migrate/20250714121508_rename_cm_taxon_blazer_query_to_blazer_queryables.rb
 - db/migrate/20250714124323_make_cm_blazer_queryables_polymorphic.rb
+- db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem