Chore: Improve conversation auto resolution (#3405)

Fixes: #1583

app/models/concerns/activity_message_handler.rb

@@ -11,7 +11,6 @@ module ActivityMessageHandler
 
   def status_change_activity(user_name)
     create_status_change_message(user_name)
-    queue_conversation_auto_resolution_job if open?
   end
 
   def activity_message_params(content)

app/models/conversation.rb

@@ -57,6 +57,11 @@ class Conversation < ApplicationRecord
   scope :unassigned, -> { where(assignee_id: nil) }
   scope :assigned, -> { where.not(assignee_id: nil) }
   scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
+  scope :resolvable, lambda { |auto_resolve_duration|
+    return [] if auto_resolve_duration.to_i.zero?
+
+    open.where('last_activity_at < ? ', Time.now.utc - auto_resolve_duration.days)
+  }
 
   belongs_to :account
   belongs_to :inbox
@@ -74,7 +79,7 @@ class Conversation < ApplicationRecord
   before_create :mark_conversation_pending_if_bot
 
   after_update_commit :execute_after_update_commit_callbacks
-  after_create_commit :notify_conversation_creation, :queue_conversation_auto_resolution_job
+  after_create_commit :notify_conversation_creation
   after_commit :set_display_id, unless: :display_id?
 
   delegate :auto_resolve_duration, to: :account
@@ -175,14 +180,6 @@ class Conversation < ApplicationRecord
     dispatcher_dispatch(CONVERSATION_CREATED)
   end
 
-  def queue_conversation_auto_resolution_job
-    # FIXME: Move this to one cronjob that iterates over accounts and enqueue resolution jobs
-    # Similar to how we handle campaigns
-    return unless auto_resolve_duration
-
-    AutoResolveConversationsJob.set(wait_until: (last_activity_at || created_at) + auto_resolve_duration.days).perform_later(id)
-  end
-
   def self_assign?(assignee_id)
     assignee_id.present? && Current.user&.id == assignee_id
   end