Transfer and Payment auto-matching, model and UI improvements (#1585)

* Transfer data model migration

* Transfers and payment modeling and UI improvements

* Fix CI

* Transfer matching flow

* Better UI for transfers

* Auto transfer matching, approve, reject flow

* Mark transfers created from form as confirmed

* Account filtering

* Excluded rejected transfers from calculations

* Calculation tweaks with transfer exclusions

* Clean up migration

test/models/account/transfer_test.rb

@@ -1,69 +0,0 @@
-require "test_helper"
-
-class Account::TransferTest < ActiveSupport::TestCase
-  setup do
-    @outflow = account_entries(:transfer_out)
-    @inflow = account_entries(:transfer_in)
-  end
-
-  test "transfer valid if it has inflow and outflow from different accounts for the same amount" do
-    transfer = Account::Transfer.create! entries: [ @inflow, @outflow ]
-
-    assert transfer.valid?
-  end
-
-  test "transfer must have 2 transactions" do
-    invalid_transfer_1 = Account::Transfer.new entries: [ @outflow ]
-    invalid_transfer_2 = Account::Transfer.new entries: [ @inflow, @outflow, account_entries(:transaction) ]
-
-    assert invalid_transfer_1.invalid?
-    assert invalid_transfer_2.invalid?
-  end
-
-  test "transfer cannot have 2 transactions from the same account" do
-    account = accounts(:depository)
-
-    inflow = account.entries.create! \
-      date: Date.current,
-      name: "Inflow",
-      amount: -100,
-      currency: "USD",
-      marked_as_transfer: true,
-      entryable: Account::Transaction.new
-
-    outflow = account.entries.create! \
-      date: Date.current,
-      name: "Outflow",
-      amount: 100,
-      currency: "USD",
-      marked_as_transfer: true,
-      entryable: Account::Transaction.new
-
-    assert_raise ActiveRecord::RecordInvalid do
-      Account::Transfer.create! entries: [ inflow, outflow ]
-    end
-  end
-
-  test "all transfer transactions must be marked as transfers" do
-    @inflow.update! marked_as_transfer: false
-
-    assert_raise ActiveRecord::RecordInvalid do
-      Account::Transfer.create! entries: [ @inflow, @outflow ]
-    end
-  end
-
-  test "single-currency transfer transactions must net to zero" do
-    @outflow.update! amount: 105
-
-    assert_raises ActiveRecord::RecordInvalid do
-      Account::Transfer.create! entries: [ @inflow, @outflow ]
-    end
-  end
-
-  test "multi-currency transfer transactions do not have to net to zero" do
-    @outflow.update! amount: 105, currency: "EUR"
-    transfer = Account::Transfer.create! entries: [ @inflow, @outflow ]
-
-    assert transfer.valid?
-  end
-end

test/models/family_test.rb

@@ -120,11 +120,9 @@ class FamilyTest < ActiveSupport::TestCase
 
   test "calculates rolling transaction totals" do
     account = create_account(balance: 1000, accountable: Depository.new)
-    liability_account = create_account(balance: 1000, accountable: Loan.new)
     create_transaction(account: account, date: 2.days.ago.to_date, amount: -500)
     create_transaction(account: account, date: 1.day.ago.to_date, amount: 100)
     create_transaction(account: account, date: Date.current, amount: 20)
-    create_transaction(account: liability_account, date: 2.days.ago.to_date, amount: -333)
 
     snapshot = @family.snapshot_transactions
 

test/models/transfer_test.rb

@@ -0,0 +1,100 @@
+require "test_helper"
+
+class TransferTest < ActiveSupport::TestCase
+  include Account::EntriesTestHelper
+
+  setup do
+    @outflow = account_transactions(:transfer_out)
+    @inflow = account_transactions(:transfer_in)
+  end
+
+  test "transfer has different accounts, opposing amounts, and within 4 days of each other" do
+    outflow_entry = create_transaction(date: Date.current, account: accounts(:depository), amount: 500)
+    inflow_entry = create_transaction(date: 1.day.ago.to_date, account: accounts(:credit_card), amount: -500)
+
+    assert_difference -> { Transfer.count } => 1 do
+      Transfer.create!(
+        inflow_transaction: inflow_entry.account_transaction,
+        outflow_transaction: outflow_entry.account_transaction,
+      )
+    end
+  end
+
+  test "transfer cannot have 2 transactions from the same account" do
+    outflow_entry = create_transaction(date: Date.current, account: accounts(:depository), amount: 500)
+    inflow_entry = create_transaction(date: 1.day.ago.to_date, account: accounts(:depository), amount: -500)
+
+    transfer = Transfer.new(
+      inflow_transaction: inflow_entry.account_transaction,
+      outflow_transaction: outflow_entry.account_transaction,
+    )
+
+    assert_no_difference -> { Transfer.count } do
+      transfer.save
+    end
+
+    assert_equal "Transfer must have different accounts", transfer.errors.full_messages.first
+  end
+
+  test "Transfer transactions must have opposite amounts" do
+    outflow_entry = create_transaction(date: Date.current, account: accounts(:depository), amount: 500)
+    inflow_entry = create_transaction(date: Date.current, account: accounts(:credit_card), amount: -400)
+
+    transfer = Transfer.new(
+      inflow_transaction: inflow_entry.account_transaction,
+      outflow_transaction: outflow_entry.account_transaction,
+    )
+
+    assert_no_difference -> { Transfer.count } do
+      transfer.save
+    end
+
+    assert_equal "Transfer transactions must have opposite amounts", transfer.errors.full_messages.first
+  end
+
+  test "transfer dates must be within 4 days of each other" do
+    outflow_entry = create_transaction(date: Date.current, account: accounts(:depository), amount: 500)
+    inflow_entry = create_transaction(date: 5.days.ago.to_date, account: accounts(:credit_card), amount: -500)
+
+    transfer = Transfer.new(
+      inflow_transaction: inflow_entry.account_transaction,
+      outflow_transaction: outflow_entry.account_transaction,
+    )
+
+    assert_no_difference -> { Transfer.count } do
+      transfer.save
+    end
+
+    assert_equal "Transfer transaction dates must be within 4 days of each other", transfer.errors.full_messages.first
+  end
+
+  test "from_accounts converts amounts to the to_account's currency" do
+    accounts(:depository).update!(currency: "EUR")
+
+    eur_account = accounts(:depository).reload
+    usd_account = accounts(:credit_card)
+
+    ExchangeRate.create!(
+      from_currency: "EUR",
+      to_currency: "USD",
+      rate: 1.1,
+      date: Date.current,
+    )
+
+    transfer = Transfer.from_accounts(
+      from_account: eur_account,
+      to_account: usd_account,
+      date: Date.current,
+      amount: 500,
+    )
+
+    assert_equal 500, transfer.outflow_transaction.entry.amount
+    assert_equal "EUR", transfer.outflow_transaction.entry.currency
+    assert_equal -550, transfer.inflow_transaction.entry.amount
+    assert_equal "USD", transfer.inflow_transaction.entry.currency
+
+    assert_difference -> { Transfer.count } => 1 do
+      transfer.save!
+    end
+  end
+end