Add nice formatting for subtypes on account list (#2138)

* Add nice formatting for subtypes on account list

* Fix rubocop linting errors

* Implement better mapping

* Fix rubocop linting

* Add short and long versions of subtypes

* Simplify subtype reference

Co-authored-by: Zach Gollwitzer <zach.gollwitzer@gmail.com>
Signed-off-by: Alex Hatzenbuhler <hatz@hey.com>

* Simplify reference logic, add a small test

* Fix test

* Fix tests

---------

Signed-off-by: Alex Hatzenbuhler <hatz@hey.com>
Co-authored-by: Zach Gollwitzer <zach.gollwitzer@gmail.com>

app/models/account.rb

@@ -155,6 +155,16 @@ class Account < ApplicationRecord
     first_valuation&.amount_money || balance_money
   end
 
+  # Get short version of the subtype label
+  def short_subtype_label
+    accountable_class.short_subtype_label_for(subtype) || accountable_class.display_name
+  end
+
+  # Get long version of the subtype label
+  def long_subtype_label
+    accountable_class.long_subtype_label_for(subtype) || accountable_class.display_name
+  end
+
   private
     def sync_balances
       strategy = linked? ? :reverse : :forward

app/models/balance_sheet.rb

@@ -59,6 +59,7 @@ class BalanceSheet
           account.define_singleton_method(:weight) do
             classification_total.zero? ? 0 : account.converted_balance / classification_total.to_d * 100
           end
+
           account
         end.sort_by(&:weight).reverse
       )

app/models/concerns/accountable.rb

@@ -3,6 +3,9 @@ module Accountable
 
   TYPES = %w[Depository Investment Crypto Property Vehicle OtherAsset CreditCard Loan OtherLiability]
 
+  # Define empty hash to ensure all accountables have this defined
+  SUBTYPES = {}.freeze
+
   def self.from_type(type)
     return nil unless TYPES.include?(type)
     type.constantize
@@ -27,6 +30,24 @@ module Accountable
       raise NotImplementedError, "Accountable must implement #color"
     end
 
+    # Given a subtype, look up the label for this accountable type
+    def subtype_label_for(subtype, format: :short)
+      return nil if subtype.nil?
+
+      label_type = format == :long ? :long : :short
+      self::SUBTYPES[subtype]&.fetch(label_type, nil)
+    end
+
+    # Convenience method for getting the short label
+    def short_subtype_label_for(subtype)
+      subtype_label_for(subtype, format: :short)
+    end
+
+    # Convenience method for getting the long label
+    def long_subtype_label_for(subtype)
+      subtype_label_for(subtype, format: :long)
+    end
+
     def favorable_direction
       classification == "asset" ? "up" : "down"
     end

app/models/depository.rb

@@ -1,10 +1,10 @@
 class Depository < ApplicationRecord
   include Accountable
 
-  SUBTYPES = [
+  SUBTYPES = {
-    [ "Checking", "checking" ],
+    "checking" => { short: "Checking", long: "Checking" },
-    [ "Savings", "savings" ]
+    "savings" => { short: "Savings", long: "Savings" }
-  ].freeze
+  }.freeze
 
   class << self
     def display_name

app/models/investment.rb

@@ -1,20 +1,20 @@
 class Investment < ApplicationRecord
   include Accountable
 
-  SUBTYPES = [
+  SUBTYPES = {
-    [ "Brokerage", "brokerage" ],
+    "brokerage" => { short: "Brokerage", long: "Brokerage" },
-    [ "Pension", "pension" ],
+    "pension" => { short: "Pension", long: "Pension" },
-    [ "Retirement", "retirement" ],
+    "retirement" => { short: "Retirement", long: "Retirement" },
-    [ "401(k)", "401k" ],
+    "401k" => { short: "401(k)", long: "401(k)" },
-    [ "Traditional 401(k)", "traditional_401k" ],
+    "traditional_401k" => { short: "Traditional 401(k)", long: "Traditional 401(k)" },
-    [ "Roth 401(k)", "roth_401k" ],
+    "roth_401k" => { short: "Roth 401(k)", long: "Roth 401(k)" },
-    [ "529 Plan", "529_plan" ],
+    "529_plan" => { short: "529 Plan", long: "529 Plan" },
-    [ "Health Savings Account", "hsa" ],
+    "hsa" => { short: "HSA", long: "Health Savings Account" },
-    [ "Mutual Fund", "mutual_fund" ],
+    "mutual_fund" => { short: "Mutual Fund", long: "Mutual Fund" },
-    [ "Traditional IRA", "traditional_ira" ],
+    "traditional_ira" => { short: "Traditional IRA", long: "Traditional IRA" },
-    [ "Roth IRA", "roth_ira" ],
+    "roth_ira" => { short: "Roth IRA", long: "Roth IRA" },
-    [ "Angel", "angel" ]
+    "angel" => { short: "Angel", long: "Angel" }
-  ].freeze
+  }.freeze
 
   class << self
     def color

