Merge branch 'maybe-finance:main' into bugfix/ui-pwa-ios

KenTandrian · web-flow · commit d2debd80eff9 · 2025-07-12T15:59:33.000+07:00
diff --git a/app/components/button_component.html.erb b/app/components/button_component.html.erb
@@ -1,6 +1,6 @@
 <%= container do %>
   <% if icon && (icon_position != :right) %>
-    <%= helpers.icon(icon, size: size, color: icon_color) %>
+    <%= helpers.icon(icon, size: size, color: icon_color, class: icon_classes) %>
   <% end %>
 
   <% unless icon_only? %>
diff --git a/app/components/buttonish_component.rb b/app/components/buttonish_component.rb
@@ -5,7 +5,7 @@ class ButtonishComponent < ViewComponent::Base
       icon_classes: "fg-inverse"
     },
     secondary: {
-      container_classes: "text-secondary bg-gray-50 theme-dark:bg-gray-700 hover:bg-gray-100 theme-dark:hover:bg-gray-600 disabled:bg-gray-200 theme-dark:disabled:bg-gray-600",
+      container_classes: "text-primary bg-gray-50 theme-dark:bg-gray-700 hover:bg-gray-100 theme-dark:hover:bg-gray-600 disabled:bg-gray-200 theme-dark:disabled:bg-gray-600",
       icon_classes: "fg-primary"
     },
     destructive: {
diff --git a/app/models/account.rb b/app/models/account.rb
@@ -64,14 +64,14 @@ def create_and_sync(attributes)
       transaction do
         # Create 2 valuations for new accounts to establish a value history for users to see
         account.entries.build(
-          name: "Current Balance",
+          name: Valuation.build_current_anchor_name(account.accountable_type),
           date: Date.current,
           amount: account.balance,
           currency: account.currency,
           entryable: Valuation.new
         )
         account.entries.build(
-          name: "Initial Balance",
+          name: Valuation.build_opening_anchor_name(account.accountable_type),
           date: 1.day.ago.to_date,
           amount: initial_balance,
           currency: account.currency,
diff --git a/app/models/account/balance_updater.rb b/app/models/account/balance_updater.rb
@@ -23,7 +23,7 @@ def update
 
       valuation_entry.amount = balance
       valuation_entry.currency = currency if currency.present?
-      valuation_entry.name = "Manual #{account.accountable.balance_display_name} update"
+      valuation_entry.name = Valuation.build_reconciliation_name(account.accountable_type)
       valuation_entry.notes = notes if notes.present?
       valuation_entry.save!
     end
diff --git a/app/models/account_import.rb b/app/models/account_import.rb
@@ -18,8 +18,8 @@ def import!
         account.entries.create!(
           amount: row.amount,
           currency: row.currency,
-          date: Date.current,
-          name: "Imported account value",
+          date: 2.years.ago.to_date,
+          name: Valuation.build_opening_anchor_name(account.accountable_type),
           entryable: Valuation.new
         )
       end
diff --git a/app/models/demo/generator.rb b/app/models/demo/generator.rb
@@ -1176,7 +1176,7 @@ def reconcile_balances!(family)
       @home.entries.create!(
         entryable: Valuation.new,
         amount: 350_000,
-        name: "Current Market Value",
+        name: Valuation.build_current_anchor_name(@home.accountable_type),
         currency: "USD",
         date: Date.current
       )
@@ -1185,31 +1185,31 @@ def reconcile_balances!(family)
       @honda_accord.entries.create!(
         entryable: Valuation.new,
         amount: 18_000,
-        name: "Current Market Value",
+        name: Valuation.build_current_anchor_name(@honda_accord.accountable_type),
         currency: "USD",
         date: Date.current
       )
 
       @tesla_model3.entries.create!(
         entryable: Valuation.new,
         amount: 4_500,
-        name: "Current Market Value",
+        name: Valuation.build_current_anchor_name(@tesla_model3.accountable_type),
         currency: "USD",
         date: Date.current
       )
 
       @jewelry.entries.create!(
         entryable: Valuation.new,
         amount: 2000,
-        name: "Current Market Value",
+        name: Valuation.build_reconciliation_name(@jewelry.accountable_type),
         currency: "USD",
         date: 90.days.ago.to_date
       )
 
       @personal_loc.entries.create!(
         entryable: Valuation.new,
         amount: 800,
-        name: "Owed",
+        name: Valuation.build_reconciliation_name(@personal_loc.accountable_type),
         currency: "USD",
         date: 120.days.ago.to_date
       )
diff --git a/app/models/trade.rb b/app/models/trade.rb
@@ -8,6 +8,13 @@ class Trade < ApplicationRecord
   validates :qty, presence: true
   validates :price, :currency, presence: true
 
+  class << self
+    def build_name(type, qty, ticker)
+      prefix = type == "buy" ? "Buy" : "Sell"
+      "#{prefix} #{qty.to_d.abs} shares of #{ticker}"
+    end
+  end
+
   def unrealized_gain_loss
     return nil if qty.negative?
     current_price = security.current_price
diff --git a/app/models/trade/create_form.rb b/app/models/trade/create_form.rb
@@ -29,13 +29,11 @@ def security
     end
 
     def create_trade
-      prefix = type == "sell" ? "Sell " : "Buy "
-      trade_name = prefix + "#{qty.to_i.abs} shares of #{security.ticker}"
       signed_qty = type == "sell" ? -qty.to_d : qty.to_d
       signed_amount = signed_qty * price.to_d
 
       trade_entry = account.entries.new(
-        name: trade_name,
+        name: Trade.build_name(type, qty, security.ticker),
         date: date,
         amount: signed_amount,
         currency: currency,
diff --git a/app/models/valuation.rb b/app/models/valuation.rb
@@ -1,3 +1,23 @@
 class Valuation < ApplicationRecord
   include Entryable
+
+  class << self
+    def build_reconciliation_name(accountable_type)
+      Valuation::Name.new("reconciliation", accountable_type).to_s
+    end
+
+    def build_opening_anchor_name(accountable_type)
+      Valuation::Name.new("opening_anchor", accountable_type).to_s
+    end
+
+    def build_current_anchor_name(accountable_type)
+      Valuation::Name.new("current_anchor", accountable_type).to_s
+    end
+  end
+
+  # TODO: Remove this method when `kind` column is added to valuations table
+  # This is a temporary implementation until the database migration is complete
+  def kind
+    "reconciliation"
+  end
 end
diff --git a/app/models/valuation/name.rb b/app/models/valuation/name.rb
@@ -0,0 +1,57 @@
+class Valuation::Name
+  def initialize(valuation_kind, accountable_type)
+    @valuation_kind = valuation_kind
+    @accountable_type = accountable_type
+  end
+
+  def to_s
+    case valuation_kind
+    when "opening_anchor"
+      opening_anchor_name
+    when "current_anchor"
+      current_anchor_name
+    else
+      recon_name
+    end
+  end
+
+  private
+    attr_reader :valuation_kind, :accountable_type
+
+    def opening_anchor_name
+      case accountable_type
+      when "Property"
+        "Original purchase price"
+      when "Loan"
+        "Original principal"
+      when "Investment"
+        "Opening account value"
+      else
+        "Opening balance"
+      end
+    end
+
+    def current_anchor_name
+      case accountable_type
+      when "Property"
+        "Current market value"
+      when "Loan"
+        "Current loan balance"
+      when "Investment"
+        "Current account value"
+      else
+        "Current balance"
+      end
+    end
+
+    def recon_name
+      case accountable_type
+      when "Property", "Investment"
+        "Manual value update"
+      when "Loan"
+        "Manual principal update"
+      else
+        "Manual balance update"
+      end
+    end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/lib/tasks/demo_data.rake b/lib/tasks/demo_data.rake
@@ -28,7 +28,7 @@ namespace :demo_data do
     generator = Demo::Generator.new(seed: seed)
     generator.generate_default_data!
 
-    validate_demo_data!
+    validate_demo_data
 
     elapsed = Time.now - start
     puts "🎉 Demo data ready in #{elapsed.round(2)}s"
@@ -37,7 +37,7 @@ namespace :demo_data do
   # ---------------------------------------------------------------------------
   # Validation helpers
   # ---------------------------------------------------------------------------
-  def validate_demo_data!
+  def validate_demo_data
     total_entries   = Entry.count
     trade_entries   = Entry.where(entryable_type: "Trade").count
     categorized_txn = Transaction.joins(:category).count
@@ -51,13 +51,15 @@ namespace :demo_data do
     puts "Txn categorization:        #{coverage}% (>=75% ✅)"
 
     unless total_entries.between?(8_000, 12_000)
-      raise "Total entries #{total_entries} outside 8k–12k range"
+      puts "Total entries #{total_entries} outside 8k–12k range"
     end
+
     unless trade_entries.between?(500, 1000)
-      raise "Trade entries #{trade_entries} outside 500–1 000 range"
+      puts "Trade entries #{trade_entries} outside 500–1 000 range"
     end
+
     unless coverage >= 75
-      raise "Categorization coverage below 75%"
+      puts "Categorization coverage below 75%"
     end
   end
 end
diff --git a/test/controllers/api/v1/transactions_controller_test.rb b/test/controllers/api/v1/transactions_controller_test.rb
@@ -8,8 +8,29 @@ class Api::V1::TransactionsControllerTest < ActionDispatch::IntegrationTest
     @family = @user.family
     @account = @family.accounts.first
     @transaction = @family.transactions.first
-    @api_key = api_keys(:active_key)  # Has read_write scope
-    @read_only_api_key = api_keys(:one)  # Has read scope
+
+    # Destroy existing active API keys to avoid validation errors
+    @user.api_keys.active.destroy_all
+
+    # Create fresh API keys instead of using fixtures to avoid parallel test conflicts (rate limiting in test)
+    @api_key = ApiKey.create!(
+      user: @user,
+      name: "Test Read-Write Key",
+      scopes: [ "read_write" ],
+      display_key: "test_rw_#{SecureRandom.hex(8)}"
+    )
+
+    @read_only_api_key = ApiKey.create!(
+      user: @user,
+      name: "Test Read-Only Key",
+      scopes: [ "read" ],
+      display_key: "test_ro_#{SecureRandom.hex(8)}",
+      source: "mobile"  # Use different source to allow multiple keys
+    )
+
+    # Clear any existing rate limit data
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+    Redis.new.del("api_rate_limit:#{@read_only_api_key.id}")
   end
 
   # INDEX action tests
@@ -335,6 +356,6 @@ class Api::V1::TransactionsControllerTest < ActionDispatch::IntegrationTest
   private
 
     def api_headers(api_key)
-      { "X-Api-Key" => api_key.plain_key }
+      { "X-Api-Key" => api_key.display_key }
     end
 end
diff --git a/test/controllers/valuations_controller_test.rb b/test/controllers/valuations_controller_test.rb
@@ -23,7 +23,7 @@ class ValuationsControllerTest < ActionDispatch::IntegrationTest
     end
 
     created_entry = Entry.order(created_at: :desc).first
-    assert_equal "Manual account value update", created_entry.name
+    assert_equal "Manual value update", created_entry.name
     assert_equal Date.current, created_entry.date
     assert_equal account.balance + 100, created_entry.amount_money.to_f
 
diff --git a/test/models/trade_test.rb b/test/models/trade_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class TradeTest < ActiveSupport::TestCase
+  test "build_name generates buy trade name" do
+    name = Trade.build_name("buy", 10, "AAPL")
+    assert_equal "Buy 10.0 shares of AAPL", name
+  end
+
+  test "build_name generates sell trade name" do
+    name = Trade.build_name("sell", 5, "MSFT")
+    assert_equal "Sell 5.0 shares of MSFT", name
+  end
+
+  test "build_name handles absolute value for negative quantities" do
+    name = Trade.build_name("sell", -5, "GOOGL")
+    assert_equal "Sell 5.0 shares of GOOGL", name
+  end
+
+  test "build_name handles decimal quantities" do
+    name = Trade.build_name("buy", 0.25, "BTC")
+    assert_equal "Buy 0.25 shares of BTC", name
+  end
+end
diff --git a/test/models/valuation/name_test.rb b/test/models/valuation/name_test.rb
diff --git a/test/system/trades_test.rb b/test/system/trades_test.rb
