QT/sure
1
0
Fork 0
mirror of https://github.com/we-promise/sure.git synced 2026-04-19 12:04:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transfer Matching: Larger match date window for manual matching (#514)

Browse Source
This commit is contained in:
Dylan Corrales
2025-12-30 13:06:40 -05:00
committed by GitHub
parent 7915fee62c
commit 4e87eead2c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/family/auto_transfer_matchable.rb
View File

@@ -1,5 +1,5 @@
module Family::AutoTransferMatchable module Family::AutoTransferMatchable
def transfer_match_candidates def transfer_match_candidates(date_window: 4)
Entry.select([ Entry.select([
"inflow_candidates.entryable_id as inflow_transaction_id", "inflow_candidates.entryable_id as inflow_transaction_id",
"outflow_candidates.entryable_id as outflow_transaction_id", "outflow_candidates.entryable_id as outflow_transaction_id",
@@ -10,7 +10,7 @@ module Family::AutoTransferMatchable
inflow_candidates.amount < 0 AND inflow_candidates.amount < 0 AND
outflow_candidates.amount > 0 AND outflow_candidates.amount > 0 AND
inflow_candidates.account_id <> outflow_candidates.account_id AND inflow_candidates.account_id <> outflow_candidates.account_id AND
inflow_candidates.date BETWEEN outflow_candidates.date - 4 AND outflow_candidates.date + 4 inflow_candidates.date BETWEEN outflow_candidates.date - #{date_window.to_i} AND outflow_candidates.date + #{date_window.to_i}
) )
").joins(" ").joins("
LEFT JOIN transfers existing_transfers ON ( LEFT JOIN transfers existing_transfers ON (

10
app/models/transaction/transferable.rb
View File

@@ -14,11 +14,11 @@ module Transaction::Transferable
transfer_as_inflow || transfer_as_outflow transfer_as_inflow || transfer_as_outflow
end end
def transfer_match_candidates def transfer_match_candidates(date_window: 30)
candidates_scope = if self.entry.amount.negative? candidates_scope = if self.entry.amount.negative?
family_matches_scope.where("inflow_candidates.entryable_id = ?", self.id) family_matches_scope(date_window: date_window).where("inflow_candidates.entryable_id = ?", self.id)
else else
family_matches_scope.where("outflow_candidates.entryable_id = ?", self.id) family_matches_scope(date_window: date_window).where("outflow_candidates.entryable_id = ?", self.id)
end end
candidates_scope.map do |match| candidates_scope.map do |match|
@@ -30,7 +30,7 @@ module Transaction::Transferable
end end
private private
def family_matches_scope def family_matches_scope(date_window:)
self.entry.account.family.transfer_match_candidates self.entry.account.family.transfer_match_candidates(date_window: date_window)
end end
end end

3
app/models/transfer.rb
View File

@@ -133,6 +133,7 @@ class Transfer < ApplicationRecord
return unless inflow_transaction&.entry && outflow_transaction&.entry return unless inflow_transaction&.entry && outflow_transaction&.entry
date_diff = (inflow_transaction.entry.date - outflow_transaction.entry.date).abs date_diff = (inflow_transaction.entry.date - outflow_transaction.entry.date).abs
errors.add(:base, "Must be within 4 days") if date_diff > 4 max_days = status == "confirmed" ? 30 : 4
errors.add(:base, "Must be within #{max_days} days") if date_diff > max_days
end end
end end