Create fallback for missing WhatsApp edit originals

Author: Caitano28

app/services/whatsapp/incoming_message_base_service.rb

@@ -172,7 +172,8 @@ def process_message_edit
 
     original_message = inbox.messages.find_by(source_id: original_source_id)
     unless original_message
-      Rails.logger.info("[WHATSAPP] Message edit ignored because original was not found original_source_id=#{original_source_id} event_id=#{message[:id]}")
+      Rails.logger.info("[WHATSAPP] Message edit fallback creating missing original original_source_id=#{original_source_id} event_id=#{message[:id]}")
+      create_message_from_edit_fallback(message, original_source_id)
       return true
     end
 
@@ -192,6 +193,28 @@ def process_message_edit
     true
   end
 
+  def create_message_from_edit_fallback(message, original_source_id)
+    set_message_type
+    set_contact
+    return unless @contact
+    return if @contact.blocked? && !outgoing_echo
+
+    ActiveRecord::Base.transaction do
+      set_conversation
+      create_message(message, source_id: original_source_id)
+      @message.content_attributes = (@message.content_attributes || {}).merge(
+        'edited' => true,
+        'edit_event_id' => message[:id],
+        'edited_at' => Time.current.utc.iso8601,
+        'edit_missing_original_fallback' => true
+      )
+      @message.content_attributes['edit_timestamp'] = message[:edit_timestamp] if message[:edit_timestamp].present?
+      attach_files
+      attach_location if message_type == 'location'
+      @message.save!
+    end
+  end
+
   def message_edit_event?
     message = messages_data&.first
     message.present? && message[:message_type].to_s == 'message_edit'

spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb

@@ -395,10 +395,17 @@
         expect(original_message.content_attributes['existing']).to be true
       end
 
-      it 'does not create a new message when the edited original message is missing' do
+      it 'creates a fallback message when the edited original message is missing' do
         expect do
           described_class.new(inbox: whatsapp_channel.inbox, params: edited_params).perform
-        end.not_to change(whatsapp_channel.inbox.messages, :count)
+        end.to change(whatsapp_channel.inbox.messages, :count).by(1)
+
+        fallback_message = whatsapp_channel.inbox.messages.find_by!(source_id: original_source_id)
+        expect(fallback_message.content).to eq('Edited message body')
+        expect(fallback_message.content_attributes['edited']).to be true
+        expect(fallback_message.content_attributes['edit_event_id']).to eq(edit_event_id)
+        expect(fallback_message.content_attributes['edit_timestamp']).to eq('1770407830000')
+        expect(fallback_message.content_attributes['edit_missing_original_fallback']).to be true
       end
     end