mirror of
https://github.com/we-promise/sure.git
synced 2026-04-07 14:31:25 +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>
110 lines
3.0 KiB
Ruby
110 lines
3.0 KiB
Ruby
class TradeImport < Import
|
|
def import!
|
|
transaction do
|
|
mappings.each(&:create_mappable!)
|
|
|
|
trades = rows.map do |row|
|
|
mapped_account = if account
|
|
account
|
|
else
|
|
mappings.accounts.mappable_for(row.account)
|
|
end
|
|
|
|
# Try to find or create security with ticker only
|
|
security = find_or_create_security(
|
|
ticker: row.ticker,
|
|
exchange_operating_mic: row.exchange_operating_mic
|
|
)
|
|
|
|
Trade.new(
|
|
security: security,
|
|
qty: row.qty,
|
|
currency: row.currency.presence || mapped_account.currency,
|
|
price: row.price,
|
|
investment_activity_label: investment_activity_label_for(row.qty),
|
|
entry: Entry.new(
|
|
account: mapped_account,
|
|
date: row.date_iso,
|
|
amount: row.signed_amount,
|
|
name: row.name,
|
|
currency: row.currency.presence || mapped_account.currency,
|
|
import: self,
|
|
import_locked: true # Protect from provider sync overwrites
|
|
),
|
|
)
|
|
end
|
|
|
|
Trade.import!(trades, recursive: true)
|
|
end
|
|
end
|
|
|
|
def mapping_steps
|
|
base = []
|
|
base << Import::AccountMapping if account.nil?
|
|
base
|
|
end
|
|
|
|
def required_column_keys
|
|
%i[date ticker qty price]
|
|
end
|
|
|
|
def column_keys
|
|
base = %i[date ticker exchange_operating_mic currency qty price name]
|
|
base.unshift(:account) if account.nil?
|
|
base
|
|
end
|
|
|
|
def dry_run
|
|
mappings = { transactions: rows_count }
|
|
|
|
mappings.merge(
|
|
accounts: Import::AccountMapping.for_import(self).creational.count
|
|
) if account.nil?
|
|
|
|
mappings
|
|
end
|
|
|
|
def csv_template
|
|
template = <<-CSV
|
|
date*,ticker*,exchange_operating_mic,currency,qty*,price*,account,name
|
|
05/15/2024,AAPL,XNAS,USD,10,150.00,Trading Account,Apple Inc. Purchase
|
|
05/16/2024,GOOGL,XNAS,USD,-5,2500.00,Investment Account,Alphabet Inc. Sale
|
|
05/17/2024,TSLA,XNAS,USD,2,700.50,Retirement Account,Tesla Inc. Purchase
|
|
CSV
|
|
|
|
csv = CSV.parse(template, headers: true)
|
|
csv.delete("account") if account.present?
|
|
csv
|
|
end
|
|
|
|
private
|
|
def investment_activity_label_for(qty)
|
|
# Set activity label based on quantity signage
|
|
# Buy trades have positive qty, Sell trades have negative qty
|
|
return nil if qty.blank? || qty.to_d.zero?
|
|
qty.to_d.positive? ? "Buy" : "Sell"
|
|
end
|
|
|
|
def find_or_create_security(ticker: nil, exchange_operating_mic: nil)
|
|
return nil unless ticker.present?
|
|
|
|
# Avoids resolving the same security over and over again (resolver potentially makes network calls)
|
|
@security_cache ||= {}
|
|
|
|
cache_key = [ ticker, exchange_operating_mic ].compact.join(":")
|
|
|
|
security = @security_cache[cache_key]
|
|
|
|
return security if security.present?
|
|
|
|
security = Security::Resolver.new(
|
|
ticker,
|
|
exchange_operating_mic: exchange_operating_mic.presence
|
|
).resolve
|
|
|
|
@security_cache[cache_key] = security
|
|
|
|
security
|
|
end
|
|
end
|