mirror of
https://github.com/we-promise/sure.git
synced 2026-04-11 08:14:49 +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>
86 lines
2.8 KiB
Ruby
86 lines
2.8 KiB
Ruby
class IncomeStatement::CategoryStats
|
|
def initialize(family, interval: "month")
|
|
@family = family
|
|
@interval = interval
|
|
end
|
|
|
|
def call
|
|
ActiveRecord::Base.connection.select_all(sanitized_query_sql).map do |row|
|
|
StatRow.new(
|
|
category_id: row["category_id"],
|
|
classification: row["classification"],
|
|
median: row["median"],
|
|
avg: row["avg"]
|
|
)
|
|
end
|
|
end
|
|
|
|
private
|
|
StatRow = Data.define(:category_id, :classification, :median, :avg)
|
|
|
|
def sanitized_query_sql
|
|
ActiveRecord::Base.sanitize_sql_array([
|
|
query_sql,
|
|
sql_params
|
|
])
|
|
end
|
|
|
|
def sql_params
|
|
params = {
|
|
target_currency: @family.currency,
|
|
interval: @interval,
|
|
family_id: @family.id
|
|
}
|
|
|
|
ids = @family.tax_advantaged_account_ids
|
|
params[:tax_advantaged_account_ids] = ids if ids.present?
|
|
|
|
params
|
|
end
|
|
|
|
def budget_excluded_kinds_sql
|
|
@budget_excluded_kinds_sql ||= Transaction::BUDGET_EXCLUDED_KINDS.map { |k| "'#{k}'" }.join(", ")
|
|
end
|
|
|
|
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 query_sql
|
|
<<~SQL
|
|
WITH period_totals AS (
|
|
SELECT
|
|
c.id as category_id,
|
|
date_trunc(:interval, ae.date) as period,
|
|
CASE WHEN t.kind = 'investment_contribution' THEN 'expense' WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
|
|
SUM(CASE WHEN t.kind = 'investment_contribution' THEN ABS(ae.amount * COALESCE(er.rate, 1)) ELSE ae.amount * COALESCE(er.rate, 1) END) as total
|
|
FROM transactions t
|
|
JOIN entries ae ON ae.entryable_id = t.id AND ae.entryable_type = 'Transaction'
|
|
JOIN accounts a ON a.id = ae.account_id
|
|
LEFT JOIN categories c ON c.id = t.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 a.family_id = :family_id
|
|
AND t.kind NOT IN (#{budget_excluded_kinds_sql})
|
|
AND ae.excluded = false
|
|
AND (t.extra -> 'simplefin' ->> 'pending')::boolean IS DISTINCT FROM true
|
|
AND (t.extra -> 'plaid' ->> 'pending')::boolean IS DISTINCT FROM true
|
|
#{exclude_tax_advantaged_sql}
|
|
GROUP BY c.id, period, CASE WHEN t.kind = 'investment_contribution' THEN 'expense' WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END
|
|
)
|
|
SELECT
|
|
category_id,
|
|
classification,
|
|
ABS(PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY total)) as median,
|
|
ABS(AVG(total)) as avg
|
|
FROM period_totals
|
|
GROUP BY category_id, classification;
|
|
SQL
|
|
end
|
|
end
|