fix: inconsistencies for twilio whatsapp mobile numbers

app/services/twilio/incoming_message_service.rb

@@ -44,6 +44,13 @@ class Twilio::IncomingMessageService
     twilio_channel.sms? ? params[:From] : params[:From].gsub('whatsapp:', '')
   end
 
+  def normalized_phone_number
+    return phone_number unless twilio_channel.whatsapp?
+
+    # Use the generic normalization service for Twilio WhatsApp
+    Whatsapp::PhoneNumberNormalizationService.new(inbox).normalize_and_find_contact_by_provider("whatsapp:#{phone_number}", :twilio)
+  end
+
   def formatted_phone_number
     TelephoneNumber.parse(phone_number).international_number
   end
@@ -53,8 +60,10 @@ class Twilio::IncomingMessageService
   end
 
   def set_contact
+    source_id = twilio_channel.whatsapp? ? normalized_phone_number : params[:From]
+
     contact_inbox = ::ContactInboxWithContactBuilder.new(
-      source_id: params[:From],
+      source_id: source_id,
       inbox: inbox,
       contact_attributes: contact_attributes
     ).perform

app/services/whatsapp/incoming_message_service_helpers.rb

@@ -48,7 +48,7 @@ module Whatsapp::IncomingMessageServiceHelpers
   end
 
   def processed_waid(waid)
-    Whatsapp::PhoneNumberNormalizationService.new(inbox).normalize_and_find_contact(waid)
+    Whatsapp::PhoneNumberNormalizationService.new(inbox).normalize_and_find_contact_by_provider(waid, :cloud)
   end
 
   def error_webhook_event?(message)

app/services/whatsapp/phone_normalizers/argentina_phone_normalizer.rb

@@ -0,0 +1,13 @@
+class Whatsapp::PhoneNormalizers::ArgentinaPhoneNormalizer < Whatsapp::PhoneNormalizers::BasePhoneNormalizer
+  def handles_country?(waid)
+    waid.start_with?('549')
+  end
+
+  def normalize(waid)
+    return waid unless handles_country?(waid)
+
+    # Remove the '9' after country code for Argentina numbers
+    # 5491123456789 -> 541123456789
+    waid.sub(/^549/, '54')
+  end
+end

app/services/whatsapp/phone_number_normalization_service.rb

@@ -1,23 +1,40 @@
 # Service to handle phone number normalization for WhatsApp messages
-# Currently supports Brazil phone number format variations
+# Currently supports Brazil and Argentina phone number format variations
+# Supports both WhatsApp Cloud API and Twilio WhatsApp providers
 # Designed to be extensible for additional countries in future PRs
 #
-# Usage: Whatsapp::PhoneNumberNormalizationService.new(inbox).normalize_and_find_contact(waid)
+# Usage:
+#   Whatsapp::PhoneNumberNormalizationService.new(inbox).normalize_and_find_contact_by_provider(number, :cloud)
+#   Whatsapp::PhoneNumberNormalizationService.new(inbox).normalize_and_find_contact_by_provider(number, :twilio)
 class Whatsapp::PhoneNumberNormalizationService
   def initialize(inbox)
     @inbox = inbox
   end
 
-  # Main entry point for phone number normalization
-  # Returns the source_id of an existing contact if found, otherwise returns original waid
-  def normalize_and_find_contact(waid)
-    normalizer = find_normalizer_for_country(waid)
-    return waid unless normalizer
+  # Generic method to handle both WhatsApp Cloud and Twilio formats
+  # Extracts clean number, normalizes it, and returns appropriate format for provider
+  #
+  # @param raw_number [String] The phone number in provider-specific format
+  #   - Cloud: "919745786257" (clean number)
+  #   - Twilio: "whatsapp:+919745786257" (prefixed format)
+  # @param provider [Symbol] :cloud or :twilio
+  # @return [String] Normalized source_id in provider format or original if not found
+  def normalize_and_find_contact_by_provider(raw_number, provider)
+    # Extract clean number based on provider format
+    clean_number = extract_clean_number(raw_number, provider)
 
-    normalized_waid = normalizer.normalize(waid)
-    existing_contact_inbox = find_existing_contact_inbox(normalized_waid)
+    # Find appropriate normalizer for the country
+    normalizer = find_normalizer_for_country(clean_number)
+    return raw_number unless normalizer
 
-    existing_contact_inbox&.source_id || waid
+    # Normalize the clean number
+    normalized_clean_number = normalizer.normalize(clean_number)
+
+    # Format for provider and check for existing contact
+    provider_format = format_for_provider(normalized_clean_number, provider)
+    existing_contact_inbox = find_existing_contact_inbox(provider_format)
+
+    existing_contact_inbox&.source_id || raw_number
   end
 
   private
@@ -33,7 +50,32 @@ class Whatsapp::PhoneNumberNormalizationService
     inbox.contact_inboxes.find_by(source_id: normalized_waid)
   end
 
+  # Extract clean number from provider-specific format
+  def extract_clean_number(raw_number, provider)
+    case provider
+    when :cloud
+      raw_number # Already clean: "919745786257"
+    when :twilio
+      raw_number.gsub(/^whatsapp:\+/, '') # Remove prefix: "whatsapp:+919745786257" → "919745786257"
+    else
+      raise ArgumentError, "Unsupported provider: #{provider}. Use :cloud or :twilio"
+    end
+  end
+
+  # Format normalized number for provider-specific storage
+  def format_for_provider(clean_number, provider)
+    case provider
+    when :cloud
+      clean_number # Keep clean: "919745786257"
+    when :twilio
+      "whatsapp:+#{clean_number}" # Add prefix: "919745786257" → "whatsapp:+919745786257"
+    else
+      raise ArgumentError, "Unsupported provider: #{provider}. Use :cloud or :twilio"
+    end
+  end
+
   NORMALIZERS = [
-    Whatsapp::PhoneNormalizers::BrazilPhoneNormalizer
+    Whatsapp::PhoneNormalizers::BrazilPhoneNormalizer,
+    Whatsapp::PhoneNormalizers::ArgentinaPhoneNormalizer
   ].freeze
 end