Display fund's type and sector

arielkirkwood · May 5, 2024 · 5b02150 · 5b02150
1 parent 3118f75
commit 5b02150
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/app/models/fund.rb b/app/models/fund.rb
@@ -14,7 +14,7 @@ class Fund < ApplicationRecord
   has_many :assets, through: :holdings
 
   delegate :extract_holdings, to: :holdings_extractor
-  delegate :name, to: :underlying_asset
+  delegate :name, :type, :sector, to: :underlying_asset
 
   validates :underlying_asset_id, uniqueness: true
 

diff --git a/app/views/funds/_fund.html.erb b/app/views/funds/_fund.html.erb
@@ -1,13 +1,18 @@
 <div class="h3"><%= render @ticker %></div>
 <%= tag.h1 fund.name %>
 
+<div class="h6 mb-3">
+  <span class="badge text-bg-primary"><%= tag.strong fund.type.underscore.humanize %></span>
+  <span class="badge text-bg-primary"><%= tag.strong fund.sector %></span>
+</div>
+
+<hr>
+
 <%= tag.blockquote class: 'blockquote' do %>
   <figcaption class="blockquote-footer mt-0 mb-3">
     <cite><strong>Betterment</strong></cite> says about this fund:
   </figcaption>
   <%= fund.betterment_detail %>
 <% end %>
 
-<hr>
-
 <%= render fund.latest_portfolio %>
diff --git a/lib/holdings/extraction_strategies/tcw.rb b/lib/holdings/extraction_strategies/tcw.rb
@@ -25,9 +25,16 @@ def date
         @date ||= Date.parse(worksheet[1][1].value)
       end
 
-      def extract_holdings # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      def extract_holdings # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         working_sheet.map do |row|
-          asset = Asset.find_or_create_by!(name: row[:description], asset_class: asset_type(row[:security_type]))
+          asset = if (ticker = Assets::Ticker.where(ticker: row[:ticker]).first)
+                    ticker.asset
+                  elsif (cusip = Assets::CUSIP.where(cusip: row[:cusip]).first)
+                    cusip.asset
+                  elsif (sedol = Assets::SEDOL.where(sedol: row[:sedol]).first)
+                    sedol.asset
+                  end
+          asset = Asset.find_or_create_by!(name: row[:description], asset_class: asset_type(row[:security_type])) if asset.blank?
 
           Assets::Ticker.find_or_create_by(asset:, ticker: row[:ticker]) if row[:ticker] != 'n/a'
           Assets::Currency.find_or_create_by(asset:, currency: row[:asset_currency]) if asset_type(row[:security_type]) == 'CashEquivalent' && row[:asset_currency].present?