90352b3a20
## Description Modified the phone number validation in Whatsapp::ChannelCreationService to check for duplicate phone numbers across ALL accounts, not just within the current account. ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? - Added test coverage for cross-account phone number validation - Using actual UI flow <img width="1493" height="532" alt="image" src="https://github.com/user-attachments/assets/67d2bb99-2eb9-4115-8d56-449e4785e0d8" /> ## Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
74 lines
1.8 KiB
Ruby
74 lines
1.8 KiB
Ruby
class Whatsapp::ChannelCreationService
|
|
def initialize(account, waba_info, phone_info, access_token)
|
|
@account = account
|
|
@waba_info = waba_info
|
|
@phone_info = phone_info
|
|
@access_token = access_token
|
|
end
|
|
|
|
def perform
|
|
validate_parameters!
|
|
|
|
existing_channel = find_existing_channel
|
|
raise I18n.t('errors.whatsapp.phone_number_already_exists', phone_number: existing_channel.phone_number) if existing_channel
|
|
|
|
create_channel_with_inbox
|
|
end
|
|
|
|
private
|
|
|
|
def validate_parameters!
|
|
raise ArgumentError, 'Account is required' if @account.blank?
|
|
raise ArgumentError, 'WABA info is required' if @waba_info.blank?
|
|
raise ArgumentError, 'Phone info is required' if @phone_info.blank?
|
|
raise ArgumentError, 'Access token is required' if @access_token.blank?
|
|
end
|
|
|
|
def find_existing_channel
|
|
Channel::Whatsapp.find_by(
|
|
phone_number: @phone_info[:phone_number]
|
|
)
|
|
end
|
|
|
|
def create_channel_with_inbox
|
|
ActiveRecord::Base.transaction do
|
|
channel = build_channel
|
|
create_inbox(channel)
|
|
channel
|
|
end
|
|
end
|
|
|
|
def build_channel
|
|
Channel::Whatsapp.build(
|
|
account: @account,
|
|
phone_number: @phone_info[:phone_number],
|
|
provider: 'whatsapp_cloud',
|
|
provider_config: build_provider_config
|
|
)
|
|
end
|
|
|
|
def build_provider_config
|
|
{
|
|
api_key: @access_token,
|
|
phone_number_id: @phone_info[:phone_number_id],
|
|
business_account_id: @waba_info[:waba_id],
|
|
source: 'embedded_signup'
|
|
}
|
|
end
|
|
|
|
def create_inbox(channel)
|
|
inbox_name = build_inbox_name
|
|
|
|
Inbox.create!(
|
|
account: @account,
|
|
name: inbox_name,
|
|
channel: channel
|
|
)
|
|
end
|
|
|
|
def build_inbox_name
|
|
business_name = @phone_info[:business_name] || @waba_info[:business_name]
|
|
"#{business_name} WhatsApp"
|
|
end
|
|
end
|