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

app/controllers/account/transactions_controller.rb

@@ -21,24 +21,6 @@ class Account::TransactionsController < ApplicationController
     redirect_back_or_to transactions_url, notice: t(".success", count: updated)
   end
 
-  def mark_transfers
-    Current.family
-      .entries
-      .where(id: bulk_update_params[:entry_ids])
-           .mark_transfers!
-
-    redirect_back_or_to transactions_url, notice: t(".success")
-  end
-
-  def unmark_transfers
-    Current.family
-      .entries
-      .where(id: bulk_update_params[:entry_ids])
-           .update_all marked_as_transfer: false
-
-    redirect_back_or_to transactions_url, notice: t(".success")
-  end
-
   private
     def bulk_delete_params
       params.require(:bulk_delete).permit(entry_ids: [])

app/controllers/account/transfer_matches_controller.rb

@@ -0,0 +1,56 @@
+class Account::TransferMatchesController < ApplicationController
+  before_action :set_entry
+
+  def new
+    @accounts = Current.family.accounts.alphabetically.where.not(id: @entry.account_id)
+    @transfer_match_candidates = @entry.transfer_match_candidates
+  end
+
+  def create
+    @transfer = build_transfer
+    @transfer.save!
+    @transfer.sync_account_later
+
+    redirect_back_or_to transactions_path, notice: t(".success")
+  end
+
+  private
+    def set_entry
+      @entry = Current.family.entries.find(params[:transaction_id])
+    end
+
+    def transfer_match_params
+      params.require(:transfer_match).permit(:method, :matched_entry_id, :target_account_id)
+    end
+
+    def build_transfer
+      if transfer_match_params[:method] == "new"
+        target_account = Current.family.accounts.find(transfer_match_params[:target_account_id])
+
+        missing_transaction = Account::Transaction.new(
+          entry: target_account.entries.build(
+            amount: @entry.amount * -1,
+            currency: @entry.currency,
+            date: @entry.date,
+            name: "Transfer to #{@entry.amount.negative? ? @entry.account.name : target_account.name}",
+          )
+        )
+
+        transfer = Transfer.find_or_initialize_by(
+          inflow_transaction: @entry.amount.positive? ? missing_transaction : @entry.account_transaction,
+          outflow_transaction: @entry.amount.positive? ? @entry.account_transaction : missing_transaction
+        )
+        transfer.status = "confirmed"
+        transfer
+      else
+        target_transaction = Current.family.entries.find(transfer_match_params[:matched_entry_id])
+
+        transfer = Transfer.find_or_initialize_by(
+          inflow_transaction: @entry.amount.negative? ? @entry.account_transaction : target_transaction.account_transaction,
+          outflow_transaction: @entry.amount.negative? ? target_transaction.account_transaction : @entry.account_transaction
+        )
+        transfer.status = "confirmed"
+        transfer
+      end
+    end
+end

app/controllers/account/transfers_controller.rb

@@ -1,61 +0,0 @@
-class Account::TransfersController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_transfer, only: %i[destroy show update]
-
-  def new
-    @transfer = Account::Transfer.new
-  end
-
-  def show
-  end
-
-  def create
-    from_account = Current.family.accounts.find(transfer_params[:from_account_id])
-    to_account = Current.family.accounts.find(transfer_params[:to_account_id])
-
-    @transfer = Account::Transfer.build_from_accounts from_account, to_account, \
-                                             date: transfer_params[:date],
-                                             amount: transfer_params[:amount].to_d
-
-    if @transfer.save
-      @transfer.entries.each(&:sync_account_later)
-      redirect_to transactions_path, notice: t(".success")
-    else
-      # TODO: this is not an ideal way to handle errors and should eventually be improved.
-      # See: https://github.com/hotwired/turbo-rails/pull/367
-      flash[:alert] = @transfer.errors.full_messages.to_sentence
-      redirect_to transactions_path
-    end
-  end
-
-  def update
-    @transfer.update_entries!(transfer_update_params)
-    redirect_back_or_to transactions_url, notice: t(".success")
-  end
-
-  def destroy
-    @transfer.destroy!
-    redirect_back_or_to transactions_url, notice: t(".success")
-  end
-
-  private
-
-    def set_transfer
-      record = Account::Transfer.find(params[:id])
-
-      unless record.entries.all? { |entry| Current.family.accounts.include?(entry.account) }
-        raise ActiveRecord::RecordNotFound
-      end
-
-      @transfer = record
-    end
-
-    def transfer_params
-      params.require(:account_transfer).permit(:from_account_id, :to_account_id, :amount, :date, :name, :excluded)
-    end
-
-    def transfer_update_params
-      params.require(:account_transfer).permit(:excluded, :notes)
-    end
-end