The personal finance app for everyone
Prepare fixture data for account sync tests (#493)
Zach Gollwitzer7d48c01833a1
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rbindex d2a834dc..c6adff74 100644--- a/app/controllers/accounts_controller.rb+++ b/app/controllers/accounts_controller.rb@@ -3,7 +3,7 @@ class AccountsController < ApplicationControllerdef new@account = Account.new(- original_balance: nil,+ balance: nil,accountable: Accountable.from_type(params[:type])&.new)end@@ -41,6 +41,6 @@ class AccountsController < ApplicationControllerprivatedef account_params- params.require(:account).permit(:name, :accountable_type, :original_balance, :original_currency, :subtype)+ params.require(:account).permit(:name, :accountable_type, :balance, :currency, :subtype)endenddiff --git a/app/jobs/convert_currency_job.rb b/app/jobs/convert_currency_job.rbindex fe8e82d2..2a657b69 100644--- a/app/jobs/convert_currency_job.rb+++ b/app/jobs/convert_currency_job.rb@@ -6,11 +6,11 @@ class ConvertCurrencyJob < ApplicationJob# Convert all account balances to new currencyfamily.accounts.each do |account|- if account.original_currency == family.currency- account.converted_balance = account.original_balance- account.converted_currency = account.original_currency+ if account.currency == family.currency+ account.converted_balance = account.balance+ account.converted_currency = account.currencyelse- account.converted_balance = ExchangeRate.convert(account.original_currency, family.currency, account.original_balance)+ account.converted_balance = ExchangeRate.convert(account.currency, family.currency, account.balance)account.converted_currency = family.currencyendaccount.save!diff --git a/app/models/account.rb b/app/models/account.rbindex 559c1270..81452bf5 100644--- a/app/models/account.rb+++ b/app/models/account.rb@@ -37,11 +37,11 @@ class Account < ApplicationRecordenddef check_currency- if self.original_currency == self.family.currency- self.converted_balance = self.original_balance- self.converted_currency = self.original_currency+ if self.currency == self.family.currency+ self.converted_balance = self.balance+ self.converted_currency = self.currencyelse- self.converted_balance = ExchangeRate.convert(self.original_currency, self.family.currency, self.original_balance)+ self.converted_balance = ExchangeRate.convert(self.currency, self.family.currency, self.balance)self.converted_currency = self.family.currencyendenddiff --git a/app/views/accounts/new.html.erb b/app/views/accounts/new.html.erbindex 7c4e0b39..3dfa82d7 100644--- a/app/views/accounts/new.html.erb+++ b/app/views/accounts/new.html.erb@@ -1,90 +1,82 @@<h1 class="text-3xl font-semibold font-display"><%= t('.title')%></h1>-<%= modal do %><div class="flex flex-col min-h-[530px]" data-controller="list-keyboard-navigation">- <% if @account.accountable.blank? %>- <div class="border-b border-alpha-black-25 p-4 text-gray-400">- <%= t '.select_accountable_type' %>- </div>- <div class="flex flex-col p-2 text-sm grow">- <button hidden data-controller="hotkey" data-hotkey="k,K,ArrowUp,ArrowLeft" data-action="list-keyboard-navigation#focusPrevious">Previous</button>- <button hidden data-controller="hotkey" data-hotkey="j,J,ArrowDown,ArrowRight" data-action="list-keyboard-navigation#focusNext">Next</button>-- <%= render "account_type", type: Account::Depository.new, bg_color: "bg-blue-50", text_color: "text-blue-500", icon: "landmark" %>- <%= render "account_type", type: Account::Investment.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "line-chart" %>- <%= render "account_type", type: Account::Property.new, bg_color: "bg-pink-50", text_color: "text-pink-500", icon: "home" %>- <%= render "account_type", type: Account::Vehicle.new, bg_color: "bg-indigo-50", text_color: "text-indigo-500", icon: "car-front" %>- <%= render "account_type", type: Account::Credit.new, bg_color: "bg-violet-50", text_color: "text-violet-500", icon: "credit-card" %>- <%= render "account_type", type: Account::Loan.new, bg_color: "bg-yellow-50", text_color: "text-yellow-500", icon: "hand-coins" %>- <%= render "account_type", type: Account::OtherAsset.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "plus" %>- <%= render "account_type", type: Account::OtherLiability.new, bg_color: "bg-red-50", text_color: "text-red-500", icon: "minus" %>- </div>- <div class="border-t border-alpha-black-25 p-4 text-gray-500 text-sm flex justify-between">- <div class="flex space-x-5">- <div class="flex items-center space-x-2">- <span>Select</span> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('corner-down-left', class: 'inline w-3 h-3')%></kbd>+ <% if @account.accountable.blank? %>+ <div class="border-b border-alpha-black-25 p-4 text-gray-400">+ <%= t '.select_accountable_type' %>+ </div>+ <div class="flex flex-col p-2 text-sm grow">+ <button hidden data-controller="hotkey" data-hotkey="k,K,ArrowUp,ArrowLeft" data-action="list-keyboard-navigation#focusPrevious">Previous</button>+ <button hidden data-controller="hotkey" data-hotkey="j,J,ArrowDown,ArrowRight" data-action="list-keyboard-navigation#focusNext">Next</button>+ <%= render "account_type", type: Account::Depository.new, bg_color: "bg-blue-50", text_color: "text-blue-500", icon: "landmark" %>+ <%= render "account_type", type: Account::Investment.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "line-chart" %>+ <%= render "account_type", type: Account::Property.new, bg_color: "bg-pink-50", text_color: "text-pink-500", icon: "home" %>+ <%= render "account_type", type: Account::Vehicle.new, bg_color: "bg-indigo-50", text_color: "text-indigo-500", icon: "car-front" %>+ <%= render "account_type", type: Account::Credit.new, bg_color: "bg-violet-50", text_color: "text-violet-500", icon: "credit-card" %>+ <%= render "account_type", type: Account::Loan.new, bg_color: "bg-yellow-50", text_color: "text-yellow-500", icon: "hand-coins" %>+ <%= render "account_type", type: Account::OtherAsset.new, bg_color: "bg-green-50", text_color: "text-green-500", icon: "plus" %>+ <%= render "account_type", type: Account::OtherLiability.new, bg_color: "bg-red-50", text_color: "text-red-500", icon: "minus" %>+ </div>+ <div class="border-t border-alpha-black-25 p-4 text-gray-500 text-sm flex justify-between">+ <div class="flex space-x-5">+ <div class="flex items-center space-x-2">+ <span>Select</span> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('corner-down-left', class: 'inline w-3 h-3')%></kbd>+ </div>+ <div class="flex items-center space-x-2">+ <span>Navigate</span> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('arrow-up', class: 'inline w-3 h-3')%></kbd> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('arrow-down', class: 'inline w-3 h-3')%></kbd>+ </div></div><div class="flex items-center space-x-2">- <span>Navigate</span> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('arrow-up', class: 'inline w-3 h-3')%></kbd> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('arrow-down', class: 'inline w-3 h-3')%></kbd>+ <button data-action="modal#close">Close</button> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-8 h-5 shrink-0 grow-0 items-center justify-center text-xs">ESC</kbd></div></div>- <div class="flex items-center space-x-2">- <button data-action="modal#close">Close</button> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-8 h-5 shrink-0 grow-0 items-center justify-center text-xs">ESC</kbd>+ <% elsif params[:step] == 'method' && @account.accountable.present? %>+ <div class="border-b border-alpha-black-25 p-4 text-gray-400 flex items-center space-x-3">+ <%= link_to new_account_path, class: "flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 back focus:outline-gray-300 focus:outline" do %>+ <%= lucide_icon('arrow-left', class: 'text-gray-500 w-5 h-5') %>+ <% end %>+ <span>How would you like to add it?</span></div>- </div>- <% elsif params[:step] == 'method' && @account.accountable.present? %>- <div class="border-b border-alpha-black-25 p-4 text-gray-400 flex items-center space-x-3">- <%= link_to new_account_path, class: "flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 back focus:outline-gray-300 focus:outline" do %>- <%= lucide_icon('arrow-left', class: 'text-gray-500 w-5 h-5') %>- <% end %>- <span>How would you like to add it?</span>- </div>- <div class="flex flex-col p-2 text-sm grow">- <button hidden data-controller="hotkey" data-hotkey="k,K,ArrowUp,ArrowLeft" data-action="list-keyboard-navigation#focusPrevious">Previous</button>- <button hidden data-controller="hotkey" data-hotkey="j,J,ArrowDown,ArrowRight" data-action="list-keyboard-navigation#focusNext">Next</button>-- <%= render "entry_method", type: @account.accountable, text: 'Enter account balance manually', icon: "keyboard" %>- <%= render "entry_method", type: @account.accountable, text: 'Securely link bank account with data provider (coming soon)', icon: "link-2", disabled: true %>- <%= render "entry_method", type: @account.accountable, text: 'Upload spreadsheet (coming soon)', icon: "sheet", disabled: true %>- </div>- <div class="border-t border-alpha-black-25 p-4 text-gray-500 text-sm flex justify-between">- <div class="flex space-x-5">- <div class="flex items-center space-x-2">- <span>Select</span> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('corner-down-left', class: 'inline w-3 h-3')%></kbd>+ <div class="flex flex-col p-2 text-sm grow">+ <button hidden data-controller="hotkey" data-hotkey="k,K,ArrowUp,ArrowLeft" data-action="list-keyboard-navigation#focusPrevious">Previous</button>+ <button hidden data-controller="hotkey" data-hotkey="j,J,ArrowDown,ArrowRight" data-action="list-keyboard-navigation#focusNext">Next</button>+ <%= render "entry_method", type: @account.accountable, text: 'Enter account balance manually', icon: "keyboard" %>+ <%= render "entry_method", type: @account.accountable, text: 'Securely link bank account with data provider (coming soon)', icon: "link-2", disabled: true %>+ <%= render "entry_method", type: @account.accountable, text: 'Upload spreadsheet (coming soon)', icon: "sheet", disabled: true %>+ </div>+ <div class="border-t border-alpha-black-25 p-4 text-gray-500 text-sm flex justify-between">+ <div class="flex space-x-5">+ <div class="flex items-center space-x-2">+ <span>Select</span> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('corner-down-left', class: 'inline w-3 h-3')%></kbd>+ </div>+ <div class="flex items-center space-x-2">+ <span>Navigate</span> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('arrow-up', class: 'inline w-3 h-3')%></kbd> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('arrow-down', class: 'inline w-3 h-3')%></kbd>+ </div></div><div class="flex items-center space-x-2">- <span>Navigate</span> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('arrow-up', class: 'inline w-3 h-3')%></kbd> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon('arrow-down', class: 'inline w-3 h-3')%></kbd>+ <button data-action="modal#close">Close</button> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-8 h-5 shrink-0 grow-0 items-center justify-center text-xs">ESC</kbd></div></div>- <div class="flex items-center space-x-2">- <button data-action="modal#close">Close</button> <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-8 h-5 shrink-0 grow-0 items-center justify-center text-xs">ESC</kbd>+ <% else %>+ <div class="border-b border-alpha-black-25 p-4 text-gray-800 flex items-center space-x-3">+ <%= link_to new_account_path(step: 'method', type: params[:type]), class: "flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 focus:outline-gray-300 focus:outline" do %>+ <%= lucide_icon('arrow-left', class: 'text-gray-500 w-5 h-5') %>+ <% end %>+ <span>Add <%= @account.accountable.model_name.human.downcase %></span></div>- </div>- <% else %>- <div class="border-b border-alpha-black-25 p-4 text-gray-800 flex items-center space-x-3">- <%= link_to new_account_path(step: 'method', type: params[:type]), class: "flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 focus:outline-gray-300 focus:outline" do %>- <%= lucide_icon('arrow-left', class: 'text-gray-500 w-5 h-5') %>- <% end %>- <span>Add <%= @account.accountable.model_name.human.downcase %></span>- </div>-- <%= form_with model: @account, url: accounts_path, scope: :account, html: { class: "m-5 mt-1 flex flex-col justify-between grow", data: { turbo: false } } do |f| %>+ <%= form_with model: @account, url: accounts_path, scope: :account, html: { class: "m-5 mt-1 flex flex-col justify-between grow", data: { turbo: false } } do |f| %><div class="space-y-4 grow"><%= f.hidden_field :accountable_type %>-<%= f.text_field :name, placeholder: t('accounts.new.name.placeholder'), required: 'required', label: t('accounts.new.name.label'), autofocus: true %>-<%= render "accounts/#{permitted_accountable_partial(@account.accountable_type)}", f: f %>-- <%= form_field_tag do %>- <%= f.label :original_balance, class: "form-field__label" %>- <%= f.number_field :original_balance, step: :any, placeholder: number_to_currency(0), in: 0.00..100000000.00, required: 'required', class: 'form-field__input max-w-[80%]' %>- <%= currency_dropdown(f: f, options: Currency.all.order(:iso_code).pluck(:iso_code)) if Currency.count > 1 %>- <% end %>- </div>-- <%= f.submit "Add #{@account.accountable.model_name.human.downcase}" %>+ <%= form_field_tag do %>+ <%= f.label :balance, class: "form-field__label" %>+ <%= f.number_field :balance, step: :any, placeholder: number_to_currency(0), in: 0.00..100000000.00, required: 'required', class: 'form-field__input max-w-[80%]' %>+ <%= currency_dropdown(f: f, options: Currency.all.order(:iso_code).pluck(:iso_code)) if Currency.count > 1 %>+ <% end %>+ </div>+ <%= f.submit "Add #{@account.accountable.model_name.human.downcase}" %>+ <% end %><% end %>- <% end %></div>-<% end %>+<% end %>\ No newline at end of filediff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erbindex 4c69a5b3..001fce51 100644--- a/app/views/accounts/show.html.erb+++ b/app/views/accounts/show.html.erb@@ -11,7 +11,7 @@<div class="flex items-center gap-3"><div class="relative cursor-not-allowed"><div class="flex items-center gap-2 px-3 py-2">- <span class="text-gray-900"><%= @account.original_currency %> <%= @account.original_currency.unit %></span>+ <span class="text-gray-900"><%= @account.currency %> <%= @account.currency.unit %></span><%= lucide_icon("chevron-down", class: "w-5 h-5 text-gray-500") %></div></div>@@ -29,10 +29,10 @@<p class="text-sm text-gray-500">Total Value</p><%# TODO: Will need a better way to split a formatted monetary value into these 3 parts %><p class="text-gray-900">- <span class="text-gray-500"><%= @account.original_currency.unit %></span>- <span class="text-xl font-medium"><%= format_currency(@account.original_balance, precision: 0, unit: '') %></span>- <%- if @account.original_currency.precision.positive? -%>- <span class="text-gray-500"><%= @account.original_currency.separator %><%= @account.original_balance.cents(precision: @account.original_currency.precision) %></span>+ <span class="text-gray-500"><%= @account.currency.unit %></span>+ <span class="text-xl font-medium"><%= format_currency(@account.balance, precision: 0, unit: '') %></span>+ <%- if @account.currency.precision.positive? -%>+ <span class="text-gray-500"><%= @account.currency.separator %><%= @account.balance.cents(precision: @account.currency.precision) %></span><% end %></p><% if @balance_series.nil? %>diff --git a/app/views/shared/_currency_dropdown.html.erb b/app/views/shared/_currency_dropdown.html.erbindex 9a3573a4..124eef59 100644--- a/app/views/shared/_currency_dropdown.html.erb+++ b/app/views/shared/_currency_dropdown.html.erb@@ -1,14 +1,14 @@<div data-controller="currency-dropdown" class="absolute right-1 bottom-[10px] flex items-end"><button type="button" class="flex items-center justify-between w-20 px-2 py-1 text-sm rounded-lg hover:bg-gray-100 focus:bg-gray-100" data-action="click->currency-dropdown#toggleMenu">- <div data-currency-dropdown-target="label"><%= f.object.original_currency %></div>+ <div data-currency-dropdown-target="label"><%= f.object.currency %></div><%# Example of how account currency value is updated %>- <%= f.hidden_field :original_currency, data: {currency_dropdown_target: "input"} %>+ <%= f.hidden_field :currency, data: {currency_dropdown_target: "input"} %><%= lucide_icon("chevron-down", class: "text-gray-500 w-5 h-5" ) %></button><ul data-currency-dropdown-target="menu" class="hidden fixed p-1 bg-white rounded-[10px] min-w-[112px] z-50 translate-y-2 border border-alpha-black-100 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)]"><% options.each do |option| %>- <li data-action="click->currency-dropdown#selectOption" data-currency-dropdown-target="option" data-value="<%= option %>" class="flex justify-between items-center p-2 text-sm text-gray-700 hover:bg-gray-100 cursor-pointer rounded-lg <%= "bg-gray-100" if option === f.object.original_currency %>"><%= option %>- <%= inline_svg_tag('icn-check.svg', class: "text-gray-500 fill-current #{'hidden'if option != f.object.original_currency}") %>+ <li data-action="click->currency-dropdown#selectOption" data-currency-dropdown-target="option" data-value="<%= option %>" class="flex justify-between items-center p-2 text-sm text-gray-700 hover:bg-gray-100 cursor-pointer rounded-lg <%= "bg-gray-100" if option === f.object.currency %>"><%= option %>+ <%= inline_svg_tag('icn-check.svg', class: "text-gray-500 fill-current #{'hidden'if option != f.object.currency}") %></li><% end %></ul>diff --git a/config/locales/models/account/en.yml b/config/locales/models/account/en.ymlindex c0f6a519..4b199653 100644--- a/config/locales/models/account/en.yml+++ b/config/locales/models/account/en.yml@@ -3,11 +3,11 @@ en:activerecord:attributes:account:+ balance: Balance+ currency: Currencyfamily: Familyfamily_id: Familyname: Name- original_balance: Balance- original_currency: Currencysubtype: Subtypemodels:account: Accountdiff --git a/db/migrate/20240227142457_rename_account_balance.rb b/db/migrate/20240227142457_rename_account_balance.rbnew file mode 100644index 00000000..a1b5fe2d--- /dev/null+++ b/db/migrate/20240227142457_rename_account_balance.rb@@ -0,0 +1,6 @@+class RenameAccountBalance < ActiveRecord::Migration[7.2]+ def change+ rename_column :accounts, :original_balance, :balance+ rename_column :accounts, :original_currency, :currency+ end+enddiff --git a/db/schema.rb b/db/schema.rbindex 1e310aa8..01b212e0 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_02_23_162105) do+ActiveRecord::Schema[7.2].define(version: 2024_02_27_142457) do# These are extensions that must be enabled in order to support this databaseenable_extension "pgcrypto"enable_extension "plpgsql"@@ -74,8 +74,8 @@ ActiveRecord::Schema[7.2].define(version: 2024_02_23_162105) dot.datetime "updated_at", null: falset.string "accountable_type"t.uuid "accountable_id"- t.decimal "original_balance", precision: 19, scale: 4, default: "0.0"- t.string "original_currency", default: "USD"+ t.decimal "balance", precision: 19, scale: 4, default: "0.0"+ t.string "currency", default: "USD"t.decimal "converted_balance", precision: 19, scale: 4, default: "0.0"t.string "converted_currency", default: "USD"t.string "status", default: "OK"diff --git a/db/seeds.rb b/db/seeds.rbindex 2f0f3fac..17f34674 100644--- a/db/seeds.rb+++ b/db/seeds.rb@@ -28,7 +28,7 @@ Currency.find_or_create_by(iso_code: "USD", name: "United States Dollar")current_balance = 350000-account = Account.create_or_find_by(name: "Seed Property Account", accountable: Account::Property.new, family: family, original_balance: current_balance, original_currency: "USD")+account = Account.create_or_find_by(name: "Seed Property Account", accountable: Account::Property.new, family: family, balance: current_balance, currency: "USD")puts "Account created: #{account.name}"# Represent user-defined "Valuations" at various datesdiff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rbindex f2e4d7f5..bb493fee 100644--- a/test/controllers/accounts_controller_test.rb+++ b/test/controllers/accounts_controller_test.rb@@ -2,8 +2,8 @@ require "test_helper"class AccountsControllerTest < ActionDispatch::IntegrationTestsetup do- sign_in @user = users(:bob)- @account = accounts(:dylan_checking)+ sign_in @user = users(:family_admin)+ @account = accounts(:generic)endtest "new" dodiff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rbindex 5083248e..b9c4ff29 100644--- a/test/controllers/pages_controller_test.rb+++ b/test/controllers/pages_controller_test.rb@@ -2,7 +2,7 @@ require "test_helper"class PagesControllerTest < ActionDispatch::IntegrationTestsetup do- sign_in users(:bob)+ sign_in users(:family_admin)endtest "dashboard" dodiff --git a/test/controllers/password_resets_controller_test.rb b/test/controllers/password_resets_controller_test.rbindex ebe75b9e..e9a1b956 100644--- a/test/controllers/password_resets_controller_test.rb+++ b/test/controllers/password_resets_controller_test.rb@@ -2,7 +2,7 @@ require "test_helper"class PasswordResetsControllerTest < ActionDispatch::IntegrationTestsetup do- @user = users(:bob)+ @user = users(:family_admin)endtest "new" dodiff --git a/test/controllers/transactions_controller_test.rb b/test/controllers/transactions_controller_test.rbindex addd3364..428f8e01 100644--- a/test/controllers/transactions_controller_test.rb+++ b/test/controllers/transactions_controller_test.rb@@ -2,8 +2,8 @@ require "test_helper"class TransactionsControllerTest < ActionDispatch::IntegrationTestsetup do- sign_in @user = users(:bob)- @transaction = transactions(:one)+ sign_in @user = users(:family_admin)+ @transaction = transactions(:checking_one)endtest "should get index" dodiff --git a/test/controllers/valuations_controller_test.rb b/test/controllers/valuations_controller_test.rbindex 177341e4..478aaf75 100644--- a/test/controllers/valuations_controller_test.rb+++ b/test/controllers/valuations_controller_test.rb@@ -2,8 +2,8 @@ require "test_helper"class ValuationsControllerTest < ActionDispatch::IntegrationTestsetup do- sign_in @user = users(:bob)- @account = accounts(:dylan_checking)+ sign_in @user = users(:family_admin)+ @account = accounts(:generic)endtest "new" dodiff --git a/test/fixtures/account/credits.yml b/test/fixtures/account/credits.ymlindex d7a33292..182a6978 100644--- a/test/fixtures/account/credits.yml+++ b/test/fixtures/account/credits.yml@@ -1,11 +1 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--# This model initially had no columns defined. If you add columns to the-# model remove the "{}" from the fixture names and add the columns immediately-# below each fixture, per the syntax in the comments below-#one: {}-# column: value-#-two: {}-# column: valuediff --git a/test/fixtures/account/depositories.yml b/test/fixtures/account/depositories.ymlindex d7a33292..05896e62 100644--- a/test/fixtures/account/depositories.yml+++ b/test/fixtures/account/depositories.yml@@ -1,11 +1 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--# This model initially had no columns defined. If you add columns to the-# model remove the "{}" from the fixture names and add the columns immediately-# below each fixture, per the syntax in the comments below-#-one: {}-# column: value-#-two: {}-# column: value+checking: {}diff --git a/test/fixtures/account/investments.yml b/test/fixtures/account/investments.ymlindex d7a33292..182a6978 100644--- a/test/fixtures/account/investments.yml+++ b/test/fixtures/account/investments.yml@@ -1,11 +1 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--# This model initially had no columns defined. If you add columns to the-# model remove the "{}" from the fixture names and add the columns immediately-# below each fixture, per the syntax in the comments below-#one: {}-# column: value-#-two: {}-# column: valuediff --git a/test/fixtures/account/loans.yml b/test/fixtures/account/loans.ymlindex d7a33292..182a6978 100644--- a/test/fixtures/account/loans.yml+++ b/test/fixtures/account/loans.yml@@ -1,11 +1 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--# This model initially had no columns defined. If you add columns to the-# model remove the "{}" from the fixture names and add the columns immediately-# below each fixture, per the syntax in the comments below-#one: {}-# column: value-#-two: {}-# column: valuediff --git a/test/fixtures/account/other_assets.yml b/test/fixtures/account/other_assets.ymlindex d7a33292..182a6978 100644--- a/test/fixtures/account/other_assets.yml+++ b/test/fixtures/account/other_assets.yml@@ -1,11 +1 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--# This model initially had no columns defined. If you add columns to the-# model remove the "{}" from the fixture names and add the columns immediately-# below each fixture, per the syntax in the comments below-#one: {}-# column: value-#-two: {}-# column: valuediff --git a/test/fixtures/account/other_liabilities.yml b/test/fixtures/account/other_liabilities.ymlindex d7a33292..182a6978 100644--- a/test/fixtures/account/other_liabilities.yml+++ b/test/fixtures/account/other_liabilities.yml@@ -1,11 +1 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--# This model initially had no columns defined. If you add columns to the-# model remove the "{}" from the fixture names and add the columns immediately-# below each fixture, per the syntax in the comments below-#one: {}-# column: value-#-two: {}-# column: valuediff --git a/test/fixtures/account/properties.yml b/test/fixtures/account/properties.ymlindex d7a33292..182a6978 100644--- a/test/fixtures/account/properties.yml+++ b/test/fixtures/account/properties.yml@@ -1,11 +1 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--# This model initially had no columns defined. If you add columns to the-# model remove the "{}" from the fixture names and add the columns immediately-# below each fixture, per the syntax in the comments below-#one: {}-# column: value-#-two: {}-# column: valuediff --git a/test/fixtures/account/vehicles.yml b/test/fixtures/account/vehicles.ymlindex d7a33292..182a6978 100644--- a/test/fixtures/account/vehicles.yml+++ b/test/fixtures/account/vehicles.yml@@ -1,11 +1 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--# This model initially had no columns defined. If you add columns to the-# model remove the "{}" from the fixture names and add the columns immediately-# below each fixture, per the syntax in the comments below-#one: {}-# column: value-#-two: {}-# column: valuediff --git a/test/fixtures/account_balances.yml b/test/fixtures/account_balances.ymlindex bf597587..99798f29 100644--- a/test/fixtures/account_balances.yml+++ b/test/fixtures/account_balances.yml@@ -1,13 +1,13 @@# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html-one:- account: dylan_checking- date: 2024-02-12- balance: 9.99- currency: MyString+# one:+# account: generic+# date: 2024-02-12+# balance: 9.99+# currency: MyString-two:- account: richards_savings- date: 2024-02-12- balance: 9.99- currency: MyString+# two:+# account: generic+# date: 2024-02-13+# balance: 9.99+# currency: MyStringdiff --git a/test/fixtures/accounts.yml b/test/fixtures/accounts.ymlindex 8d181abb..d5208a43 100644--- a/test/fixtures/accounts.yml+++ b/test/fixtures/accounts.yml@@ -1,14 +1,23 @@-dylan_checking:+# No transactions, no valuations, just a generic account+generic:family: dylan_family- name: Bob's Checking- original_balance: 1200+ name: No history, generic account+ balance: 1200-dylan_roth:+# Account with only valuations+collectible:family: dylan_family- name: Bob's Roth IRA- original_balance: 1200+ name: Collectible Account+ balance: 500-richards_savings:- family: richards_family- name: Keef's HYSA- original_balance: 1500+# Account with only transactions+checking:+ family: dylan_family+ name: Checking Account+ balance: 5000++# Account with both transactions and valuations+savings_with_valuation_overrides:+ family: dylan_family+ name: Savings account with valuation overrides+ balance: 20000diff --git a/test/fixtures/exchange_rates.yml b/test/fixtures/exchange_rates.ymlindex e08ad7fb..75ffb6fb 100644--- a/test/fixtures/exchange_rates.yml+++ b/test/fixtures/exchange_rates.yml@@ -1,13 +1,13 @@# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html-one:- base_currency: one- converted_currency: one- rate: 9.99- date: 2024-02-09+# one:+# base_currency: one+# converted_currency: one+# rate: 9.99+# date: 2024-02-09-two:- base_currency: two- converted_currency: two- rate: 9.99- date: 2024-02-09+# two:+# base_currency: two+# converted_currency: two+# rate: 9.99+# date: 2024-02-09diff --git a/test/fixtures/families.yml b/test/fixtures/families.ymlindex a6b44dc7..002da9c0 100644--- a/test/fixtures/families.yml+++ b/test/fixtures/families.yml@@ -1,7 +1,2 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html-dylan_family:name: The Dylan Family--richards_family:- name: The Richards Familydiff --git a/test/fixtures/transactions.yml b/test/fixtures/transactions.ymlindex 35735abc..77a560f6 100644--- a/test/fixtures/transactions.yml+++ b/test/fixtures/transactions.yml@@ -1,15 +1,55 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html--one:- name: MyString- date: 2024-02-23- amount: 9.99- currency: MyString- account: dylan_checking--two:- name: MyString- date: 2024-02-20- amount: 9.99- currency: MyString- account: dylan_checking+# Checking account transactions+checking_one:+ name: Starbucks+ date: <%= 5.days.ago.to_date %>+ amount: 10+ account: checking++checking_two:+ name: Chipotle+ date: <%= 12.days.ago.to_date %>+ amount: 30+ account: checking++checking_three:+ name: Amazon+ date: <%= 15.days.ago.to_date %>+ amount: 20+ account: checking++checking_four:+ name: Paycheck+ date: <%= 22.days.ago.to_date %>+ amount: -1075+ account: checking++checking_five:+ name: Netflix+ date: <%= 30.days.ago.to_date %>+ amount: 15+ account: checking++# Savings account that has these transactions and valuation overrides+savings_one:+ name: Interest Received+ date: <%= 5.days.ago.to_date %>+ amount: -200+ account: savings_with_valuation_overrides++savings_two:+ name: Check Deposit+ date: <%= 12.days.ago.to_date %>+ amount: -50+ account: savings_with_valuation_overrides++savings_three:+ name: Withdrawal+ date: <%= 18.days.ago.to_date %>+ amount: 2000+ account: savings_with_valuation_overrides++savings_four:+ name: Check Deposit+ date: <%= 30.days.ago.to_date %>+ amount: -500+ account: savings_with_valuation_overridesdiff --git a/test/fixtures/users.yml b/test/fixtures/users.ymlindex a8cb3766..fa2bf2f8 100644--- a/test/fixtures/users.yml+++ b/test/fixtures/users.yml@@ -1,20 +1,13 @@-bob:+family_admin:family: dylan_familyfirst_name: Boblast_name: Dylanemail: [email protected]password_digest: <%= BCrypt::Password.create('password') %>-jakob:+family_member:family: dylan_familyfirst_name: Jakoblast_name: Dylanemail: [email protected]password_digest: <%= BCrypt::Password.create('password') %>--keith:- family: richards_family- first_name: Keith- last_name: Richards- email: [email protected]- password_digest: <%= BCrypt::Password.create('password') %>diff --git a/test/fixtures/valuations.yml b/test/fixtures/valuations.ymlindex 1568ef5b..9c519b0e 100644--- a/test/fixtures/valuations.yml+++ b/test/fixtures/valuations.yml@@ -1,11 +1,26 @@-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html+# For collectible account that only has valuations (no transactions)+collectible_one:+ value: 550+ date: <%= 4.days.ago.to_date %>+ account: collectible-one:- value: 9.99- date: 2024-02-15- account: dylan_checking+collectible_two:+ value: 700+ date: <%= 12.days.ago.to_date %>+ account: collectible-two:- value: 9.99- date: 2024-02-15- account: richards_savings+collectible_three:+ value: 400+ date: <%= 30.days.ago.to_date %>+ account: collectible++# For checking account that has valuations and transactions+savings_one:+ value: 20500+ date: <%= 3.days.ago.to_date %>+ account: savings_with_valuation_overrides++savings_two:+ value: 19500+ date: <%= 12.days.ago.to_date %>+ account: savings_with_valuation_overridesdiff --git a/test/models/account_test.rb b/test/models/account_test.rbindex b211b4da..5b0983c2 100644--- a/test/models/account_test.rb+++ b/test/models/account_test.rb@@ -2,8 +2,9 @@ require "test_helper"class AccountTest < ActiveSupport::TestCasedef setup- depository = Account::Depository.create!- @account = Account.create!(family: families(:dylan_family), name: "Explicit Checking", original_balance: 1200, accountable: depository)+ depository = account_depositories(:checking)+ @account = accounts(:checking)+ @account.accountable = depositoryendtest "new account should be valid" dodiff --git a/test/models/current_test.rb b/test/models/current_test.rbindex 7f4c3c38..6d12ac6c 100644--- a/test/models/current_test.rb+++ b/test/models/current_test.rb@@ -2,7 +2,7 @@ require "test_helper"class CurrentTest < ActiveSupport::TestCasetest "family returns user family" do- user = users(:bob)+ user = users(:family_admin)Current.user = userassert_equal user.family, Current.familyenddiff --git a/test/models/family_test.rb b/test/models/family_test.rbindex b9597731..d3e37007 100644--- a/test/models/family_test.rb+++ b/test/models/family_test.rb@@ -6,12 +6,12 @@ class FamilyTest < ActiveSupport::TestCaseendtest "should have many users" do- assert_equal 2, @dylan_family.users.size- assert @dylan_family.users.include?(users(:bob))+ assert @dylan_family.users.size > 0+ assert @dylan_family.users.include?(users(:family_admin))endtest "should have many accounts" do- assert_equal 2, @dylan_family.accounts.size+ assert @dylan_family.accounts.size > 0endtest "should destroy dependent users" dodiff --git a/test/models/transaction_test.rb b/test/models/transaction_test.rbindex dc48590c..9210a737 100644--- a/test/models/transaction_test.rb+++ b/test/models/transaction_test.rb@@ -1,7 +1,4 @@require "test_helper"class TransactionTest < ActiveSupport::TestCase- # test "the truth" do- # assert true- # endenddiff --git a/test/models/user_test.rb b/test/models/user_test.rbindex 135d7c79..348a9efe 100644--- a/test/models/user_test.rb+++ b/test/models/user_test.rb@@ -2,7 +2,7 @@ require "test_helper"class UserTest < ActiveSupport::TestCasedef setup- @user = users(:bob)+ @user = users(:family_admin)endtest "should be valid" dodiff --git a/test/models/valuation_test.rb b/test/models/valuation_test.rbindex 0b775e65..59ba8292 100644--- a/test/models/valuation_test.rb+++ b/test/models/valuation_test.rb@@ -1,7 +1,4 @@require "test_helper"class ValuationTest < ActiveSupport::TestCase- # test "the truth" do- # assert true- # endenddiff --git a/test/system/accounts_test.rb b/test/system/accounts_test.rbindex 9c4401fe..e45636c6 100644--- a/test/system/accounts_test.rb+++ b/test/system/accounts_test.rb@@ -2,7 +2,7 @@ require "application_system_test_case"class AccountsTest < ApplicationSystemTestCasesetup do- sign_in @user = users(:bob)+ sign_in @user = users(:family_admin)endtest "should create account" do