Chore: Improve conversation auto resolution (#3405)

Fixes: #1583

spec/jobs/account/conversations_resolution_scheduler_job_spec.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe Account::ConversationsResolutionSchedulerJob, type: :job do
+  subject(:job) { described_class.perform_later }
+
+  let!(:account) { create(:account) }
+
+  it 'enqueues the job' do
+    expect { job }.to have_enqueued_job(described_class)
+      .on_queue('scheduled_jobs')
+  end
+
+  it 'enqueues Conversations::ResolutionJob' do
+    account.update(auto_resolve_duration: 10)
+    expect(Conversations::ResolutionJob).to receive(:perform_later).with(account: account).once
+    described_class.perform_now
+  end
+end

spec/jobs/auto_resolve_conversations_job_spec.rb

@@ -1,34 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe AutoResolveConversationsJob, type: :job do
-  subject(:job) { described_class.perform_later(conversation.id) }
-
-  let!(:account) { create(:account) }
-  let!(:conversation) { create(:conversation, account: account) }
-
-  it 'queues the job' do
-    expect { job }.to have_enqueued_job(described_class)
-      .with(conversation.id)
-      .on_queue('medium')
-  end
-
-  it 'does nothing when there is no auto resolve duration' do
-    described_class.perform_now(conversation.id)
-    expect(conversation.reload.status).to eq('open')
-  end
-
-  it 're-queues the job if there is still time left to allow inactivity' do
-    account.update(auto_resolve_duration: 10)
-    conversation.update(last_activity_at: 3.days.ago)
-    expect { described_class.perform_now(conversation.id) }.to have_enqueued_job(described_class)
-      .with(conversation.id)
-      .on_queue('medium')
-  end
-
-  it 'resolves the issue if time of inactivity is more than the auto resolve duration' do
-    account.update(auto_resolve_duration: 10)
-    conversation.update(last_activity_at: 13.days.ago)
-    described_class.perform_now(conversation.id)
-    expect(conversation.reload.status).to eq('resolved')
-  end
-end

spec/jobs/conversations/resolution_job_spec.rb

@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+RSpec.describe Conversations::ResolutionJob, type: :job do
+  subject(:job) { described_class.perform_later(account) }
+
+  let!(:account) { create(:account) }
+  let!(:conversation) { create(:conversation, account: account) }
+
+  it 'enqueues the job' do
+    expect { job }.to have_enqueued_job(described_class)
+      .with(account)
+      .on_queue('medium')
+  end
+
+  it 'does nothing when there is no auto resolve duration' do
+    described_class.perform_now(account: account)
+    expect(conversation.reload.status).to eq('open')
+  end
+
+  it 'resolves the issue if time of inactivity is more than the auto resolve duration' do
+    account.update(auto_resolve_duration: 10)
+    conversation.update(last_activity_at: 13.days.ago)
+    described_class.perform_now(account: account)
+    expect(conversation.reload.status).to eq('resolved')
+  end
+end

spec/jobs/trigger_scheduled_items_job_spec.rb

@@ -25,5 +25,10 @@ RSpec.describe TriggerScheduledItemsJob, type: :job do
       expect(Conversations::ReopenSnoozedConversationsJob).to receive(:perform_later).once
       described_class.perform_now
     end
+
+    it 'triggers Account::ConversationsResolutionSchedulerJob' do
+      expect(Account::ConversationsResolutionSchedulerJob).to receive(:perform_later).once
+      described_class.perform_now
+    end
   end
 end

spec/models/conversation_spec.rb

@@ -56,19 +56,6 @@ RSpec.describe Conversation, type: :model do
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::CONVERSATION_CREATED, kind_of(Time), conversation: conversation)
     end
-
-    it 'queues AutoResolveConversationsJob post creation if auto resolve duration present' do
-      account.update(auto_resolve_duration: 30)
-      expect do
-        create(
-          :conversation,
-          account: account,
-          contact: create(:contact, account: account),
-          inbox: inbox,
-          assignee: nil
-        )
-      end.to have_enqueued_job(AutoResolveConversationsJob)
-    end
   end
 
   describe '.after_update' do
@@ -138,18 +125,6 @@ RSpec.describe Conversation, type: :model do
         .with(conversation2, { account_id: conversation2.account_id, inbox_id: conversation2.inbox_id, message_type: :activity,
                                content: system_resolved_message })
     end
-
-    it 'does not trigger AutoResolutionJob if conversation reopened and account does not have auto resolve duration' do
-      expect { conversation.update(status: :open) }
-        .not_to have_enqueued_job(AutoResolveConversationsJob).with(conversation.id)
-    end
-
-    it 'does trigger AutoResolutionJob if conversation reopened and account has auto resolve duration' do
-      account.update(auto_resolve_duration: 40)
-      conversation.resolved!
-      conversation.reload.update(status: :open)
-      expect(AutoResolveConversationsJob).to have_been_enqueued.with(conversation.id)
-    end
   end
 
   describe '#update_labels' do