From 0851362793e03739ee4b8fff64781cd5bf5b2d90 Mon Sep 17 00:00:00 2001
From: "Sure Admin (bot)" <sure-admin@splashblot.com>
Date: Sat, 2 May 2026 12:55:44 +0200
Subject: [PATCH] fix(recurring): make account-scoping migration resilient to
 legacy duplicates (#1623)

* fix(recurring): dedupe legacy rows before acct index migration

* style(recurring): fix migration indentation

* style(recurring): satisfy indented internal methods

* style(recurring): move helper below public migration methods

---------

Co-authored-by: SureBot <sure-bot@we-promise.com>
---
 ...dd_account_id_to_recurring_transactions.rb | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/db/migrate/20260326112218_add_account_id_to_recurring_transactions.rb b/db/migrate/20260326112218_add_account_id_to_recurring_transactions.rb
index d8289f59d..c504abcc2 100644
--- a/db/migrate/20260326112218_add_account_id_to_recurring_transactions.rb
+++ b/db/migrate/20260326112218_add_account_id_to_recurring_transactions.rb
@@ -1,5 +1,19 @@
 class AddAccountIdToRecurringTransactions < ActiveRecord::Migration[7.2]
   def up
+    # Some long-lived self-hosted instances can already contain duplicate recurring
+    # rows because older name-based uniqueness was reflected in schema.rb but was not
+    # enforced by a migration on upgraded databases. Deduplicate on the pre-migration
+    # shape first so the migration can recover cleanly after a rollback.
+    dedupe_recurring_transactions!(
+      partition_columns: %w[family_id merchant_id amount currency],
+      where_clause: "merchant_id IS NOT NULL"
+    )
+
+    dedupe_recurring_transactions!(
+      partition_columns: %w[family_id name amount currency],
+      where_clause: "merchant_id IS NULL AND name IS NOT NULL"
+    )
+
     add_reference :recurring_transactions, :account, type: :uuid, null: true, foreign_key: true
 
     # Backfill account_id from the most recent matching entry
@@ -25,6 +39,18 @@ class AddAccountIdToRecurringTransactions < ActiveRecord::Migration[7.2]
       WHERE rt.id = subquery.recurring_transaction_id
     SQL
 
+    # Deduplicate again after backfill because rows that were distinct at the
+    # family level can collapse onto the same account-scoped uniqueness key.
+    dedupe_recurring_transactions!(
+      partition_columns: %w[family_id account_id merchant_id amount currency],
+      where_clause: "merchant_id IS NOT NULL"
+    )
+
+    dedupe_recurring_transactions!(
+      partition_columns: %w[family_id account_id name amount currency],
+      where_clause: "merchant_id IS NULL AND name IS NOT NULL"
+    )
+
     # Remove old unique indexes
     remove_index :recurring_transactions, name: "idx_recurring_txns_merchant", if_exists: true
     remove_index :recurring_transactions, name: "idx_recurring_txns_name", if_exists: true
@@ -61,4 +87,28 @@ class AddAccountIdToRecurringTransactions < ActiveRecord::Migration[7.2]
 
     remove_reference :recurring_transactions, :account
   end
+
+  private
+
+    def dedupe_recurring_transactions!(partition_columns:, where_clause:)
+      execute <<~SQL
+        WITH ranked AS (
+          SELECT id,
+                 ROW_NUMBER() OVER (
+                   PARTITION BY #{partition_columns.join(', ')}
+                   ORDER BY manual DESC,
+                            (status = 'active') DESC,
+                            last_occurrence_date DESC NULLS LAST,
+                            updated_at DESC,
+                            id DESC
+                 ) AS row_num
+          FROM recurring_transactions
+          WHERE #{where_clause}
+        )
+        DELETE FROM recurring_transactions
+        WHERE id IN (
+          SELECT id FROM ranked WHERE row_num > 1
+        )
+      SQL
+    end
 end