Add RejectedTransfer model, simplify auto matching (#1690)

* Allow transfers to match when inflow is after outflow

* Simplify transfer auto matching with RejectedTransfer model

* Validations

* Reset migrations

app/models/account.rb

@@ -159,4 +159,62 @@ class Account < ApplicationRecord
         entryable: Account::Valuation.new
     end
   end
+
+  def transfer_match_candidates
+    Account::Entry.select([
+      "inflow_candidates.entryable_id as inflow_transaction_id",
+      "outflow_candidates.entryable_id as outflow_transaction_id",
+      "ABS(inflow_candidates.date - outflow_candidates.date) as date_diff"
+    ]).from("account_entries inflow_candidates")
+      .joins("
+        JOIN account_entries outflow_candidates ON (
+          inflow_candidates.amount < 0 AND
+          outflow_candidates.amount > 0 AND
+          inflow_candidates.amount = -outflow_candidates.amount AND
+          inflow_candidates.currency = outflow_candidates.currency AND
+          inflow_candidates.account_id <> outflow_candidates.account_id AND
+          inflow_candidates.date BETWEEN outflow_candidates.date - 4 AND outflow_candidates.date + 4
+        )
+      ").joins("
+        LEFT JOIN transfers existing_transfers ON (
+          existing_transfers.inflow_transaction_id = inflow_candidates.entryable_id OR
+          existing_transfers.outflow_transaction_id = outflow_candidates.entryable_id
+        )
+      ")
+      .joins("LEFT JOIN rejected_transfers ON (
+        rejected_transfers.inflow_transaction_id = inflow_candidates.entryable_id AND
+        rejected_transfers.outflow_transaction_id = outflow_candidates.entryable_id
+      )")
+      .joins("JOIN accounts inflow_accounts ON inflow_accounts.id = inflow_candidates.account_id")
+      .joins("JOIN accounts outflow_accounts ON outflow_accounts.id = outflow_candidates.account_id")
+      .where("inflow_accounts.family_id = ? AND outflow_accounts.family_id = ?", self.family_id, self.family_id)
+      .where("inflow_candidates.entryable_type = 'Account::Transaction' AND outflow_candidates.entryable_type = 'Account::Transaction'")
+      .where(existing_transfers: { id: nil })
+      .order("date_diff ASC") # Closest matches first
+  end
+
+  def auto_match_transfers!
+    # Exclude already matched transfers
+    candidates_scope = transfer_match_candidates.where(rejected_transfers: { id: nil })
+
+    # Track which transactions we've already matched to avoid duplicates
+    used_transaction_ids = Set.new
+
+    candidates = []
+
+    Transfer.transaction do
+      candidates_scope.each do |match|
+        next if used_transaction_ids.include?(match.inflow_transaction_id) ||
+               used_transaction_ids.include?(match.outflow_transaction_id)
+
+        Transfer.create!(
+          inflow_transaction_id: match.inflow_transaction_id,
+          outflow_transaction_id: match.outflow_transaction_id,
+        )
+
+        used_transaction_ids << match.inflow_transaction_id
+        used_transaction_ids << match.outflow_transaction_id
+      end
+    end
+  end
 end

app/models/account/entry.rb

@@ -77,12 +77,20 @@ class Account::Entry < ApplicationRecord
   end
 
   def transfer_match_candidates
-    account.family.entries
-          .where.not(account_id: account_id)
-          .where.not(id: id)
-          .where(amount: -amount)
-          .where(currency: currency)
-          .where(date: (date - 4.days)..(date + 4.days))
+    candidates_scope = account.transfer_match_candidates
+
+    candidates_scope = if amount.negative?
+      candidates_scope.where("inflow_candidates.entryable_id = ?", entryable_id)
+    else
+      candidates_scope.where("outflow_candidates.entryable_id = ?", entryable_id)
+    end
+
+    candidates_scope.map do |pm|
+      Transfer.new(
+        inflow_transaction_id: pm.inflow_transaction_id,
+        outflow_transaction_id: pm.outflow_transaction_id,
+      )
+    end
   end
 
   class << self

app/models/account/syncer.rb

@@ -5,7 +5,7 @@ class Account::Syncer
   end
 
   def run
-    Transfer.auto_match_for_account(account)
+    account.auto_match_transfers!
 
     holdings = sync_holdings
     balances = sync_balances(holdings)

app/models/account/transaction.rb

@@ -9,6 +9,10 @@ class Account::Transaction < ApplicationRecord
   has_one :transfer_as_inflow, class_name: "Transfer", foreign_key: "inflow_transaction_id", dependent: :destroy
   has_one :transfer_as_outflow, class_name: "Transfer", foreign_key: "outflow_transaction_id", dependent: :destroy
 
+  # We keep track of rejected transfers to avoid auto-matching them again
+  has_one :rejected_transfer_as_inflow, class_name: "RejectedTransfer", foreign_key: "inflow_transaction_id", dependent: :destroy
+  has_one :rejected_transfer_as_outflow, class_name: "RejectedTransfer", foreign_key: "outflow_transaction_id", dependent: :destroy
+
   accepts_nested_attributes_for :taggings, allow_destroy: true
 
   scope :active, -> { where(excluded: false) }
@@ -24,6 +28,6 @@ class Account::Transaction < ApplicationRecord
   end
 
   def transfer?
-    transfer.present? && transfer.status != "rejected"
+    transfer.present?
   end
 end

app/models/rejected_transfer.rb

@@ -0,0 +1,4 @@
+class RejectedTransfer < ApplicationRecord
+  belongs_to :inflow_transaction, class_name: "Account::Transaction"
+  belongs_to :outflow_transaction, class_name: "Account::Transaction"
+end

app/models/transfer.rb

@@ -2,13 +2,15 @@ class Transfer < ApplicationRecord
   belongs_to :inflow_transaction, class_name: "Account::Transaction"
   belongs_to :outflow_transaction, class_name: "Account::Transaction"
 
-  enum :status, { pending: "pending", confirmed: "confirmed", rejected: "rejected" }
+  enum :status, { pending: "pending", confirmed: "confirmed" }
+
+  validates :inflow_transaction_id, uniqueness: true
+  validates :outflow_transaction_id, uniqueness: true
 
   validate :transfer_has_different_accounts
   validate :transfer_has_opposite_amounts
   validate :transfer_within_date_range
   validate :transfer_has_same_family
-  validate :inflow_on_or_after_outflow
 
   class << self
     def from_accounts(from_account:, to_account:, date:, amount:)
@@ -42,45 +44,19 @@ class Transfer < ApplicationRecord
         status: "confirmed"
       )
     end
+  end
 
-    def auto_match_for_account(account)
-      matches = Account::Entry.select([
-        "inflow_candidates.entryable_id as inflow_transaction_id",
-        "outflow_candidates.entryable_id as outflow_transaction_id"
-      ]).from("account_entries inflow_candidates")
-        .joins("
-          JOIN account_entries outflow_candidates ON (
-            inflow_candidates.amount < 0 AND
-            outflow_candidates.amount > 0 AND
-            inflow_candidates.amount = -outflow_candidates.amount AND
-            inflow_candidates.currency = outflow_candidates.currency AND
-            inflow_candidates.account_id <> outflow_candidates.account_id AND
-            inflow_candidates.date BETWEEN outflow_candidates.date - 4 AND outflow_candidates.date + 4 AND
-            inflow_candidates.date >= outflow_candidates.date
-          )
-        ").joins("
-          LEFT JOIN transfers existing_transfers ON (
-            existing_transfers.inflow_transaction_id = inflow_candidates.entryable_id OR
-            existing_transfers.outflow_transaction_id = outflow_candidates.entryable_id
-          )
-        ")
-        .joins("JOIN accounts inflow_accounts ON inflow_accounts.id = inflow_candidates.account_id")
-        .joins("JOIN accounts outflow_accounts ON outflow_accounts.id = outflow_candidates.account_id")
-        .where("inflow_accounts.family_id = ? AND outflow_accounts.family_id = ?", account.family_id, account.family_id)
-        .where("inflow_candidates.entryable_type = 'Account::Transaction' AND outflow_candidates.entryable_type = 'Account::Transaction'")
-        .where(existing_transfers: { id: nil })
-
-      Transfer.transaction do
-        matches.each do |match|
-          Transfer.create!(
-            inflow_transaction_id: match.inflow_transaction_id,
-            outflow_transaction_id: match.outflow_transaction_id,
-          )
-        end
-      end
+  def reject!
+    Transfer.transaction do
+      RejectedTransfer.find_or_create_by!(inflow_transaction_id: inflow_transaction_id, outflow_transaction_id: outflow_transaction_id)
+      destroy!
     end
   end
 
+  def confirm!
+    update!(status: "confirmed")
+  end
+
   def sync_account_later
     inflow_transaction.entry.sync_account_later
     outflow_transaction.entry.sync_account_later
@@ -119,11 +95,6 @@ class Transfer < ApplicationRecord
   end
 
   private
-    def inflow_on_or_after_outflow
-      return unless inflow_transaction.present? && outflow_transaction.present?
-      errors.add(:base, :inflow_must_be_on_or_after_outflow) if inflow_transaction.entry.date < outflow_transaction.entry.date
-    end
-
     def transfer_has_different_accounts
       return unless inflow_transaction.present? && outflow_transaction.present?
       errors.add(:base, :must_be_from_different_accounts) if inflow_transaction.entry.account == outflow_transaction.entry.account