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

Fix incorrect totals calculation when family has loan payments (#1984)

Browse source 
* Fix income totals calculation error when loan payments exist

* Include transaction totals in totals query
This commit is contained in:
Zach Gollwitzer 2025-03-11 12:37:57 -04:00 • committed by GitHub
parent b8a3ca7732
commit f363fd4a4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/income_statement.rb
View file

@ -18,7 +18,7 @@ class IncomeStatement
total_expense = result.select { |t| t.classification == "expense" }.sum(&:total) total_expense = result.select { |t| t.classification == "expense" }.sum(&:total)
ScopeTotals.new( ScopeTotals.new(
transactions_count: transactions_scope.count, transactions_count: result.sum(&:transactions_count),
income_money: Money.new(total_income, family.currency), income_money: Money.new(total_income, family.currency),
expense_money: Money.new(total_expense, family.currency), expense_money: Money.new(total_expense, family.currency),
missing_exchange_rates?: result.any?(&:missing_exchange_rates?) missing_exchange_rates?: result.any?(&:missing_exchange_rates?)

3
app/models/income_statement/base_query.rb
View file

@ -8,6 +8,7 @@ module IncomeStatement::BaseQuery
date_trunc(:interval, ae.date) as date, date_trunc(:interval, ae.date) as date,
CASE WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END as classification, CASE WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
SUM(ae.amount * COALESCE(er.rate, 1)) as total, SUM(ae.amount * COALESCE(er.rate, 1)) as total,
COUNT(ae.id) as transactions_count,
BOOL_OR(ae.currency <> :target_currency AND er.rate IS NULL) as missing_exchange_rates BOOL_OR(ae.currency <> :target_currency AND er.rate IS NULL) as missing_exchange_rates
FROM (#{transactions_scope.to_sql}) at FROM (#{transactions_scope.to_sql}) at
JOIN account_entries ae ON ae.entryable_id = at.id AND ae.entryable_type = 'Account::Transaction' JOIN account_entries ae ON ae.entryable_id = at.id AND ae.entryable_type = 'Account::Transaction'
@ -29,7 +30,7 @@ module IncomeStatement::BaseQuery
) )
WHERE ( WHERE (
transfer_info.transfer_id IS NULL OR transfer_info.transfer_id IS NULL OR
(ae.amount < 0 AND transfer_info.accountable_type = 'Loan') (ae.amount > 0 AND transfer_info.accountable_type = 'Loan')
) )
GROUP BY 1, 2, 3, 4 GROUP BY 1, 2, 3, 4
SQL SQL

6
app/models/income_statement/totals.rb
View file

@ -13,13 +13,14 @@ class IncomeStatement::Totals
category_id: row["category_id"], category_id: row["category_id"],
classification: row["classification"], classification: row["classification"],
total: row["total"], total: row["total"],
transactions_count: row["transactions_count"],
missing_exchange_rates?: row["missing_exchange_rates"] missing_exchange_rates?: row["missing_exchange_rates"]
) )
end end
end end
private private
TotalsRow = Data.define(:parent_category_id, :category_id, :classification, :total, :missing_exchange_rates?) TotalsRow = Data.define(:parent_category_id, :category_id, :classification, :total, :transactions_count, :missing_exchange_rates?)
def query_sql def query_sql
base_sql = base_query_sql(family: @family, interval: "day", transactions_scope: @transactions_scope) base_sql = base_query_sql(family: @family, interval: "day", transactions_scope: @transactions_scope)
@ -33,7 +34,8 @@ class IncomeStatement::Totals
category_id, category_id,
classification, classification,
ABS(SUM(total)) as total, ABS(SUM(total)) as total,
BOOL_OR(missing_exchange_rates) as missing_exchange_rates BOOL_OR(missing_exchange_rates) as missing_exchange_rates,
SUM(transactions_count) as transactions_count
FROM base_totals FROM base_totals
GROUP BY 1, 2, 3; GROUP BY 1, 2, 3;
SQL SQL

2
app/views/transactions/_summary.html.erb
View file

@ -2,7 +2,7 @@
<div class="grid grid-cols-3 bg-white rounded-xl shadow-border-xs divide-x divide-alpha-black-100"> <div class="grid grid-cols-3 bg-white rounded-xl shadow-border-xs divide-x divide-alpha-black-100">
<div class="p-4 space-y-2"> <div class="p-4 space-y-2">
<p class="text-sm text-secondary">Total transactions</p> <p class="text-sm text-secondary">Total transactions</p>
<p class="text-primary font-medium text-xl" id="total-transactions"><%= totals.transactions_count %></p> <p class="text-primary font-medium text-xl" id="total-transactions"><%= totals.transactions_count.round(0) %></p>
</div> </div>
<div class="p-4 space-y-2"> <div class="p-4 space-y-2">
<p class="text-sm text-secondary">Income</p> <p class="text-sm text-secondary">Income</p>