The personal finance app for everyone
Add country_code attribute to Security model and related classes
Josh Pigforda7438e5c78e0
diff --git a/app/models/provider/security_concept.rb b/app/models/provider/security_concept.rbindex d54b2011..fbc408c3 100644--- a/app/models/provider/security_concept.rb+++ b/app/models/provider/security_concept.rb@@ -1,7 +1,7 @@module Provider::SecurityConceptextend ActiveSupport::Concern- Security = Data.define(:symbol, :name, :logo_url, :exchange_operating_mic)+ Security = Data.define(:symbol, :name, :logo_url, :exchange_operating_mic, :country_code)SecurityInfo = Data.define(:symbol, :name, :links, :logo_url, :description, :kind, :exchange_operating_mic)Price = Data.define(:symbol, :date, :price, :currency, :exchange_operating_mic)diff --git a/app/models/provider/synth.rb b/app/models/provider/synth.rbindex 8d76fc72..eba22967 100644--- a/app/models/provider/synth.rb+++ b/app/models/provider/synth.rb@@ -106,6 +106,7 @@ class Provider::Synth < Providername: security.dig("name"),logo_url: security.dig("logo_url"),exchange_operating_mic: security.dig("exchange", "operating_mic_code"),+ country_code: security.dig("exchange", "country_code"))endenddiff --git a/app/models/security.rb b/app/models/security.rbindex 6115aa4c..dd638ece 100644--- a/app/models/security.rb+++ b/app/models/security.rb@@ -21,6 +21,7 @@ class Security < ApplicationRecordname: name,logo_url: logo_url,exchange_operating_mic: exchange_operating_mic,+ country_code: country_code)enddiff --git a/app/models/security/provided.rb b/app/models/security/provided.rbindex 7927d6e6..f72de993 100644--- a/app/models/security/provided.rb+++ b/app/models/security/provided.rb@@ -22,6 +22,7 @@ module Security::Providedname: provider_security.name,logo_url: provider_security.logo_url,exchange_operating_mic: provider_security.exchange_operating_mic,+ country_code: provider_security.country_code)endelsediff --git a/app/models/security/synth_combobox_option.rb b/app/models/security/synth_combobox_option.rbindex 2a9ba46a..15e76920 100644--- a/app/models/security/synth_combobox_option.rb+++ b/app/models/security/synth_combobox_option.rb@@ -1,7 +1,7 @@class Security::SynthComboboxOptioninclude ActiveModel::Model- attr_accessor :symbol, :name, :logo_url, :exchange_operating_mic+ attr_accessor :symbol, :name, :logo_url, :exchange_operating_mic, :country_codedef id"#{symbol}|#{exchange_operating_mic}" # submitted by combobox as valuediff --git a/app/views/securities/_combobox_security.turbo_stream.erb b/app/views/securities/_combobox_security.turbo_stream.erbindex 687d1858..ef2fd8ba 100644--- a/app/views/securities/_combobox_security.turbo_stream.erb+++ b/app/views/securities/_combobox_security.turbo_stream.erb@@ -1,11 +1,24 @@<div class="flex items-center"><%= image_tag(combobox_security.logo_url, class: "rounded-full h-8 w-8 inline-block mr-2" ) %>- <div class="flex flex-col">- <span class="text-sm font-medium">- <%= combobox_security.name.presence || combobox_security.symbol %>- </span>- <span class="text-xs text-secondary">- <%= "#{combobox_security.symbol} (#{combobox_security.exchange_operating_mic})" %>- </span>+ <div class="flex items-center justify-between w-full">+ <div class="flex flex-col">+ <span class="text-sm font-medium">+ <%= combobox_security.name.presence || combobox_security.symbol %>+ </span>+ <span class="text-xs text-secondary">+ <%= "#{combobox_security.symbol} (#{combobox_security.exchange_operating_mic})" %>+ </span>+ </div>+ <% if combobox_security.country_code.present? %>+ <div class="flex items-center bg-container-inset rounded-sm px-1.5 py-1 gap-1">+ <%= image_tag("https://hatscripts.github.io/circle-flags/flags/#{combobox_security.country_code.downcase}.svg",+ class: "h-4 rounded-sm", # h-3 (12px) matches text-xs, w-5 for 3:5 aspect ratio+ alt: "#{combobox_security.country_code.upcase} flag",+ title: combobox_security.country_code.upcase) %>+ <span class="text-xs text-secondary">+ <%= combobox_security.country_code.upcase %>+ </span>+ </div>+ <% end %></div></div>