Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-28 17:49:38 +02:00
Code Issues Releases Activity Actions

Do not include income transactions in liability accounts for savings rate (#1385)
Some checks are pending
Publish Docker image / ci (push) Waiting to run
Details
Publish Docker image / Build docker image (push) Blocked by required conditions
Details

Browse source 
* Do not include income transactions in liability accounts for savings rate

* Do not include income in liability accounts in savings rate chart
This commit is contained in:
Tony Vincent 2024-10-31 13:05:01 +00:00 • committed by GitHub
parent 7946cd7819
commit 2b61821336
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/family.rb
View file

@ -71,7 +71,9 @@ class Family < ApplicationRecord
end end
def snapshot_transactions 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) rolling_totals = Account::Entry.daily_rolling_totals(candidate_entries, self.currency, period: Period.last_30_days)
spending = [] spending = []

2
test/models/family_test.rb
View file

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