The personal finance app for everyone
Add accounts management list (#522)
Zach Gollwitzerad7136cb63e0
diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.cssindex 8529f781..d09dd635 100644--- a/app/assets/stylesheets/application.tailwind.css+++ b/app/assets/stylesheets/application.tailwind.css@@ -49,6 +49,10 @@.form-field__submit {@apply w-full p-3 text-center text-white bg-black rounded-lg hover:bg-gray-700;}++ input:checked + label + .toggle-switch-dot {+ transform: translateX(100%);+ }}/* Small, single purpose classes that should take precedence over other styles */diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rbindex 7a726dc6..392c8bd5 100644--- a/app/controllers/accounts_controller.rb+++ b/app/controllers/accounts_controller.rb@@ -15,6 +15,30 @@ class AccountsController < ApplicationController@valuation_series = @account.valuations.to_series(@account)end+ def edit+ end++ def update+ @account = Current.family.accounts.find(params[:id])++ if @account.update(account_params.except(:accountable_type))++ @account.sync_later if account_params[:is_active] == "1"++ respond_to do |format|+ format.html { redirect_to accounts_path, notice: t(".success") }+ format.turbo_stream do+ render turbo_stream: [+ turbo_stream.append("notification-tray", partial: "shared/notification", locals: { type: "success", content: t(".success") }),+ turbo_stream.replace("account_#{@account.id}", partial: "accounts/account", locals: { account: @account })+ ]+ end+ end+ else+ render "edit", status: :unprocessable_entity+ end+ end+def create@account = Current.family.accounts.build(account_params.except(:accountable_type))@account.accountable = Accountable.from_type(account_params[:accountable_type])&.new@@ -29,6 +53,6 @@ class AccountsController < ApplicationControllerprivatedef account_params- params.require(:account).permit(:name, :accountable_type, :balance, :currency, :subtype)+ params.require(:account).permit(:name, :accountable_type, :balance, :currency, :subtype, :is_active)endenddiff --git a/app/models/account.rb b/app/models/account.rbindex 3f4442a9..0a280f77 100644--- a/app/models/account.rb+++ b/app/models/account.rb@@ -7,6 +7,8 @@ class Account < ApplicationRecordhas_many :valuationshas_many :transactions+ scope :active, -> { where(is_active: true) }+delegated_type :accountable, types: Accountable::TYPES, dependent: :destroybefore_create :check_currency@@ -17,10 +19,15 @@ class Account < ApplicationRecordTrend.new(current: last.balance, previous: first.balance, type: classification)end+ def self.by_provider+ # TODO: When 3rd party providers are supported, dynamically load all providers and their accounts+ [ { name: "Manual accounts", accounts: all.order(balance: :desc).group_by(&:accountable_type) } ]+ end+# TODO: We will need a better way to encapsulate large queries & transformation logic, but leaving all in one spot until# we have a better understanding of the requirementsdef self.by_group(period = Period.all)- ranked_balances_cte = joins(:balances)+ ranked_balances_cte = active.joins(:balances).select("account_balances.account_id,account_balances.balance,diff --git a/app/models/family.rb b/app/models/family.rbindex 32261214..e514a783 100644--- a/app/models/family.rb+++ b/app/models/family.rb@@ -4,15 +4,15 @@ class Family < ApplicationRecordhas_many :transactions, through: :accountsdef net_worth- accounts.sum("CASE WHEN classification = 'asset' THEN balance ELSE -balance END")+ accounts.active.sum("CASE WHEN classification = 'asset' THEN balance ELSE -balance END")enddef assets- accounts.where(classification: "asset").sum(:balance)+ accounts.active.where(classification: "asset").sum(:balance)enddef liabilities- accounts.where(classification: "liability").sum(:balance)+ accounts.active.where(classification: "liability").sum(:balance)enddef net_worth_series(period = nil)diff --git a/app/views/accounts/_account.html.erb b/app/views/accounts/_account.html.erbnew file mode 100644index 00000000..745c9549--- /dev/null+++ b/app/views/accounts/_account.html.erb@@ -0,0 +1,23 @@+<%= turbo_frame_tag dom_id(account) do %>+ <div class="p-4 flex items-center justify-between gap-3">+ <div class="flex items-center gap-3">+ <div class="w-8 h-8 flex items-center justify-center rounded-full text-xs font-medium <%= account.is_active ? "bg-blue-500/10 text-blue-500" : "bg-gray-500/10 text-gray-500" %>">+ <%= account.name[0].upcase %>+ </div>+ <p class="text-sm font-medium <%= account.is_active ? "text-gray-900" : "text-gray-400" %>">+ <%= account.name %>+ </p>+ </div>+ <div class="flex items-center gap-8">+ <p class="text-sm font-medium <%= account.is_active ? "text-gray-900" : "text-gray-400" %>">+ <%= format_currency account.balance %>+ </p>+ <%= form_with model: account, method: :patch, html: { class: "flex items-center", data: { turbo_frame: "_top" } } do |form| %>+ <div class="relative inline-block select-none">+ <%= form.check_box :is_active, class: "sr-only peer", id: "is_active_#{account.id}", onchange: "this.form.requestSubmit();" %>+ <label for="is_active_<%= account.id %>" class="block bg-gray-100 w-9 h-5 rounded-full cursor-pointer after:content-[''] after:block after:absolute after:top-0.5 after:left-0.5 after:bg-white after:w-4 after:h-4 after:rounded-full after:transition-transform after:duration-300 after:ease-in-out peer-checked:bg-green-600 peer-checked:after:translate-x-4"></label>+ </div>+ <% end %>+ </div>+ </div>+<% end%>\ No newline at end of filediff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erbindex 31590101..f1e54e7a 100644--- a/app/views/accounts/index.html.erb+++ b/app/views/accounts/index.html.erb@@ -1,17 +1,57 @@--<h2 class="text-2xl font-semibold font-display"><%= t('.title')%></h2>-<h3 class="mt-1 mb-4 text-sm text-gray-500"><%#= number_to_currency Current.family.cash_balance %></h3>--<% Current.family.accounts.each do |account| %>- <div class="flex flex-row items-center justify-between px-3 py-3 mb-2 bg-white shadow-sm rounded-xl">- <div class="flex items-center w-1/3 text-sm">- <%= account.name %>+<div class="space-y-4">+ <div class="flex items-center justify-between">+ <h1 class="text-xl font-medium text-gray-900">Accounts</h1>+ <%= link_to new_account_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo_frame: "modal" } do %>+ <%= lucide_icon("plus", class: "w-5 h-5") %>+ <span><%= t('.new_account') %></span>+ <% end %>+ </div>+ <% if Current.family.accounts.empty? %>+ <div class="flex justify-center items-center h-[800px] text-sm">+ <div class="text-center flex flex-col items-center max-w-[300px]">+ <p class="text-gray-900 mb-1 font-medium">No accounts yet</p>+ <p class="text-gray-500 mb-4">Add an account either via connection, importing or entering manually.</p>+ <%= link_to new_account_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo_frame: "modal" } do %>+ <%= lucide_icon("plus", class: "w-5 h-5") %>+ <span><%= t('.new_account') %></span>+ <% end %></div>- <div class="flex items-center w-1/3 text-sm">- <%= to_accountable_title(account.accountable) %>- </div>- <p class="flex w-1/3 text-sm text-right">- <span class="block mb-1"><%= format_currency account.converted_balance %></span>- </p></div>-<% end %>+ <% else %>+ <div>+ <% Current.family.accounts.by_provider.each do |item| %>+ <details class="bg-white group p-4 border border-alpha-black-25 shadow-xs rounded-xl">+ <summary class="flex items-center gap-2">+ <%= lucide_icon("chevron-down", class: "hidden group-open:block w-5 h-5 text-gray-500") %>+ <%= lucide_icon("chevron-right", class: "group-open:hidden w-5 h-5 text-gray-500") %>+ <% if item[:name] == "Manual accounts" %>+ <div class="flex items-center justify-center h-8 w-8 rounded-full bg-black/5">+ <%= lucide_icon("folder-pen", class: "w-5 h-5 text-gray-500") %>+ </div>+ <% end %>+ <span class="text-sm font-medium text-gray-900">+ <%= item[:name] %>+ </span>+ </summary>+ <div class="space-y-4 mt-4">+ <% item[:accounts].each do |group, accounts| %>+ <div class="bg-gray-25 p-1 rounded-xl">+ <div class="flex items-center px-4 py-2 text-xs font-medium text-gray-500">+ <p><%= to_accountable_title(Accountable.from_type(group)) %></p>+ <span class="text-gray-400 mx-2">·</span>+ <p><%= accounts.count %></p>+ <p class="ml-auto"><%= format_currency accounts.sum(&:balance) %></p>+ </div>+ <div class="bg-white">+ <% accounts.each do |account| %>+ <%= render account %>+ <% end %>+ </div>+ </div>+ <% end %>+ </div>+ </details>+ <% end %>+ </div>+ <% end %>+</div>diff --git a/app/views/valuations/create.turbo_stream.erb b/app/views/valuations/create.turbo_stream.erbindex 0e0f5e8b..053eb0f3 100644--- a/app/views/valuations/create.turbo_stream.erb+++ b/app/views/valuations/create.turbo_stream.erb@@ -1,4 +1,4 @@<%= turbo_stream.replace Valuation.new, body: turbo_frame_tag(dom_id(Valuation.new)) %><%= turbo_stream.append "notification-tray", partial: "shared/notification", locals: { type: "success", content: "Valuation created" } %>-<%= turbo_stream.replace "valuations_list", partial: "accounts/account_valuation_list", locals: { valuation_series: @account.valuation_series, classification: @account.classification } %>+<%= turbo_stream.replace "valuations_list", partial: "accounts/account_valuation_list", locals: { valuation_series: @account.valuations.to_series(@account) } %><%= turbo_stream.replace "sync_message", partial: "accounts/sync_message", locals: { is_syncing: true } %>diff --git a/app/views/valuations/destroy.turbo_stream.erb b/app/views/valuations/destroy.turbo_stream.erbindex 26f32869..4184dc4c 100644--- a/app/views/valuations/destroy.turbo_stream.erb+++ b/app/views/valuations/destroy.turbo_stream.erb@@ -1,4 +1,4 @@<%= turbo_stream.remove @valuation %><%= turbo_stream.append "notification-tray", partial: "shared/notification", locals: { type: "success", content: "Valuation deleted" } %>-<%= turbo_stream.replace "valuations_list", partial: "accounts/account_valuation_list", locals: { valuation_series: @account.valuation_series, classification: @account.classification } %>+<%= turbo_stream.replace "valuations_list", partial: "accounts/account_valuation_list", locals: { valuation_series: @account.valuations.to_series(@account) } %><%= turbo_stream.replace "sync_message", partial: "accounts/sync_message", locals: { is_syncing: true } %>diff --git a/config/locales/views/account/en.yml b/config/locales/views/account/en.ymlindex ff38c58a..932f3df3 100644--- a/config/locales/views/account/en.yml+++ b/config/locales/views/account/en.yml@@ -4,10 +4,12 @@ en:create:success: New account created successfullyindex:- title: Cash+ new_account: New accountnew:name:label: Account nameplaceholder: Example account nameselect_accountable_type: What would you like to add?title: Add an account+ update:+ success: Account updated successfullydiff --git a/db/migrate/20240306193345_add_is_active_to_account.rb b/db/migrate/20240306193345_add_is_active_to_account.rbnew file mode 100644index 00000000..0da9625b--- /dev/null+++ b/db/migrate/20240306193345_add_is_active_to_account.rb@@ -0,0 +1,5 @@+class AddIsActiveToAccount < ActiveRecord::Migration[7.2]+ def change+ add_column :accounts, :is_active, :boolean, default: true, null: false+ end+enddiff --git a/db/schema.rb b/db/schema.rbindex 564b9cf3..fbd2e521 100644--- a/db/schema.rb+++ b/db/schema.rb@@ -10,7 +10,7 @@## It's strongly recommended that you check this file into your version control system.-ActiveRecord::Schema[7.2].define(version: 2024_03_02_145715) do+ActiveRecord::Schema[7.2].define(version: 2024_03_06_193345) do# These are extensions that must be enabled in order to support this databaseenable_extension "pgcrypto"enable_extension "plpgsql"@@ -79,7 +79,8 @@ ActiveRecord::Schema[7.2].define(version: 2024_03_02_145715) dot.decimal "converted_balance", precision: 19, scale: 4, default: "0.0"t.string "converted_currency", default: "USD"t.string "status", default: "OK"- t.virtual "classification", type: :string, as: "\nCASE\n WHEN ((accountable_type)::text = ANY ((ARRAY['Account::Loan'::character varying, 'Account::Credit'::character varying, 'Account::OtherLiability'::character varying])::text[])) THEN 'liability'::text\n ELSE 'asset'::text\nEND", stored: true+ t.virtual "classification", type: :string, as: "\nCASE\n WHEN ((accountable_type)::text = ANY (ARRAY[('Account::Loan'::character varying)::text, ('Account::Credit'::character varying)::text, ('Account::OtherLiability'::character varying)::text])) THEN 'liability'::text\n ELSE 'asset'::text\nEND", stored: true+ t.boolean "is_active", default: true, null: falset.index ["accountable_type"], name: "index_accounts_on_accountable_type"t.index ["family_id"], name: "index_accounts_on_family_id"enddiff --git a/test/models/family_test.rb b/test/models/family_test.rbindex 01a2144f..7db5ea75 100644--- a/test/models/family_test.rb+++ b/test/models/family_test.rb@@ -42,6 +42,22 @@ class FamilyTest < ActiveSupport::TestCaseassert_equal BigDecimal("24550"), @family.net_worthend+ test "should exclude disabled accounts from calculations" do+ assets_before = @family.assets+ liabilities_before = @family.liabilities+ net_worth_before = @family.net_worth++ disabled_checking = accounts(:checking)+ disabled_cc = accounts(:credit_card)++ disabled_checking.update!(is_active: false)+ disabled_cc.update!(is_active: false)++ assert_equal assets_before - disabled_checking.balance, @family.assets+ assert_equal liabilities_before - disabled_cc.balance, @family.liabilities+ assert_equal net_worth_before - disabled_checking.balance + disabled_cc.balance, @family.net_worth+ end+test "calculates asset series" do# Sum of expected balances for all asset accounts in balance_calculator_test.rbexpected_balances = [@@ -108,6 +124,23 @@ class FamilyTest < ActiveSupport::TestCase)end+ test "calculates balances by type with disabled account" do+ disabled_checking = accounts(:checking).update!(is_active: false)++ verify_balances_by_type(+ period: Period.all,+ expected_asset_total: BigDecimal("20550"),+ expected_liability_total: BigDecimal("1000"),+ expected_asset_groups: {+ "Account::OtherAsset" => { end_balance: BigDecimal("550"), start_balance: BigDecimal("400"), allocation: 2.68 },+ "Account::Depository" => { end_balance: BigDecimal("20000"), start_balance: BigDecimal("21250"), allocation: 97.32 }+ },+ expected_liability_groups: {+ "Account::Credit" => { end_balance: BigDecimal("1000"), start_balance: BigDecimal("1040"), allocation: 100 }+ }+ )+ end+privatedef verify_balances_by_type(period:, expected_asset_total:, expected_liability_total:, expected_asset_groups:, expected_liability_groups:)