mirror of
https://github.com/we-promise/sure.git
synced 2026-04-19 03:54:08 +00:00
* Add `investment_activity_label` to trades and enhance activity label handling - Introduced `investment_activity_label` column to the `trades` table with a migration. - Backfilled existing `trades` with activity labels based on quantity (`Buy`, `Sell`, or `Other`). - Replaced `category_id` in trades with `investment_activity_label` for better alignment with transaction labels. - Updated views and controllers to display and manage activity labels for trades. - Added localized badge components for displaying and editing labels dynamically. - Enhanced `PlaidAccount::Investments::TransactionsProcessor` to assign and process activity labels automatically. - Added investment flows section to reports for tracking contributions and withdrawals. - Refactored related tests and models for consistency and to ensure proper validation and filtering. * Improve handling of `investment_activity_label`, trade type, and security selection in trades and transactions - Refined label assignment logic in `trades_controller` to default to `Buy`/`Sell` based on transaction nature. - Simplified security selection in `transactions_controller` by resolving via unique IDs or custom tickers. - Streamlined UI for trade and transaction forms by updating dropdown options and label text. - Enabled quick-edit badges to open `convert_to_trade` modal when applicable, enhancing flexibility. - Adjusted tests and views to align with updated workflows and ensure consistent behavior. * Improve handling of `investment_activity_label`, trade type, and security selection in trades and transactions - Refined label assignment logic in `trades_controller` to default to `Buy`/`Sell` based on transaction nature. - Simplified security selection in `transactions_controller` by resolving via unique IDs or custom tickers. - Streamlined UI for trade and transaction forms by updating dropdown options and label text. - Enabled quick-edit badges to open `convert_to_trade` modal when applicable, enhancing flexibility. - Adjusted tests and views to align with updated workflows and ensure consistent behavior. * Improve handling of `investment_activity_label`, trade type, and security selection in trades and transactions - Refined label assignment logic in `trades_controller` to default to `Buy`/`Sell` based on transaction nature. - Simplified security selection in `transactions_controller` by resolving via unique IDs or custom tickers. - Streamlined UI for trade and transaction forms by updating dropdown options and label text. - Enabled quick-edit badges to open `convert_to_trade` modal when applicable, enhancing flexibility. - Adjusted tests and views to align with updated workflows and ensure consistent behavior. * Add safeguard for `dropdownTarget` existence in quick edit controller - Prevent errors by ensuring `dropdownTarget` is present before toggling its visibility. * Fix undefined method 'category' for Trade on mobile view Trade model uses investment_activity_label, not category. The upstream merge introduced a call to trade.category which doesn't exist. Use the activity label badge on mobile instead. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Fix activity label logic for zero/blank quantity and sell inference - Return `nil` for blank or zero quantity in `investment_activity_label_for`. - Correct `is_sell` logic to use the amount’s sign properly in `transactions_controller`. * Fix i18n key paths in transactions controller for convert_to_trade - Update flash message translations to use full i18n paths. - Use `BigDecimal` for quantity and price calculations to improve precision. --------- Co-authored-by: Josh Waldrep <joshua.waldrep5+github@gmail.com> Co-authored-by: luckyPipewrench <luckypipewrench@proton.me> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
141 lines
5.1 KiB
Ruby
141 lines
5.1 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 ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
|
|
ABS(SUM(ae.amount * COALESCE(er.rate, 1))) 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 ('funds_movement', 'one_time', 'cc_payment', 'investment_contribution')
|
|
AND ae.excluded = false
|
|
AND a.family_id = :family_id
|
|
AND a.status IN ('draft', 'active')
|
|
GROUP BY c.id, c.parent_id, CASE 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 ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
|
|
ABS(SUM(ae.amount * COALESCE(er.rate, 1))) 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 ('funds_movement', 'one_time', 'cc_payment', 'investment_contribution')
|
|
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')
|
|
GROUP BY c.id, c.parent_id, CASE 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
|
|
{
|
|
target_currency: @family.currency,
|
|
family_id: @family.id,
|
|
start_date: @date_range.begin,
|
|
end_date: @date_range.end
|
|
}
|
|
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
|