QT/sure
1
0
Fork 0
mirror of https://github.com/we-promise/sure.git synced 2026-05-29 15:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Record dividends and interest as Trades in investment accounts (#1311)

Browse Source 
* 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>
This commit is contained in:
Serge L
2026-03-29 04:08:54 -04:00
committed by GitHub
parent cc7d675500
commit ab9b97639b
18 changed files with 337 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/trades_controller.rb
View File

@@ -105,9 +105,16 @@ class TradesController < ApplicationController
end
def update_entry_params
return entry_params unless entry_params[:entryable_attributes].present?
update_params = entry_params
# Income trades (Dividend/Interest) store amounts as negative (inflow convention).
# The form displays the absolute value, so we re-negate before saving.
if %w[Dividend Interest].include?(@entry.trade&.investment_activity_label) && update_params[:amount].present?
update_params = update_params.merge(amount: -update_params[:amount].to_d.abs)
end
return update_params unless update_params[:entryable_attributes].present?
update_params = update_params.merge(entryable_type: "Trade")
qty = update_params[:entryable_attributes][:qty]

7
app/models/account.rb
View File

@@ -362,6 +362,13 @@ class Account < ApplicationRecord
false
end
def traded_standard_securities
Security.where(id: holdings.select(:security_id))
.standard
.distinct
.order(:ticker)
end
# The balance type determines which "component" of balance is being tracked.
# This is primarily used for balance related calculations and updates.
#

19
app/models/security.rb
View File

@@ -6,6 +6,8 @@ class Security < ApplicationRecord
# Data stored in config/exchanges.yml
EXCHANGES = YAML.safe_load_file(Rails.root.join("config", "exchanges.yml")).freeze
KINDS = %w[standard cash].freeze
before_validation :upcase_symbols
before_save :generate_logo_url_from_brandfetch, if: :should_generate_logo?
@@ -14,8 +16,24 @@ class Security < ApplicationRecord
validates :ticker, presence: true
validates :ticker, uniqueness: { scope: :exchange_operating_mic, case_sensitive: false }
validates :kind, inclusion: { in: KINDS }
scope :online, -> { where(offline: false) }
scope :standard, -> { where(kind: "standard") }
# Lazily finds or creates a synthetic cash security for an account.
# Used as fallback when creating an interest Trade without a user-selected security.
def self.cash_for(account)
ticker = "CASH-#{account.id}".upcase
find_or_create_by!(ticker: ticker, kind: "cash") do |s|
s.name = "Cash"
s.offline = true
end
end
def cash?
kind == "cash"
end
# Returns user-friendly exchange name for a MIC code
def self.exchange_name_for(mic)
@@ -73,6 +91,7 @@ class Security < ApplicationRecord
end
def should_generate_logo?
return false if cash?
url = brandfetch_icon_url
return false unless url.present?

6
app/models/security/health_checker.rb
View File

@@ -30,15 +30,15 @@ class Security::HealthChecker
private
# If a security has never had a health check, we prioritize it, regardless of batch size
def never_checked_scope
Security.where(last_health_check_at: nil)
Security.standard.where(last_health_check_at: nil)
end
# Any securities not checked for 30 days are due
# We only process the batch size, which means some "due" securities will not be checked today
# This is by design, to prevent all securities from coming due at the same time
def due_for_check_scope
Security.where(last_health_check_at: ..HEALTH_CHECK_INTERVAL.ago)
.order(last_health_check_at: :asc)
Security.standard.where(last_health_check_at: ..HEALTH_CHECK_INTERVAL.ago)
.order(last_health_check_at: :asc)
end
end

2
app/models/trade.rb
View File

@@ -31,7 +31,7 @@ class Trade < ApplicationRecord
end
def unrealized_gain_loss
return nil if qty.negative?
return nil unless qty.positive?
current_price = security.current_price
return nil if current_price.nil?

48
app/models/trade/create_form.rb
View File

