mirror of
https://github.com/we-promise/sure.git
synced 2026-04-19 03:54:08 +00:00
* fix: Include investment_contribution in transfer? check and protect transfer entries from sync Transfer transactions with kind "investment_contribution" were not recognized as transfers by the UI, causing missing +/- indicators, "Transfer" labels, and showing regular transaction forms instead of transfer details. Also adds user_modified: true to entries created via TransferMatchesController and SetAsTransferOrPayment rule action to protect them from provider sync overwrites, matching the existing behavior in Transfer::Creator. https://claude.ai/code/session_019BZ5Z1aqKSK3cRdR81P5Jg * fix: Centralize transfer/budget kind constants for consistent investment_contribution handling Define TRANSFER_KINDS and BUDGET_EXCLUDED_KINDS on Transaction to eliminate hard-coded kind lists scattered across filters, rules, and analytics code. investment_contribution is now consistently treated as a transfer in search filters, rule conditions, and UI display (via TRANSFER_KINDS), while budget analytics correctly continue treating it as an expense (via BUDGET_EXCLUDED_KINDS). https://claude.ai/code/session_019BZ5Z1aqKSK3cRdR81P5Jg * fix: Update tests for consistent investment_contribution as transfer kind - search_test: loan_payment is now in TRANSFER_KINDS, so uncategorized filter correctly excludes it (same as funds_movement/cc_payment) - condition_test: investment_contribution is now a transfer kind, so it matches the transfer filter rather than expense filter https://claude.ai/code/session_019BZ5Z1aqKSK3cRdR81P5Jg * fix: Eliminate SQL injection warnings in Transaction::Search Replace string-interpolated SQL with parameterized queries: - totals: use sanitize_sql_array with ? placeholders - apply_category_filter: pass TRANSFER_KINDS as bind parameter - apply_type_filter: use where(kind:)/where.not(kind:) and parameterized IN (?) for compound OR conditions - Remove unused transfer_kinds_sql helper https://claude.ai/code/session_019BZ5Z1aqKSK3cRdR81P5Jg --------- Co-authored-by: Claude <noreply@anthropic.com>
161 lines
6.2 KiB
Ruby
161 lines
6.2 KiB
Ruby
class IncomeStatement::Totals
|
|
def initialize(family, transactions_scope:, date_range:, include_trades: true)
|
|
@family = family
|
|
@transactions_scope = transactions_scope
|
|
@date_range = date_range
|
|
@include_trades = include_trades
|
|
|
|
validate_date_range!
|
|
end
|
|
|
|
def call
|
|
ActiveRecord::Base.connection.select_all(query_sql).map do |row|
|
|
TotalsRow.new(
|
|
parent_category_id: row["parent_category_id"],
|
|
category_id: row["category_id"],
|
|
classification: row["classification"],
|
|
total: row["total"],
|
|
transactions_count: row["transactions_count"],
|
|
is_uncategorized_investment: row["is_uncategorized_investment"]
|
|
)
|
|
end
|
|
end
|
|
|
|
private
|
|
TotalsRow = Data.define(:parent_category_id, :category_id, :classification, :total, :transactions_count, :is_uncategorized_investment)
|
|
|
|
def query_sql
|
|
ActiveRecord::Base.sanitize_sql_array([
|
|
@include_trades ? combined_query_sql : transactions_only_query_sql,
|
|
sql_params
|
|
])
|
|
end
|
|
|
|
# Combined query that includes both transactions and trades
|
|
def combined_query_sql
|
|
<<~SQL
|
|
SELECT
|
|
category_id,
|
|
parent_category_id,
|
|
classification,
|
|
is_uncategorized_investment,
|
|
SUM(total) as total,
|
|
SUM(entry_count) as transactions_count
|
|
FROM (
|
|
#{transactions_subquery_sql}
|
|
UNION ALL
|
|
#{trades_subquery_sql}
|
|
) combined
|
|
GROUP BY category_id, parent_category_id, classification, is_uncategorized_investment;
|
|
SQL
|
|
end
|
|
|
|
# Original transactions-only query (for backwards compatibility)
|
|
def transactions_only_query_sql
|
|
<<~SQL
|
|
SELECT
|
|
c.id as category_id,
|
|
c.parent_id as parent_category_id,
|
|
CASE WHEN at.kind = 'investment_contribution' THEN 'expense' WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
|
|
ABS(SUM(CASE WHEN at.kind = 'investment_contribution' THEN ABS(ae.amount * COALESCE(er.rate, 1)) ELSE ae.amount * COALESCE(er.rate, 1) END)) as total,
|
|
COUNT(ae.id) as transactions_count,
|
|
false as is_uncategorized_investment
|
|
FROM (#{@transactions_scope.to_sql}) at
|
|
JOIN entries ae ON ae.entryable_id = at.id AND ae.entryable_type = 'Transaction'
|
|
JOIN accounts a ON a.id = ae.account_id
|
|
LEFT JOIN categories c ON c.id = at.category_id
|
|
LEFT JOIN exchange_rates er ON (
|
|
er.date = ae.date AND
|
|
er.from_currency = ae.currency AND
|
|
er.to_currency = :target_currency
|
|
)
|
|
WHERE at.kind NOT IN (#{budget_excluded_kinds_sql})
|
|
AND ae.excluded = false
|
|
AND a.family_id = :family_id
|
|
AND a.status IN ('draft', 'active')
|
|
#{exclude_tax_advantaged_sql}
|
|
GROUP BY c.id, c.parent_id, CASE WHEN at.kind = 'investment_contribution' THEN 'expense' WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END;
|
|
SQL
|
|
end
|
|
|
|
def transactions_subquery_sql
|
|
<<~SQL
|
|
SELECT
|
|
c.id as category_id,
|
|
c.parent_id as parent_category_id,
|
|
CASE WHEN at.kind = 'investment_contribution' THEN 'expense' WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
|
|
ABS(SUM(CASE WHEN at.kind = 'investment_contribution' THEN ABS(ae.amount * COALESCE(er.rate, 1)) ELSE ae.amount * COALESCE(er.rate, 1) END)) as total,
|
|
COUNT(ae.id) as entry_count,
|
|
false as is_uncategorized_investment
|
|
FROM (#{@transactions_scope.to_sql}) at
|
|
JOIN entries ae ON ae.entryable_id = at.id AND ae.entryable_type = 'Transaction'
|
|
JOIN accounts a ON a.id = ae.account_id
|
|
LEFT JOIN categories c ON c.id = at.category_id
|
|
LEFT JOIN exchange_rates er ON (
|
|
er.date = ae.date AND
|
|
er.from_currency = ae.currency AND
|
|
er.to_currency = :target_currency
|
|
)
|
|
WHERE at.kind NOT IN (#{budget_excluded_kinds_sql})
|
|
AND (
|
|
at.investment_activity_label IS NULL
|
|
OR at.investment_activity_label NOT IN ('Transfer', 'Sweep In', 'Sweep Out', 'Exchange')
|
|
)
|
|
AND ae.excluded = false
|
|
AND a.family_id = :family_id
|
|
AND a.status IN ('draft', 'active')
|
|
#{exclude_tax_advantaged_sql}
|
|
GROUP BY c.id, c.parent_id, CASE WHEN at.kind = 'investment_contribution' THEN 'expense' WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END
|
|
SQL
|
|
end
|
|
|
|
def trades_subquery_sql
|
|
# Trades are completely excluded from income/expense budgets
|
|
# Rationale: Trades represent portfolio rebalancing, not cash flow
|
|
# Example: Selling $10k AAPL to buy MSFT = no net worth change, not an expense
|
|
# Contributions/withdrawals are tracked separately as Transactions with activity labels
|
|
<<~SQL
|
|
SELECT NULL as category_id, NULL as parent_category_id, NULL as classification,
|
|
NULL as total, NULL as entry_count, NULL as is_uncategorized_investment
|
|
WHERE false
|
|
SQL
|
|
end
|
|
|
|
def sql_params
|
|
params = {
|
|
target_currency: @family.currency,
|
|
family_id: @family.id,
|
|
start_date: @date_range.begin,
|
|
end_date: @date_range.end
|
|
}
|
|
|
|
# Add tax-advantaged account IDs if any exist
|
|
ids = @family.tax_advantaged_account_ids
|
|
params[:tax_advantaged_account_ids] = ids if ids.present?
|
|
|
|
params
|
|
end
|
|
|
|
# Returns SQL clause to exclude tax-advantaged accounts from budget calculations.
|
|
# Tax-advantaged accounts (401k, IRA, HSA, etc.) are retirement savings, not daily expenses.
|
|
def exclude_tax_advantaged_sql
|
|
ids = @family.tax_advantaged_account_ids
|
|
return "" if ids.empty?
|
|
"AND a.id NOT IN (:tax_advantaged_account_ids)"
|
|
end
|
|
|
|
def budget_excluded_kinds_sql
|
|
@budget_excluded_kinds_sql ||= Transaction::BUDGET_EXCLUDED_KINDS.map { |k| "'#{k}'" }.join(", ")
|
|
end
|
|
|
|
def validate_date_range!
|
|
unless @date_range.is_a?(Range)
|
|
raise ArgumentError, "date_range must be a Range, got #{@date_range.class}"
|
|
end
|
|
|
|
unless @date_range.begin.respond_to?(:to_date) && @date_range.end.respond_to?(:to_date)
|
|
raise ArgumentError, "date_range must contain date-like objects"
|
|
end
|
|
end
|
|
end
|