The personal finance app for everyone
Allow offline trade tickers (#1925)
Zach Gollwitzer9138bd2b76a6
diff --git a/app/controllers/account/trades_controller.rb b/app/controllers/account/trades_controller.rbindex 6ace6538..fd9b7d48 100644--- a/app/controllers/account/trades_controller.rb+++ b/app/controllers/account/trades_controller.rb@@ -10,7 +10,7 @@ class Account::TradesController < ApplicationControllerdef create_entry_paramsparams.require(:account_entry).permit(- :account_id, :date, :amount, :currency, :qty, :price, :ticker, :type, :transfer_account_id+ :account_id, :date, :amount, :currency, :qty, :price, :ticker, :manual_ticker, :type, :transfer_account_id).tap do |params|account_id = params.delete(:account_id)params[:account] = Current.family.accounts.find(account_id)diff --git a/app/models/account/trade_builder.rb b/app/models/account/trade_builder.rbindex 704d851f..c632f272 100644--- a/app/models/account/trade_builder.rb+++ b/app/models/account/trade_builder.rb@@ -2,7 +2,7 @@ class Account::TradeBuilderinclude ActiveModel::Modelattr_accessor :account, :date, :amount, :currency, :qty,- :price, :ticker, :type, :transfer_account_id+ :price, :ticker, :manual_ticker, :type, :transfer_account_idattr_reader :buildable@@ -110,8 +110,9 @@ class Account::TradeBuilderaccount.familyend+ # Users can either look up a ticker from our provider (Synth) or enter a manual, "offline" ticker (that we won't fetch prices for)def security- ticker_symbol, exchange_operating_mic = ticker.split("|")+ ticker_symbol, exchange_operating_mic = ticker.present? ? ticker.split("|") : [ manual_ticker, nil ]Security.find_or_create_by(ticker: ticker_symbol, exchange_operating_mic: exchange_operating_mic) do |s|FetchSecurityInfoJob.perform_later(s.id)diff --git a/app/models/security.rb b/app/models/security.rbindex 46672fb5..991ac202 100644--- a/app/models/security.rb+++ b/app/models/security.rb@@ -1,5 +1,6 @@class Security < ApplicationRecordinclude Providable+before_save :upcase_tickerhas_many :trades, dependent: :nullify, class_name: "Account::Trade"@@ -9,6 +10,10 @@ class Security < ApplicationRecordvalidates :ticker, uniqueness: { scope: :exchange_operating_mic, case_sensitive: false }class << self+ def provider+ security_prices_provider+ end+def search(query)security_prices_provider.search_securities(query: query[:search],diff --git a/app/views/account/trades/_form.html.erb b/app/views/account/trades/_form.html.erbindex c8dae4d3..a74d401f 100644--- a/app/views/account/trades/_form.html.erb+++ b/app/views/account/trades/_form.html.erb@@ -27,9 +27,18 @@}} %><% if %w[buy sell].include?(type) %>- <div class="form-field combobox">- <%= form.combobox :ticker, securities_path(country_code: Current.family.country), label: t(".holding"), placeholder: t(".ticker_placeholder"), required: true %>- </div>+ <% if Security.provider.present? %>+ <div class="form-field combobox">+ <%= form.combobox :ticker,+ securities_path(country_code: Current.family.country),+ name_when_new: "account_entry[manual_ticker]",+ label: t(".holding"),+ placeholder: t(".ticker_placeholder"),+ required: true %>+ </div>+ <% else %>+ <%= form.text_field :manual_ticker, label: "Ticker", placeholder: "AAPL", required: true %>+ <% end %><% end %><%= form.date_field :date, label: true, value: Date.current, required: true %>