app/models/property.rb

@@ -1,14 +1,14 @@
 class Property < ApplicationRecord
   include Accountable
 
-  SUBTYPES = [
+  SUBTYPES = {
-    [ "Single Family Home", "single_family_home" ],
+    "single_family_home" => { short: "Single Family Home", long: "Single Family Home" },
-    [ "Multi-Family Home", "multi_family_home" ],
+    "multi_family_home" => { short: "Multi-Family Home", long: "Multi-Family Home" },
-    [ "Condominium", "condominium" ],
+    "condominium" => { short: "Condo", long: "Condominium" },
-    [ "Townhouse", "townhouse" ],
+    "townhouse" => { short: "Townhouse", long: "Townhouse" },
-    [ "Investment Property", "investment_property" ],
+    "investment_property" => { short: "Investment Property", long: "Investment Property" },
-    [ "Second Home", "second_home" ]
+    "second_home" => { short: "Second Home", long: "Second Home" }
-  ]
+  }.freeze
 
   has_one :address, as: :addressable, dependent: :destroy
 

app/views/accounts/_account.html.erb

@@ -17,6 +17,9 @@
           </p>
         <% else %>
           <%= link_to account.name, account, class: [(account.is_active ? "text-primary" : "text-subdued"), "text-sm font-medium hover:underline"], data: { turbo_frame: "_top" } %>
+          <% if account.long_subtype_label %>
+            <p class="text-sm text-secondary truncate"><%= account.long_subtype_label %></p>
+          <% end %>
         <% end %>
       </div>
 

app/views/accounts/_accountable_group.html.erb

@@ -24,7 +24,7 @@
 
         <div class="min-w-0 grow">
           <%= tag.p account.name, class: "text-sm text-primary font-medium mb-0.5 truncate" %>
-          <%= tag.p account.subtype&.humanize.presence || account_group.name, class: "text-sm text-secondary truncate" %>
+          <%= tag.p account.short_subtype_label, class: "text-sm text-secondary truncate" %>
         </div>
 
         <div class="ml-auto text-right grow h-10">

app/views/depositories/_form.html.erb

@@ -2,6 +2,6 @@
 
 <%= render "accounts/form", account: account, url: url do |form| %>
   <%= form.select :subtype,
-                 Depository::SUBTYPES,
+                 Depository::SUBTYPES.map { |k, v| [v[:long], k] },
                  { label: true, prompt: t("depositories.form.subtype_prompt"), include_blank: t("depositories.form.none") } %>
 <% end %>

app/views/investments/_form.html.erb

@@ -2,6 +2,6 @@
 
 <%= render "accounts/form", account: account, url: url do |form| %>
   <%= form.select :subtype,
-                 Investment::SUBTYPES,
+                 Investment::SUBTYPES.map { |k, v| [v[:long], k] },
                  { label: true, prompt: t("investments.form.subtype_prompt"), include_blank: t("investments.form.none") } %>
 <% end %>

app/views/properties/_form.html.erb

@@ -2,7 +2,7 @@
 
 <%= render "accounts/form", account: account, url: url do |form| %>
   <%= form.select :subtype,
-                 Property::SUBTYPES,
+                 Property::SUBTYPES.map { |k, v| [v[:long], k] },
                  { label: true, prompt: t("properties.form.subtype_prompt"), include_blank: t("properties.form.none") } %>
 
   <hr class="my-4">

test/models/account_test.rb

@@ -13,4 +13,22 @@ class AccountTest < ActiveSupport::TestCase
       @account.destroy
     end
   end
+
+  test "gets short/long subtype label" do
+    account = @family.accounts.create!(
+      name: "Test Investment",
+      balance: 1000,
+      currency: "USD",
+      subtype: "hsa",
+      accountable: Investment.new
+    )
+
+    assert_equal "HSA", account.short_subtype_label
+    assert_equal "Health Savings Account", account.long_subtype_label
+
+    # Test with nil subtype
+    account.update!(subtype: nil)
+    assert_equal "Investments", account.short_subtype_label
+    assert_equal "Investments", account.long_subtype_label
+  end
 end