@@ -10,6 +10,8 @@ class Trade::CreateForm
case type
when "buy", "sell"
create_trade
when "dividend"
create_dividend_income
when "interest"
create_interest_income
when "deposit", "withdrawal"
@@ -28,6 +30,10 @@ class Trade::CreateForm
).resolve
end
def ticker_present?
ticker.present? || manual_ticker.present?
end
def create_trade
signed_qty = type == "sell" ? -qty.to_d : qty.to_d
signed_amount = signed_qty * price.to_d + fee.to_d
@@ -55,15 +61,47 @@ class Trade::CreateForm
trade_entry
end
def create_interest_income
signed_amount = amount.to_d * -1
# Dividends are always a Trade. Security is required.
def create_dividend_income
unless ticker_present?
entry = account.entries.build(entryable: Trade.new)
entry.errors.add(:base, I18n.t("trades.form.dividend_requires_security"))
return entry
end
begin
sec = security
create_income_trade(sec: sec, label: "Dividend", name: "Dividend: #{sec.ticker}")
rescue => e
Rails.logger.warn("Dividend security resolution failed: #{e.class} - #{e.message}")
entry = account.entries.build(entryable: Trade.new)
entry.errors.add(:base, I18n.t("trades.form.dividend_requires_security"))
entry
end
end
# Interest in an investment account is always a Trade.
# Falls back to a synthetic cash security when none is selected.
def create_interest_income
sec = ticker_present? ? security : Security.cash_for(account)
name = sec.cash? ? "Interest" : "Interest: #{sec.ticker}"
create_income_trade(sec: sec, label: "Interest", name: name)
end
def create_income_trade(sec:, label:, name:)
entry = account.entries.build(
name: "Interest payment",
name: name,
date: date,
amount: signed_amount,
amount: amount.to_d * -1,
currency: currency,
entryable: Transaction.new
entryable: Trade.new(
qty: 0,
price: 0,
fee: 0,
currency: currency,
security: sec,
investment_activity_label: label
)
)
if entry.save

53
app/views/investment_activity/_quick_edit_badge.html.erb
View File

