From 2b50909d9be57f1feaf7f4d882006425e162804c Mon Sep 17 00:00:00 2001
From: Tanmay Deep Sharma <32020192+tds-1@users.noreply.github.com>
Date: Fri, 20 Mar 2026 16:28:05 +0530
Subject: [PATCH] fix: use last_activity_at for orphan conversation cleanup
 timeframe (#13859)

## Description

The RemoveOrphanConversationsService filters orphan conversations by a
time window before deleting them. Previously it used created_at, which
could miss old conversations that still had recent activity.
Switching to last_activity_at ensures the cleanup window reflects actual
conversation activity rather than creation time.

## Type of change

Please delete options that are not relevant.

- [ ] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

- By running Rake task
- Run the job from console

## Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
 app/services/internal/remove_orphan_conversations_service.rb | 2 +-
 lib/tasks/ops/cleanup_orphan_conversations.rake              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/internal/remove_orphan_conversations_service.rb b/app/services/internal/remove_orphan_conversations_service.rb
index c52d6082b..ee565b003 100644
--- a/app/services/internal/remove_orphan_conversations_service.rb
+++ b/app/services/internal/remove_orphan_conversations_service.rb
@@ -25,7 +25,7 @@ class Internal::RemoveOrphanConversationsService
 
   def build_orphan_conversations_query
     base = @account ? @account.conversations : Conversation.all
-    base = base.where('conversations.created_at > ?', @days.days.ago)
+    base = base.where('conversations.last_activity_at > ?', @days.days.ago)
     base = base.left_outer_joins(:contact, :inbox)
 
     # Find conversations whose associated contact or inbox record is missing
diff --git a/lib/tasks/ops/cleanup_orphan_conversations.rake b/lib/tasks/ops/cleanup_orphan_conversations.rake
index 20cb207d6..481eb3bc3 100644
--- a/lib/tasks/ops/cleanup_orphan_conversations.rake
+++ b/lib/tasks/ops/cleanup_orphan_conversations.rake
@@ -20,7 +20,7 @@ namespace :chatwoot do
       # Preview count using the same query logic
       base = account
              .conversations
-             .where('conversations.created_at > ?', days.days.ago)
+             .where('conversations.last_activity_at > ?', days.days.ago)
              .left_outer_joins(:contact, :inbox)
       conversations = base.where(contacts: { id: nil }).or(base.where(inboxes: { id: nil }))