mirror of
https://github.com/we-promise/sure.git
synced 2026-04-09 15:24:48 +00:00
ab9b97639b
* Record dividends and interest as Trades in investment accounts
All investment income (dividends and interest) is now modeled as a
Trade with qty: 0 and price: 0, keeping security_id NOT NULL on trades
intact. Dividends require a security; interest falls back to a
per-account synthetic cash security (kind: "cash", offline: true) when
none is selected, matching how brokerages handle uninvested cash
internally.
- Add `kind` column to securities ("standard" | "cash") with DB check
constraint; `Security.cash_for(account)` lazily finds or creates the
synthetic cash security; `scope :standard` excludes synthetic
securities from user-facing pickers
- Trade::CreateForm: new `dividend` type (security required); `interest`
now creates a Trade instead of a Transaction
- Trade form: Dividend and Interest in the type dropdown with a security
combobox (required for dividend, optional for interest)
- transactions table: untouched
* UI fixes
* HealthChecker — both scopes now chain .standard to exclude cash securities from provider health checks.
DB query moved to model — Account#traded_standard_securities in app/models/account.rb, view uses account.traded_standard_securities.
DRY income creation — create_income_trade(sec:, label:, name:) extracted as shared private method; create_dividend_income and create_interest_income delegate to it.
show.html.erb blocks merged — single unless trade.qty.zero? block covers qty/price/fee fields.
Test extended — assert_response :unprocessable_entity added after the assert_no_difference block.
* Hide cash account ticker from no-security trade detail
* Fix CodeRabbit review issues from PR #1311
- Remove duplicate YAML keys in translation files (de, es, fr)
- Add error handling for security resolution in create_dividend_income
- Extract income trade check to reduce duplication in header template
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
* Include holdings in dividend/interest security picker
The security picker for dividend/interest trades should include all securities
in holdings, not just those with trade history. This fixes the issue where
accounts with imported holdings (e.g., SimpleFIN) but no trades would have an
empty picker and be unable to record dividends.
Uses UNION to combine securities from both trades and holdings.
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
* scope picker to holdings only (a trade creates a holding anyway)
---------
Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
414 lines
12 KiB
Ruby
414 lines
12 KiB
Ruby
require "test_helper"
|
|
|
|
class TradesControllerTest < ActionDispatch::IntegrationTest
|
|
include EntryableResourceInterfaceTest
|
|
|
|
setup do
|
|
sign_in @user = users(:family_admin)
|
|
@entry = entries(:trade)
|
|
end
|
|
|
|
test "updates trade entry" do
|
|
assert_no_difference [ "Entry.count", "Trade.count" ] do
|
|
patch trade_url(@entry), params: {
|
|
entry: {
|
|
currency: "USD",
|
|
entryable_attributes: {
|
|
id: @entry.entryable_id,
|
|
qty: 20,
|
|
price: 20
|
|
}
|
|
}
|
|
}
|
|
end
|
|
|
|
@entry.reload
|
|
|
|
assert_enqueued_with job: SyncJob
|
|
|
|
assert_equal 20, @entry.trade.qty
|
|
assert_equal 20, @entry.trade.price
|
|
assert_equal "USD", @entry.currency
|
|
|
|
assert_redirected_to account_url(@entry.account)
|
|
end
|
|
|
|
test "creates deposit entry" do
|
|
from_account = accounts(:depository) # Account the deposit is coming from
|
|
|
|
assert_difference -> { Entry.count } => 2,
|
|
-> { Transaction.count } => 2,
|
|
-> { Transfer.count } => 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "deposit",
|
|
date: Date.current,
|
|
amount: 10,
|
|
currency: "USD",
|
|
transfer_account_id: from_account.id
|
|
}
|
|
}
|
|
end
|
|
|
|
assert_redirected_to @entry.account
|
|
end
|
|
|
|
test "creates withdrawal entry" do
|
|
to_account = accounts(:depository) # Account the withdrawal is going to
|
|
|
|
assert_difference -> { Entry.count } => 2,
|
|
-> { Transaction.count } => 2,
|
|
-> { Transfer.count } => 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "withdrawal",
|
|
date: Date.current,
|
|
amount: 10,
|
|
currency: "USD",
|
|
transfer_account_id: to_account.id
|
|
}
|
|
}
|
|
end
|
|
|
|
assert_redirected_to @entry.account
|
|
end
|
|
|
|
test "deposit and withdrawal has optional transfer account" do
|
|
assert_difference -> { Entry.count } => 1,
|
|
-> { Transaction.count } => 1,
|
|
-> { Transfer.count } => 0 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "withdrawal",
|
|
date: Date.current,
|
|
amount: 10,
|
|
currency: "USD"
|
|
}
|
|
}
|
|
end
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
assert created_entry.amount.positive?
|
|
assert_redirected_to @entry.account
|
|
end
|
|
|
|
test "creates interest entry as trade with synthetic cash security when no ticker given" do
|
|
assert_difference [ "Entry.count", "Trade.count" ], 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "interest",
|
|
date: Date.current,
|
|
amount: 10,
|
|
currency: "USD"
|
|
}
|
|
}
|
|
end
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
assert created_entry.amount.negative?
|
|
assert created_entry.trade?
|
|
assert created_entry.trade.security.cash?
|
|
assert_equal "Interest", created_entry.name
|
|
assert_redirected_to @entry.account
|
|
end
|
|
|
|
test "creates interest entry as trade with security when ticker given" do
|
|
assert_difference [ "Entry.count", "Trade.count" ], 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "interest",
|
|
date: Date.current,
|
|
amount: 10,
|
|
currency: "USD",
|
|
ticker: "AAPL|XNAS"
|
|
}
|
|
}
|
|
end
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
assert created_entry.amount.negative?
|
|
assert created_entry.trade?
|
|
assert_equal "AAPL", created_entry.trade.security.ticker
|
|
assert_equal "Interest: AAPL", created_entry.name
|
|
assert_redirected_to @entry.account
|
|
end
|
|
|
|
test "creates dividend entry as trade with required security" do
|
|
assert_difference [ "Entry.count", "Trade.count" ], 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "dividend",
|
|
date: Date.current,
|
|
amount: 25,
|
|
currency: "USD",
|
|
ticker: "AAPL|XNAS"
|
|
}
|
|
}
|
|
end
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
assert created_entry.amount.negative?
|
|
assert created_entry.trade?
|
|
assert_equal 0, created_entry.trade.qty
|
|
assert_equal "AAPL", created_entry.trade.security.ticker
|
|
assert_equal "Dividend: AAPL", created_entry.name
|
|
assert_equal "Dividend", created_entry.trade.investment_activity_label
|
|
assert_redirected_to @entry.account
|
|
end
|
|
|
|
test "creating dividend without security returns error" do
|
|
assert_no_difference [ "Entry.count", "Trade.count" ] do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "dividend",
|
|
date: Date.current,
|
|
amount: 25,
|
|
currency: "USD"
|
|
}
|
|
}
|
|
end
|
|
|
|
assert_response :unprocessable_entity
|
|
end
|
|
|
|
test "creates trade buy entry with fee" do
|
|
assert_difference [ "Entry.count", "Trade.count" ], 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "buy",
|
|
date: Date.current,
|
|
ticker: "NVDA (NASDAQ)",
|
|
qty: 10,
|
|
price: 20,
|
|
fee: 9.95,
|
|
currency: "USD"
|
|
}
|
|
}
|
|
end
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
assert_in_delta 209.95, created_entry.amount.to_f, 0.001
|
|
assert_in_delta 9.95, created_entry.trade.fee.to_f, 0.001
|
|
assert_redirected_to account_url(created_entry.account)
|
|
end
|
|
|
|
test "creates trade sell entry with fee" do
|
|
assert_difference [ "Entry.count", "Trade.count" ], 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "sell",
|
|
date: Date.current,
|
|
ticker: "AAPL (NYSE)",
|
|
qty: 10,
|
|
price: 20,
|
|
fee: 9.95,
|
|
currency: "USD"
|
|
}
|
|
}
|
|
end
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
# sell: signed_amount = -10 * 20 + 9.95 = -190.05
|
|
assert_in_delta(-190.05, created_entry.amount.to_f, 0.001)
|
|
assert_in_delta 9.95, created_entry.trade.fee.to_f, 0.001
|
|
assert_redirected_to account_url(created_entry.account)
|
|
end
|
|
|
|
test "creates trade buy entry without fee defaults to zero" do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "buy",
|
|
date: Date.current,
|
|
ticker: "NVDA (NASDAQ)",
|
|
qty: 10,
|
|
price: 20,
|
|
currency: "USD"
|
|
}
|
|
}
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
assert_in_delta 200, created_entry.amount.to_f, 0.001
|
|
assert_equal 0, created_entry.trade.fee.to_f
|
|
end
|
|
|
|
test "update includes fee in amount" do
|
|
patch trade_url(@entry), params: {
|
|
entry: {
|
|
currency: "USD",
|
|
nature: "outflow",
|
|
entryable_attributes: {
|
|
id: @entry.entryable_id,
|
|
qty: 10,
|
|
price: 20,
|
|
fee: 9.95
|
|
}
|
|
}
|
|
}
|
|
|
|
@entry.reload
|
|
|
|
assert_in_delta 209.95, @entry.amount.to_f, 0.001
|
|
assert_in_delta 9.95, @entry.trade.fee.to_f, 0.001
|
|
end
|
|
|
|
test "creates trade buy entry" do
|
|
assert_difference [ "Entry.count", "Trade.count", "Security.count" ], 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "buy",
|
|
date: Date.current,
|
|
ticker: "NVDA (NASDAQ)",
|
|
qty: 10,
|
|
price: 10,
|
|
currency: "USD"
|
|
}
|
|
}
|
|
end
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
assert created_entry.amount.positive?
|
|
assert created_entry.trade.qty.positive?
|
|
assert_equal "Entry created", flash[:notice]
|
|
assert_enqueued_with job: SyncJob
|
|
assert_redirected_to account_url(created_entry.account)
|
|
end
|
|
|
|
test "creates trade sell entry" do
|
|
assert_difference [ "Entry.count", "Trade.count" ], 1 do
|
|
post trades_url(account_id: @entry.account_id), params: {
|
|
model: {
|
|
type: "sell",
|
|
ticker: "AAPL (NYSE)",
|
|
date: Date.current,
|
|
currency: "USD",
|
|
qty: 10,
|
|
price: 10
|
|
}
|
|
}
|
|
end
|
|
|
|
created_entry = Entry.order(created_at: :desc).first
|
|
|
|
assert created_entry.amount.negative?
|
|
assert created_entry.trade.qty.negative?
|
|
assert_equal "Entry created", flash[:notice]
|
|
assert_enqueued_with job: SyncJob
|
|
assert_redirected_to account_url(created_entry.account)
|
|
end
|
|
|
|
test "unlock clears protection flags on user-modified entry" do
|
|
# Mark as protected with locked_attributes on both entry and entryable
|
|
@entry.update!(user_modified: true, locked_attributes: { "name" => Time.current.iso8601 })
|
|
@entry.trade.update!(locked_attributes: { "qty" => Time.current.iso8601 })
|
|
|
|
assert @entry.reload.protected_from_sync?
|
|
|
|
post unlock_trade_path(@entry.trade)
|
|
|
|
assert_redirected_to account_path(@entry.account)
|
|
assert_equal "Entry unlocked. It may be updated on next sync.", flash[:notice]
|
|
|
|
@entry.reload
|
|
assert_not @entry.user_modified?
|
|
assert_empty @entry.locked_attributes, "Entry locked_attributes should be cleared"
|
|
assert_empty @entry.trade.locked_attributes, "Trade locked_attributes should be cleared"
|
|
assert_not @entry.protected_from_sync?
|
|
end
|
|
|
|
test "unlock clears import_locked flag" do
|
|
@entry.update!(import_locked: true)
|
|
|
|
assert @entry.reload.protected_from_sync?
|
|
|
|
post unlock_trade_path(@entry.trade)
|
|
|
|
assert_redirected_to account_path(@entry.account)
|
|
@entry.reload
|
|
assert_not @entry.import_locked?
|
|
assert_not @entry.protected_from_sync?
|
|
end
|
|
|
|
test "update locks saved attributes" do
|
|
assert_not @entry.user_modified?
|
|
assert_empty @entry.trade.locked_attributes
|
|
|
|
patch trade_url(@entry), params: {
|
|
entry: {
|
|
currency: "USD",
|
|
entryable_attributes: {
|
|
id: @entry.entryable_id,
|
|
qty: 50,
|
|
price: 25
|
|
}
|
|
}
|
|
}
|
|
|
|
@entry.reload
|
|
assert @entry.user_modified?
|
|
assert @entry.trade.locked_attributes.key?("qty")
|
|
assert @entry.trade.locked_attributes.key?("price")
|
|
end
|
|
|
|
test "turbo stream update includes lock icon for protected entry" do
|
|
assert_not @entry.user_modified?
|
|
|
|
patch trade_url(@entry), params: {
|
|
entry: {
|
|
currency: "USD",
|
|
nature: "outflow",
|
|
entryable_attributes: {
|
|
id: @entry.entryable_id,
|
|
qty: 50,
|
|
price: 25
|
|
}
|
|
}
|
|
}, as: :turbo_stream
|
|
|
|
assert_response :success
|
|
assert_match(/turbo-stream/, response.content_type)
|
|
# The turbo stream should contain the lock icon link with protection tooltip
|
|
assert_match(/title="Protected from sync"/, response.body)
|
|
# And should contain the lock SVG (the path for lock icon)
|
|
assert_match(/M7 11V7a5 5 0 0 1 10 0v4/, response.body)
|
|
end
|
|
|
|
test "quick edit badge update locks activity label" do
|
|
assert_not @entry.user_modified?
|
|
assert_empty @entry.trade.locked_attributes
|
|
original_label = @entry.trade.investment_activity_label
|
|
|
|
# Mimic the quick edit badge JSON request
|
|
patch trade_url(@entry),
|
|
params: {
|
|
entry: {
|
|
entryable_attributes: {
|
|
id: @entry.entryable_id,
|
|
investment_activity_label: original_label == "Buy" ? "Sell" : "Buy"
|
|
}
|
|
}
|
|
}.to_json,
|
|
headers: {
|
|
"Content-Type" => "application/json",
|
|
"Accept" => "text/vnd.turbo-stream.html"
|
|
}
|
|
|
|
assert_response :success
|
|
assert_match(/turbo-stream/, response.content_type)
|
|
# The turbo stream should contain the lock icon
|
|
assert_match(/title="Protected from sync"/, response.body)
|
|
|
|
@entry.reload
|
|
assert @entry.user_modified?, "Entry should be marked as user_modified"
|
|
assert @entry.trade.locked_attributes.key?("investment_activity_label"), "investment_activity_label should be locked"
|
|
assert @entry.protected_from_sync?, "Entry should be protected from sync"
|
|
end
|
|
end
|