@@ -35,6 +35,7 @@
activity_labels = entryable.is_a?(Trade) ? Trade::ACTIVITY_LABELS : Transaction::ACTIVITY_LABELS
entryable_type = entryable.is_a?(Trade) ? "Trade" : "Transaction"
convert_url = entryable.is_a?(Transaction) ? convert_to_trade_transaction_path(entryable) : nil
income_trade = entryable.is_a?(Trade) && %w[Dividend Interest].include?(label)
%>
<div class="relative"
@@ -48,7 +49,7 @@
<% end %>>
<button type="button"
class="inline-flex items-center gap-1 text-xs font-medium rounded-full px-2.5 py-1 cursor-pointer hover:opacity-80 transition-opacity"
class="inline-flex items-center gap-1 text-xs font-medium rounded-full px-2.5 py-1 <%= income_trade ? "cursor-default" : "cursor-pointer hover:opacity-80" %> transition-opacity"
style="<% if has_label %>
background-color: color-mix(in oklab, <%= color %> 15%, transparent);
border: 1px solid color-mix(in oklab, <%= color %> 25%, transparent);
@@ -58,8 +59,10 @@
border: 1px solid var(--color-border-secondary);
color: var(--color-text-secondary);
<% end %>"
<% unless income_trade %>
data-action="click->activity-label-quick-edit#toggle"
data-activity-label-quick-edit-target="badge"
<% end %>
title="<%= has_label ? t("transactions.transaction.activity_type_tooltip") : t("transactions.show.activity_type") %>">
<% if has_label %>
<%= label %>
@@ -67,29 +70,33 @@
<%= icon "tag", size: "xs", color: "current" %>
<span><%= t("transactions.show.activity_type") %></span>
<% end %>
<%= icon "chevron-down", size: "xs", color: "current" %>
<% unless income_trade %>
<%= icon "chevron-down", size: "xs", color: "current" %>
<% end %>
</button>
<!-- Dropdown menu -->
<div class="hidden absolute right-0 z-50 mt-1 w-44 rounded-lg border border-primary bg-container shadow-lg"
data-activity-label-quick-edit-target="dropdown">
<div class="py-1 max-h-64 overflow-y-auto">
<% if has_label %>
<button type="button"
class="w-full text-left px-3 py-1.5 text-sm text-secondary hover:bg-surface-inset transition-colors border-b border-primary"
data-action="click->activity-label-quick-edit#select"
data-label="">
<span class="italic"><%= t("transactions.form.none") %></span>
</button>
<% end %>
<% activity_labels.each do |activity_label| %>
<button type="button"
class="w-full text-left px-3 py-1.5 text-sm text-primary hover:bg-surface-inset transition-colors <%= activity_label == label ? "font-semibold bg-surface-inset" : "" %>"
data-action="click->activity-label-quick-edit#select"
data-label="<%= activity_label %>">
<%= activity_label %>
</button>
<% end %>
<% unless income_trade %>
<!-- Dropdown menu -->
<div class="hidden absolute right-0 z-50 mt-1 w-44 rounded-lg border border-primary bg-container shadow-lg"
data-activity-label-quick-edit-target="dropdown">
<div class="py-1 max-h-64 overflow-y-auto">
<% if has_label %>
<button type="button"
class="w-full text-left px-3 py-1.5 text-sm text-secondary hover:bg-surface-inset transition-colors border-b border-primary"
data-action="click->activity-label-quick-edit#select"
data-label="">
<span class="italic"><%= t("transactions.form.none") %></span>
</button>
<% end %>
<% activity_labels.each do |activity_label| %>
<button type="button"
class="w-full text-left px-3 py-1.5 text-sm text-primary hover:bg-surface-inset transition-colors <%= activity_label == label ? "font-semibold bg-surface-inset" : "" %>"
data-action="click->activity-label-quick-edit#select"
data-label="<%= activity_label %>">
<%= activity_label %>
</button>
<% end %>
</div>
</div>
</div>
<% end %>
</div>

22
app/views/trades/_form.html.erb
View File

