Do not include income transactions in liability accounts for savings …

…rate (#1385) * Do not include income transactions in liability accounts for savings rate * Do not include income in liability accounts in savings rate chart
maybe-finance · Oct 31, 2024 · 2b61821 · 2b61821
1 parent 7946cd7
commit 2b61821
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/models/family.rb b/app/models/family.rb
@@ -71,7 +71,9 @@ def snapshot_account_transactions
   end
 
   def snapshot_transactions
-    candidate_entries = entries.account_transactions.without_transfers
+    candidate_entries = entries.account_transactions.without_transfers.excluding(
+      entries.joins(:account).where(amount: ..0, accounts: { classification: Account.classifications[:liability] })
+    )
     rolling_totals = Account::Entry.daily_rolling_totals(candidate_entries, self.currency, period: Period.last_30_days)
 
     spending = []

diff --git a/test/models/family_test.rb b/test/models/family_test.rb
@@ -125,9 +125,11 @@ def setup
 
   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