Send out the text of a message that has an image

tactilenews · Nov 7, 2024 · a37caf6 · a37caf6
1 parent 085921a
commit a37caf6
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 11 deletions.
diff --git a/app/adapters/whats_app_adapter/three_sixty_dialog_outbound.rb b/app/adapters/whats_app_adapter/three_sixty_dialog_outbound.rb
@@ -114,17 +114,15 @@ def send_message_template(recipient, message)
       def send_message(recipient, message)
         files = message.files
 
-        if files.blank?
-          WhatsAppAdapter::ThreeSixtyDialogOutbound::Text.perform_later(organization_id: message.organization.id,
-                                                                        payload: text_payload(
-                                                                          recipient, message.text
-                                                                        ),
-                                                                        message_id: message.id)
-        else
-          files.each do |_file|
-            WhatsAppAdapter::ThreeSixtyDialog::UploadFileJob.perform_later(message_id: message.id)
-          end
-        end
+        WhatsAppAdapter::ThreeSixtyDialog::UploadFileJob.perform_later(message_id: message.id) if files.present?
+
+        return if message.text.blank?
+
+        WhatsAppAdapter::ThreeSixtyDialogOutbound::Text.perform_later(organization_id: message.organization.id,
+                                                                      payload: text_payload(
+                                                                        recipient, message.text
+                                                                      ),
+                                                                      message_id: message.id)
       end
 
       # rubocop:disable Metrics/MethodLength

diff --git a/spec/jobs/whats_app_adapter/three_sixty_dialog/process_webhook_job_spec.rb b/spec/jobs/whats_app_adapter/three_sixty_dialog/process_webhook_job_spec.rb
@@ -85,6 +85,47 @@
                 text_payload.merge({ message_id: latest_message.id })
               )
             end
+
+            context 'message with file, no text' do
+              let(:message_file) do
+                [create(:file, message: latest_message,
+                               attachment: Rack::Test::UploadedFile.new(Rails.root.join('spec/fixtures/files/matt.jpeg'), 'image/jpeg'))]
+              end
+
+              before do
+                latest_message.update!(text: '', files: message_file)
+              end
+
+              it 'enqueues a job to upload the file' do
+                expect do
+                  subject.call
+                end.to have_enqueued_job(WhatsAppAdapter::ThreeSixtyDialog::UploadFileJob).on_queue('default').with(
+                  message_id: latest_message.id
+                )
+              end
+
+              context 'message with file and text' do
+                before do
+                  latest_message.update!(text: 'Some text')
+                end
+
+                it 'enqueues a job to upload the file' do
+                  expect do
+                    subject.call
+                  end.to have_enqueued_job(WhatsAppAdapter::ThreeSixtyDialog::UploadFileJob).on_queue('default').with(
+                    message_id: latest_message.id
+                  )
+                end
+
+                it 'enqueues a job to send out the text' do
+                  expect do
+                    subject.call
+                  end.to have_enqueued_job(WhatsAppAdapter::ThreeSixtyDialogOutbound::Text).on_queue('default').with(
+                    text_payload.merge({ message_id: latest_message.id })
+                  )
+                end
+              end
+            end
           end
 
           describe 'with an external id' do