@@ -10,11 +10,12 @@
<div class="space-y-2">
<%= form.select :type, [
["Buy", "buy"],
["Sell", "sell"],
["Deposit", "deposit"],
["Withdrawal", "withdrawal"],
["Interest", "interest"]
[t(".type_buy"), "buy"],
[t(".type_sell"), "sell"],
[t(".type_deposit"), "deposit"],
[t(".type_withdrawal"), "withdrawal"],
[t(".type_dividend"), "dividend"],
[t(".type_interest"), "interest"]
],
{ label: t(".type"), selected: type },
{ data: {
@@ -34,10 +35,19 @@
required: true %>
</div>
<% else %>
<%= form.text_field :manual_ticker, label: "Ticker symbol", placeholder: "AAPL", required: true %>
<%= form.text_field :manual_ticker, label: t(".holding"), placeholder: t(".ticker_placeholder"), required: true %>
<% end %>
<% end %>
<% if %w[dividend interest].include?(type) %>
<% account_securities = account ? account.traded_standard_securities : [] %>
<% security_options = account_securities.map { |s| [ s.name.presence || s.ticker, s.exchange_operating_mic.present? ? "#{s.ticker}|#{s.exchange_operating_mic}" : s.ticker ] } %>
<% select_options = { label: type == "dividend" ? t(".holding") : t(".holding_optional") } %>
<% select_options[:include_blank] = true if type == "interest" %>
<% select_options[:required] = true if type == "dividend" %>
<%= form.select :ticker, security_options, select_options %>
<% end %>
<%= form.date_field :date, label: true, value: model.date || Date.current, required: true %>
<% unless %w[buy sell].include?(type) %>

26
app/views/trades/_header.html.erb
View File

@@ -2,14 +2,20 @@
<div id="<%= dom_id(entry, :header) %>">
<%= tag.header class: "mb-4 space-y-1" do %>
<% label = entry.trade.investment_activity_label %>
<% income_trade = %w[Dividend Interest].include?(label) %>
<span class="text-secondary text-sm">
<%= entry.amount.positive? ? t(".buy") : t(".sell") %>
<% if income_trade %>
<%= t(".#{label.downcase}") %>
<% else %>
<%= entry.amount.positive? ? t(".buy") : t(".sell") %>
<% end %>
</span>
<div class="flex items-center gap-4">
<h3 class="font-medium">
<span class="text-2xl text-primary privacy-sensitive">
<%= format_money entry.amount_money %>
<%= format_money(income_trade ? entry.amount_money.abs : entry.amount_money) %>
</span>
<span class="text-lg text-secondary">
@@ -30,15 +36,16 @@
<% end %>
<% trade = entry.trade %>
<% unless trade.security.cash? %>
<div class="mb-2">
<%= render DS::Disclosure.new(title: t(".overview"), open: true) do %>
<div class="pb-4">
<dl class="space-y-3 px-3 py-2">
<div class="flex items-center justify-between text-sm">
<dt class="text-secondary"><%= t(".symbol_label") %></dt>
<dd class="text-primary"><%= trade.security.ticker %></dd>
</div>
<dl class="space-y-3 px-3 py-2">
<div class="flex items-center justify-between text-sm">
<dt class="text-secondary"><%= t(".symbol_label") %></dt>
<dd class="text-primary"><%= trade.security.ticker %></dd>
</div>
<% if trade.qty.positive? %>
<div class="flex items-center justify-between text-sm">
@@ -52,7 +59,7 @@
</div>
<% end %>
<% if trade.security.current_price.present? %>
<% if trade.qty.positive? && trade.security.current_price.present? %>
<div class="flex items-center justify-between text-sm">
<dt class="text-secondary"><%= t(".current_market_price_label") %></dt>
<dd class="text-primary privacy-sensitive"><%= format_money trade.security.current_price %></dd>
@@ -71,4 +78,5 @@
</div>
<% end %>
</div>
<% end %>
</div>

63
app/views/trades/show.html.erb
View File

@@ -19,37 +19,48 @@
max: Date.current,
disabled: @entry.linked?,
"data-auto-submit-form-target": "auto" %>
<div class="flex items-center gap-2">
<%= f.select :nature,
[[t(".buy"), "outflow"], [t(".sell"), "inflow"]],
{ container_class: "w-1/3", label: t(".type_label"), selected: @entry.amount.positive? ? "outflow" : "inflow" },
{ data: { "auto-submit-form-target": "auto" }, disabled: @entry.linked? } %>
<%= f.fields_for :entryable do |ef| %>
<%= ef.number_field :qty,
label: t(".quantity_label"),
step: "any",
value: trade.qty.abs,
"data-auto-submit-form-target": "auto",
disabled: @entry.linked? %>
<% end %>
</div>
<%= f.fields_for :entryable do |ef| %>
<%= ef.money_field :price,
label: t(".cost_per_share_label"),
disable_currency: true,
<% if trade.qty.zero? %>
<%= f.money_field :amount,
label: t(".amount_label"),
value: @entry.amount_money.abs,
auto_submit: true,
min: 0,
step: "any",
disabled: @entry.linked? %>
<% end %>
<%= f.fields_for :entryable do |ef| %>
<%= ef.money_field :fee,
label: t(".fee_label"),
disable_currency: true,
auto_submit: true,
min: 0,
step: "any",
disabled: @entry.linked? %>
<% unless trade.qty.zero? %>
<div class="flex items-center gap-2">
<%= f.select :nature,
[[t(".buy"), "outflow"], [t(".sell"), "inflow"]],
{ container_class: "w-1/3", label: t(".type_label"), selected: @entry.amount.positive? ? "outflow" : "inflow" },
{ data: { "auto-submit-form-target": "auto" }, disabled: @entry.linked? } %>
<%= f.fields_for :entryable do |ef| %>
<%= ef.number_field :qty,
label: t(".quantity_label"),
step: "any",
value: trade.qty.abs,
"data-auto-submit-form-target": "auto",
disabled: @entry.linked? %>
<% end %>
</div>
<%= f.fields_for :entryable do |ef| %>
<%= ef.money_field :price,
label: t(".cost_per_share_label"),
disable_currency: true,
auto_submit: true,
min: 0,
step: "any",
disabled: @entry.linked? %>
<% end %>
<%= f.fields_for :entryable do |ef| %>
<%= ef.money_field :fee,
label: t(".fee_label"),
disable_currency: true,
auto_submit: true,
min: 0,
step: "any",
disabled: @entry.linked? %>
<% end %>
<% end %>
<% end %>
</div>

13
config/locales/views/trades/de.yml
View File

@@ -6,24 +6,35 @@ de:
account_prompt: Konto suchen
amount: Betrag
holding: Tickersymbol
holding_optional: Tickersymbol (optional)
price: Preis pro Anteil
qty: Menge
submit: Transaktion hinzufügen
ticker_placeholder: AAPL
type: Typ
type_buy: Kaufen
type_sell: Verkaufen
type_deposit: Einzahlung
type_withdrawal: Auszahlung
type_dividend: Dividende
type_interest: Zinsen
dividend_requires_security: Für Dividenden ist ein Wertpapier erforderlich
header:
buy: Kaufen
sell: Verkaufen
dividend: Dividende
interest: Zinsen
current_market_price_label: Aktueller Marktpreis
overview: Übersicht
purchase_price_label: Kaufpreis
purchase_qty_label: Kaufmenge
sell: Verkaufen
symbol_label: Symbol
total_return_label: Nicht realisierter Gewinn/Verlust
new:
title: Neue Transaktion
show:
additional: Zusätzlich
amount_label: Betrag
buy: Kaufen
category_label: Kategorie
cost_per_share_label: Kosten pro Anteil

13
config/locales/views/trades/en.yml
View File

@@ -7,24 +7,35 @@ en:
amount: Amount
fee: Transaction fee
holding: Ticker symbol
holding_optional: Ticker symbol (optional)
price: Price per share
qty: Quantity
submit: Add transaction
ticker_placeholder: AAPL
type: Type
type_buy: Buy
type_sell: Sell
type_deposit: Deposit
type_withdrawal: Withdrawal
type_dividend: Dividend
type_interest: Interest
dividend_requires_security: Security is required for dividends
header:
buy: Buy
sell: Sell
dividend: Dividend
interest: Interest
current_market_price_label: Current Market Price
overview: Overview
purchase_price_label: Purchase Price
purchase_qty_label: Purchase Quantity
sell: Sell
symbol_label: Symbol
total_return_label: Unrealized gain/loss
new:
title: New transaction
show:
additional: Additional
amount_label: Amount
buy: Buy
category_label: Category
cost_per_share_label: Cost per Share

13
config/locales/views/trades/es.yml
View File

@@ -6,24 +6,35 @@ es:
account_prompt: Buscar cuenta
amount: Importe
holding: Símbolo del ticker
holding_optional: Símbolo del ticker (opcional)
price: Precio por acción
qty: Cantidad
submit: Añadir transacción
ticker_placeholder: AAPL
type: Tipo
type_buy: Comprar
type_sell: Vender
type_deposit: Depósito
type_withdrawal: Retiro
type_dividend: Dividendo
type_interest: Interés
dividend_requires_security: Se requiere un valor para los dividendos
header:
buy: Comprar
sell: Vender
dividend: Dividendo
interest: Interés
current_market_price_label: Precio de mercado actual
overview: Resumen
purchase_price_label: Precio de compra
purchase_qty_label: Cantidad comprada
sell: Vender
symbol_label: Símbolo
total_return_label: Ganancia/pérdida no realizada
new:
title: Nueva transacción
show:
additional: Adicional
amount_label: Importe
buy: Compra
category_label: Categoría
cost_per_share_label: Costo por acción

13
config/locales/views/trades/fr.yml
View File

@@ -6,24 +6,35 @@ fr:
account_prompt: Rechercher un compte
amount: Montant
holding: Symbole boursier
holding_optional: Symbole boursier (facultatif)
price: Prix par action
qty: Quantité
submit: Ajouter la transaction
ticker_placeholder: AAPL
type: Type
type_buy: Acheter
type_sell: Vendre
type_deposit: Dépôt
type_withdrawal: Retrait
type_dividend: Dividende
type_interest: Intérêts
dividend_requires_security: Un titre est requis pour les dividendes
header:
buy: Acheter
sell: Vendre
dividend: Dividende
interest: Intérêts
current_market_price_label: Prix du marché actuel
overview: Aperçu
purchase_price_label: Prix d'achat
purchase_qty_label: Quantité achetée
sell: Vendre
symbol_label: Symbole
total_return_label: Gain/perte non réalisé(e)
new:
title: Nouvelle transaction
show:
additional: Détails supplémentaires
amount_label: Montant
cost_per_share_label: Coût par action
date_label: Date
delete: Supprimer

7
db/migrate/20260328120000_add_kind_to_securities.rb Normal file
View File

@@ -0,0 +1,7 @@
class AddKindToSecurities < ActiveRecord::Migration[7.2]
def change
add_column :securities, :kind, :string, null: false, default: "standard"
add_index :securities, :kind
add_check_constraint :securities, "kind IN ('standard', 'cash')", name: "chk_securities_kind"
end
end

5
db/schema.rb generated
View File

@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.2].define(version: 2026_03_26_112218) do
ActiveRecord::Schema[7.2].define(version: 2026_03_28_120000) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"
@@ -1175,9 +1175,12 @@ ActiveRecord::Schema[7.2].define(version: 2026_03_26_112218) do
t.integer "failed_fetch_count", default: 0, null: false
t.datetime "last_health_check_at"
t.string "website_url"
t.string "kind", default: "standard", null: false
t.index "upper((ticker)::text), COALESCE(upper((exchange_operating_mic)::text), ''::text)", name: "index_securities_on_ticker_and_exchange_operating_mic_unique", unique: true
t.index ["country_code"], name: "index_securities_on_country_code"
t.index ["exchange_operating_mic"], name: "index_securities_on_exchange_operating_mic"
t.index ["kind"], name: "index_securities_on_kind"
t.check_constraint "kind = ANY (ARRAY['standard'::text, 'cash'::text])", name: "chk_securities_kind"
end
create_table "security_prices", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|

68
test/controllers/trades_controller_test.rb
View File

@@ -93,8 +93,8 @@ class TradesControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to @entry.account
end
test "creates interest entry" do
assert_difference [ "Entry.count", "Transaction.count" ], 1 do
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",
@@ -108,9 +108,73 @@ class TradesControllerTest < ActionDispatch::IntegrationTest
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: {

30
test/models/security_test.rb
View File

@@ -38,4 +38,34 @@ class SecurityTest < ActiveSupport::TestCase
assert_not duplicate.valid?
assert_equal [ "has already been taken" ], duplicate.errors[:ticker]
end
test "cash_for lazily creates a per-account synthetic cash security" do
account = accounts(:investment)
cash = Security.cash_for(account)
assert cash.persisted?
assert cash.cash?
assert cash.offline?
assert_equal "Cash", cash.name
assert_includes cash.ticker, account.id.upcase
end
test "cash_for returns the same security on repeated calls" do
account = accounts(:investment)
first = Security.cash_for(account)
second = Security.cash_for(account)
assert_equal first.id, second.id
end
test "standard scope excludes cash securities" do
account = accounts(:investment)
Security.cash_for(account)
standard_tickers = Security.standard.pluck(:ticker)
assert_not_includes standard_tickers, "CASH-#{account.id.upcase}"
end
end