mirror of
https://github.com/we-promise/sure.git
synced 2026-04-08 06:44:52 +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>
113 lines
3.0 KiB
Ruby
113 lines
3.0 KiB
Ruby
class Trade::CreateForm
|
|
include ActiveModel::Model
|
|
|
|
attr_accessor :account, :date, :amount, :currency, :qty,
|
|
:price, :ticker, :manual_ticker, :type, :transfer_account_id
|
|
|
|
# Either creates a trade, transaction, or transfer based on type
|
|
# Returns the model, regardless of success or failure
|
|
def create
|
|
case type
|
|
when "buy", "sell"
|
|
create_trade
|
|
when "interest"
|
|
create_interest_income
|
|
when "deposit", "withdrawal"
|
|
create_transfer
|
|
end
|
|
end
|
|
|
|
private
|
|
# Users can either look up a ticker from a provider or enter a manual, "offline" ticker (that we won't fetch prices for)
|
|
def security
|
|
ticker_symbol, exchange_operating_mic = ticker.present? ? ticker.split("|") : [ manual_ticker, nil ]
|
|
|
|
Security::Resolver.new(
|
|
ticker_symbol,
|
|
exchange_operating_mic: exchange_operating_mic
|
|
).resolve
|
|
end
|
|
|
|
def create_trade
|
|
signed_qty = type == "sell" ? -qty.to_d : qty.to_d
|
|
signed_amount = signed_qty * price.to_d
|
|
|
|
trade_entry = account.entries.new(
|
|
name: Trade.build_name(type, qty, security.ticker),
|
|
date: date,
|
|
amount: signed_amount,
|
|
currency: currency,
|
|
entryable: Trade.new(
|
|
qty: signed_qty,
|
|
price: price,
|
|
currency: currency,
|
|
security: security,
|
|
investment_activity_label: type.capitalize # "buy" → "Buy", "sell" → "Sell"
|
|
)
|
|
)
|
|
|
|
if trade_entry.save
|
|
trade_entry.lock_saved_attributes!
|
|
account.sync_later
|
|
end
|
|
|
|
trade_entry
|
|
end
|
|
|
|
def create_interest_income
|
|
signed_amount = amount.to_d * -1
|
|
|
|
entry = account.entries.build(
|
|
name: "Interest payment",
|
|
date: date,
|
|
amount: signed_amount,
|
|
currency: currency,
|
|
entryable: Transaction.new
|
|
)
|
|
|
|
if entry.save
|
|
entry.lock_saved_attributes!
|
|
account.sync_later
|
|
end
|
|
|
|
entry
|
|
end
|
|
|
|
def create_transfer
|
|
if transfer_account_id.present?
|
|
from_account_id = type == "withdrawal" ? account.id : transfer_account_id
|
|
to_account_id = type == "withdrawal" ? transfer_account_id : account.id
|
|
|
|
Transfer::Creator.new(
|
|
family: account.family,
|
|
source_account_id: from_account_id,
|
|
destination_account_id: to_account_id,
|
|
date: date,
|
|
amount: amount
|
|
).create
|
|
else
|
|
create_unlinked_transfer
|
|
end
|
|
end
|
|
|
|
# If user doesn't provide the reciprocal account, it's a regular transaction
|
|
def create_unlinked_transfer
|
|
signed_amount = type == "deposit" ? amount.to_d * -1 : amount.to_d
|
|
|
|
entry = account.entries.build(
|
|
name: signed_amount < 0 ? "Deposit to #{account.name}" : "Withdrawal from #{account.name}",
|
|
date: date,
|
|
amount: signed_amount,
|
|
currency: currency,
|
|
entryable: Transaction.new
|
|
)
|
|
|
|
if entry.save
|
|
entry.lock_saved_attributes!
|
|
account.sync_later
|
|
end
|
|
|
|
entry
|
|
end
|
|
end
|