The personal finance app for everyone
Nested Categories (#1561)
Zach Gollwitzer77def1db4044
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rbindex ddc1ecaa..2d1882f4 100644--- a/app/controllers/categories_controller.rb+++ b/app/controllers/categories_controller.rb@@ -10,6 +10,7 @@ class CategoriesController < ApplicationControllerdef new@category = Current.family.categories.new color: Category::COLORS.sample+ @categories = Current.family.categories.alphabetically.where(parent_id: nil).where.not(id: @category.id)enddef create@@ -17,19 +18,21 @@ class CategoriesController < ApplicationControllerif @category.save@transaction.update(category_id: @category.id) if @transaction- redirect_back_or_to transactions_path, notice: t(".success")++ redirect_back_or_to categories_path, notice: t(".success")else- redirect_back_or_to transactions_path, alert: t(".failure", error: @category.errors.full_messages.to_sentence)+ render :new, status: :unprocessable_entityendenddef edit+ @categories = Current.family.categories.alphabetically.where(parent_id: nil).where.not(id: @category.id)enddef update@category.update! category_params- redirect_back_or_to transactions_path, notice: t(".success")+ redirect_back_or_to categories_path, notice: t(".success")enddef destroy@@ -38,6 +41,12 @@ class CategoriesController < ApplicationControllerredirect_back_or_to categories_path, notice: t(".success")end+ def bootstrap+ Current.family.categories.bootstrap_defaults++ redirect_back_or_to categories_path, notice: t(".success")+ end+privatedef set_category@category = Current.family.categories.find(params[:id])@@ -50,6 +59,6 @@ class CategoriesController < ApplicationControllerenddef category_params- params.require(:category).permit(:name, :color)+ params.require(:category).permit(:name, :color, :parent_id)endenddiff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rbindex 128b309c..0d8d6e92 100644--- a/app/controllers/registrations_controller.rb+++ b/app/controllers/registrations_controller.rb@@ -24,7 +24,6 @@ class RegistrationsController < ApplicationControllerif @user.save@invitation&.update!(accepted_at: Time.current)- Category.create_default_categories(@user.family) unless @invitation@session = create_session_for(@user)redirect_to root_path, notice: t(".success")elsediff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rbindex acceab79..664c3080 100644--- a/app/controllers/transactions_controller.rb+++ b/app/controllers/transactions_controller.rb@@ -3,13 +3,13 @@ class TransactionsController < ApplicationControllerdef index@q = search_params- result = Current.family.entries.account_transactions.search(@q).reverse_chronological- @pagy, @transaction_entries = pagy(result, limit: params[:per_page] || "50")+ search_query = Current.family.transactions.search(@q).includes(:entryable).reverse_chronological+ @pagy, @transaction_entries = pagy(search_query, limit: params[:per_page] || "50")@totals = {- count: result.select { |t| t.currency == Current.family.currency }.count,- income: result.income_total(Current.family.currency).abs,- expense: result.expense_total(Current.family.currency)+ count: search_query.select { |t| t.currency == Current.family.currency }.count,+ income: search_query.income_total(Current.family.currency).abs,+ expense: search_query.expense_total(Current.family.currency)}enddiff --git a/app/models/account/entry.rb b/app/models/account/entry.rbindex 4d7334fb..8d6a8f40 100644--- a/app/models/account/entry.rb+++ b/app/models/account/entry.rb@@ -60,6 +60,10 @@ class Account::Entry < ApplicationRecordendclass << self+ def search(params)+ Account::EntrySearch.new(params).build_query(all)+ end+# arbitrary cutoff date to avoid expensive sync operationsdef min_supported_date30.years.ago.to_date@@ -141,49 +145,7 @@ class Account::Entry < ApplicationRecordMoney.new(total, currency)end- def search(params)- query = all- query = query.where("account_entries.name ILIKE ?", "%#{sanitize_sql_like(params[:search])}%") if params[:search].present?- query = query.where("account_entries.date >= ?", params[:start_date]) if params[:start_date].present?- query = query.where("account_entries.date <= ?", params[:end_date]) if params[:end_date].present?-- if params[:types].present?- query = query.where(marked_as_transfer: false) unless params[:types].include?("transfer")-- if params[:types].include?("income") && !params[:types].include?("expense")- query = query.where("account_entries.amount < 0")- elsif params[:types].include?("expense") && !params[:types].include?("income")- query = query.where("account_entries.amount >= 0")- end- end-- if params[:amount].present? && params[:amount_operator].present?- case params[:amount_operator]- when "equal"- query = query.where("ABS(ABS(account_entries.amount) - ?) <= 0.01", params[:amount].to_f.abs)- when "less"- query = query.where("ABS(account_entries.amount) < ?", params[:amount].to_f.abs)- when "greater"- query = query.where("ABS(account_entries.amount) > ?", params[:amount].to_f.abs)- end- end-- if params[:accounts].present? || params[:account_ids].present?- query = query.joins(:account)- end-- query = query.where(accounts: { name: params[:accounts] }) if params[:accounts].present?- query = query.where(accounts: { id: params[:account_ids] }) if params[:account_ids].present?-- # Search attributes on each entryable to further refine results- entryable_ids = entryable_search(params)- query = query.where(entryable_id: entryable_ids) unless entryable_ids.nil?-- query- end-private-def entryable_search(params)entryable_ids = []entryable_search_performed = falsediff --git a/app/models/account/entry_search.rb b/app/models/account/entry_search.rbnew file mode 100644index 00000000..c561765b--- /dev/null+++ b/app/models/account/entry_search.rb@@ -0,0 +1,59 @@+class Account::EntrySearch+ include ActiveModel::Model+ include ActiveModel::Attributes++ attribute :search, :string+ attribute :amount, :string+ attribute :amount_operator, :string+ attribute :types, :string+ attribute :accounts, :string+ attribute :account_ids, :string+ attribute :start_date, :string+ attribute :end_date, :string++ class << self+ def from_entryable_search(entryable_search)+ new(entryable_search.attributes.slice(*attribute_names))+ end+ end++ def build_query(scope)+ query = scope++ query = query.where("account_entries.name ILIKE :search OR account_entries.enriched_name ILIKE :search",+ search: "%#{ActiveRecord::Base.sanitize_sql_like(search)}%"+ ) if search.present?+ query = query.where("account_entries.date >= ?", start_date) if start_date.present?+ query = query.where("account_entries.date <= ?", end_date) if end_date.present?++ if types.present?+ query = query.where(marked_as_transfer: false) unless types.include?("transfer")++ if types.include?("income") && !types.include?("expense")+ query = query.where("account_entries.amount < 0")+ elsif types.include?("expense") && !types.include?("income")+ query = query.where("account_entries.amount >= 0")+ end+ end++ if amount.present? && amount_operator.present?+ case amount_operator+ when "equal"+ query = query.where("ABS(ABS(account_entries.amount) - ?) <= 0.01", amount.to_f.abs)+ when "less"+ query = query.where("ABS(account_entries.amount) < ?", amount.to_f.abs)+ when "greater"+ query = query.where("ABS(account_entries.amount) > ?", amount.to_f.abs)+ end+ end++ if accounts.present? || account_ids.present?+ query = query.joins(:account)+ end++ query = query.where(accounts: { name: accounts }) if accounts.present?+ query = query.where(accounts: { id: account_ids }) if account_ids.present?++ query+ end+enddiff --git a/app/models/account/trade.rb b/app/models/account/trade.rbindex 70b0c8f3..7d4976ba 100644--- a/app/models/account/trade.rb+++ b/app/models/account/trade.rb@@ -8,26 +8,8 @@ class Account::Trade < ApplicationRecordvalidates :qty, presence: truevalidates :price, :currency, presence: true- class << self- def search(_params)- all- end-- def requires_search?(_params)- false- end- end-- def sell?- qty < 0- end-- def buy?- qty > 0- end-def unrealized_gain_loss- return nil if sell?+ return nil if qty.negative?current_price = security.current_pricereturn nil if current_price.nil?diff --git a/app/models/account/transaction.rb b/app/models/account/transaction.rbindex 6b8f4995..afe5a568 100644--- a/app/models/account/transaction.rb+++ b/app/models/account/transaction.rb@@ -12,52 +12,7 @@ class Account::Transaction < ApplicationRecordclass << selfdef search(params)- query = all- if params[:categories].present?- if params[:categories].exclude?("Uncategorized")- query = query- .joins(:category)- .where(categories: { name: params[:categories] })- else- query = query- .left_joins(:category)- .where(categories: { name: params[:categories] })- .or(query.where(category_id: nil))- end- end-- query = query.joins(:merchant).where(merchants: { name: params[:merchants] }) if params[:merchants].present?-- if params[:tags].present?- query = query.joins(:tags)- .where(tags: { name: params[:tags] })- .distinct- end-- query+ Account::TransactionSearch.new(params).build_query(all)end-- def requires_search?(params)- searchable_keys.any? { |key| params.key?(key) }- end-- private-- def searchable_keys- %i[categories merchants tags]- endend-- def eod_balance- entry.amount_money- end-- private- def account- entry.account- end-- def daily_transactions- account.entries.account_transactions- endenddiff --git a/app/models/account/transaction_search.rb b/app/models/account/transaction_search.rbnew file mode 100644index 00000000..f61fae69--- /dev/null+++ b/app/models/account/transaction_search.rb@@ -0,0 +1,42 @@+class Account::TransactionSearch+ include ActiveModel::Model+ include ActiveModel::Attributes++ attribute :search, :string+ attribute :amount, :string+ attribute :amount_operator, :string+ attribute :types, array: true+ attribute :accounts, array: true+ attribute :account_ids, array: true+ attribute :start_date, :string+ attribute :end_date, :string+ attribute :categories, array: true+ attribute :merchants, array: true+ attribute :tags, array: true++ # Returns array of Account::Entry objects to stay consistent with partials, which only deal with Account::Entry+ def build_query(scope)+ query = scope++ if categories.present?+ if categories.exclude?("Uncategorized")+ query = query+ .joins(:category)+ .where(categories: { name: categories })+ else+ query = query+ .left_joins(:category)+ .where(categories: { name: categories })+ .or(query.where(category_id: nil))+ end+ end++ query = query.joins(:merchant).where(merchants: { name: merchants }) if merchants.present?++ query = query.joins(:tags).where(tags: { name: tags }) if tags.present?++ entries_scope = Account::Entry.account_transactions.where(entryable_id: query.select(:id))++ Account::EntrySearch.from_entryable_search(self).build_query(entries_scope)+ end+enddiff --git a/app/models/account/valuation.rb b/app/models/account/valuation.rbindex 93ebf5ff..219ecd90 100644--- a/app/models/account/valuation.rb+++ b/app/models/account/valuation.rb@@ -1,13 +1,3 @@class Account::Valuation < ApplicationRecordinclude Account::Entryable-- class << self- def search(_params)- all- end-- def requires_search?(_params)- false- end- endenddiff --git a/app/models/category.rb b/app/models/category.rbindex 4a2d6361..6f50070b 100644--- a/app/models/category.rb+++ b/app/models/category.rb@@ -1,12 +1,16 @@class Category < ApplicationRecordhas_many :transactions, dependent: :nullify, class_name: "Account::Transaction"has_many :import_mappings, as: :mappable, dependent: :destroy, class_name: "Import::Mapping"+belongs_to :family+ has_many :subcategories, class_name: "Category", foreign_key: :parent_id+ belongs_to :parent, class_name: "Category", optional: true+validates :name, :color, :family, presence: truevalidates :name, uniqueness: { scope: :family_id }- before_update :clear_internal_category, if: :name_changed?+ validate :category_level_limitscope :alphabetically, -> { order(:name) }@@ -14,30 +18,55 @@ class Category < ApplicationRecordUNCATEGORIZED_COLOR = "#737373"- DEFAULT_CATEGORIES = [- { internal_category: "income", color: COLORS[0] },- { internal_category: "food_and_drink", color: COLORS[1] },- { internal_category: "entertainment", color: COLORS[2] },- { internal_category: "personal_care", color: COLORS[3] },- { internal_category: "general_services", color: COLORS[4] },- { internal_category: "auto_and_transport", color: COLORS[5] },- { internal_category: "rent_and_utilities", color: COLORS[6] },- { internal_category: "home_improvement", color: COLORS[7] }- ]-- def self.create_default_categories(family)- if family.categories.size > 0- raise ArgumentError, "Family already has some categories"+ class Group+ attr_reader :category, :subcategories++ delegate :name, :color, to: :category++ def self.for(categories)+ categories.select { |category| category.parent_id.nil? }.map do |category|+ new(category, category.subcategories)+ end+ end++ def initialize(category, subcategories = nil)+ @category = category+ @subcategories = subcategories || []+ end+ end++ class << self+ def bootstrap_defaults+ default_categories.each do |name, color|+ find_or_create_by!(name: name) do |category|+ category.color = color+ end+ endend- family_id = family.id- categories = self::DEFAULT_CATEGORIES.map { |c| {- name: I18n.t("transaction.default_category.#{c[:internal_category]}"),- internal_category: c[:internal_category],- color: c[:color],- family_id:- } }- self.insert_all(categories)+ private+ def default_categories+ [+ [ "Income", "#e99537" ],+ [ "Loan Payments", "#6471eb" ],+ [ "Bank Fees", "#db5a54" ],+ [ "Entertainment", "#df4e92" ],+ [ "Food & Drink", "#c44fe9" ],+ [ "Groceries", "#eb5429" ],+ [ "Dining Out", "#61c9ea" ],+ [ "General Merchandise", "#805dee" ],+ [ "Clothing & Accessories", "#6ad28a" ],+ [ "Electronics", "#e99537" ],+ [ "Healthcare", "#4da568" ],+ [ "Insurance", "#6471eb" ],+ [ "Utilities", "#db5a54" ],+ [ "Transportation", "#df4e92" ],+ [ "Gas & Fuel", "#c44fe9" ],+ [ "Education", "#eb5429" ],+ [ "Charitable Donations", "#61c9ea" ],+ [ "Subscriptions", "#805dee" ]+ ]+ endenddef replace_and_destroy!(replacement)@@ -47,9 +76,14 @@ class Category < ApplicationRecordendend- private+ def subcategory?+ parent.present?+ end- def clear_internal_category- self.internal_category = nil+ private+ def category_level_limit+ if subcategory? && parent.subcategory?+ errors.add(:parent, "can't have more than 2 levels of subcategories")+ endendenddiff --git a/app/models/demo/generator.rb b/app/models/demo/generator.rbindex 36e86200..d26b85c7 100644--- a/app/models/demo/generator.rb+++ b/app/models/demo/generator.rb@@ -90,6 +90,11 @@ class Demo::Generatorcategories.each do |category|family.categories.create!(name: category, color: COLORS.sample)end++ food = family.categories.find_by(name: "Food & Drink")+ family.categories.create!(name: "Restaurants", parent_category: food)+ family.categories.create!(name: "Groceries", parent_category: food)+ family.categories.create!(name: "Alcohol & Bars", parent_category: food)enddef create_merchants!diff --git a/app/views/account/trades/_header.html.erb b/app/views/account/trades/_header.html.erbindex 7ccadfa4..b89028af 100644--- a/app/views/account/trades/_header.html.erb+++ b/app/views/account/trades/_header.html.erb@@ -34,7 +34,7 @@<dd class="text-gray-900"><%= trade.security.ticker %></dd></div>- <% if trade.buy? %>+ <% if trade.qty.positive? %><div class="flex items-center justify-between text-sm"><dt class="text-gray-500"><%= t(".purchase_qty_label") %></dt><dd class="text-gray-900"><%= trade.qty.abs %></dd>@@ -53,7 +53,7 @@</div><% end %>- <% if trade.buy? && trade.unrealized_gain_loss.present? %>+ <% if trade.qty.positive? && trade.unrealized_gain_loss.present? %><div class="flex items-center justify-between text-sm"><dt class="text-gray-500"><%= t(".total_return_label") %></dt><dd style="color: <%= trade.unrealized_gain_loss.color %>;">diff --git a/app/views/categories/_badge.html.erb b/app/views/categories/_badge.html.erbindex a9752262..1b4c399b 100644--- a/app/views/categories/_badge.html.erb+++ b/app/views/categories/_badge.html.erb@@ -2,7 +2,7 @@<% category ||= null_category %><div>- <span class="flex items-center gap-1 text-sm font-medium rounded-full px-1.5 py-1 border"+ <span class="flex items-center gap-1 text-sm font-medium rounded-full px-1.5 py-1 border truncate"style="background-color: color-mix(in srgb, <%= category.color %> 5%, white);border-color: color-mix(in srgb, <%= category.color %> 30%, white);diff --git a/app/views/categories/_category.html.erb b/app/views/categories/_category.html.erbindex 97f19775..f74113a9 100644--- a/app/views/categories/_category.html.erb+++ b/app/views/categories/_category.html.erb@@ -1,7 +1,11 @@<%# locals: (category:) %>-<div id="<%= dom_id(category) %>" class="flex justify-between items-center p-4 bg-white">+<div id="<%= dom_id(category) %>" class="flex justify-between items-center px-4 pb-4 <%= "pt-4" unless category.subcategory? %> <%= "pb-4" unless category.subcategories.any? %> bg-white"><div class="flex w-full items-center gap-2.5">+ <% if category.subcategory? %>+ <%= lucide_icon "corner-down-right", class: "shrink-0 w-5 h-5 text-gray-400 ml-2" %>+ <% end %>+<%= render partial: "categories/badge", locals: { category: category } %></div><div class="justify-self-end">diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erbindex 313e48ba..2bca2191 100644--- a/app/views/categories/_form.html.erb+++ b/app/views/categories/_form.html.erb@@ -1,9 +1,12 @@+<%# locals: (category:, categories:) %>+<div data-controller="color-avatar"><%= styled_form_with model: category, class: "space-y-4", data: { turbo_frame: :_top } do |f| %><section class="space-y-4"><div class="w-fit m-auto"><%= render partial: "shared/color_avatar", locals: { name: category.name, color: category.color } %></div>+<div class="flex gap-2 items-center justify-center"><% Category::COLORS.each do |color| %><label class="relative">@@ -12,8 +15,14 @@</label><% end %></div>- <div class="relative flex items-center border border-gray-200 rounded-lg">- <%= f.text_field :name, placeholder: t(".placeholder"), required: true, autofocus: true, data: { color_avatar_target: "name" } %>++ <% if category.errors.any? %>+ <%= render "shared/form_errors", model: category %>+ <% end %>++ <div class="space-y-2">+ <%= f.text_field :name, placeholder: t(".placeholder"), required: true, autofocus: true, label: "Name", data: { color_avatar_target: "name" } %>+ <%= f.select :parent_id, categories.pluck(:name, :id), { include_blank: "(unassigned)", label: "Parent category (optional)" } %></div></section>diff --git a/app/views/categories/_menu.html.erb b/app/views/categories/_menu.html.erbindex 746bcb45..5a4627b3 100644--- a/app/views/categories/_menu.html.erb+++ b/app/views/categories/_menu.html.erb@@ -5,7 +5,7 @@<%= render partial: "categories/badge", locals: { category: transaction.category } %></button><div data-menu-target="content" class="absolute z-10 hidden w-screen mt-2 max-w-min cursor-default">- <div class="w-64 text-sm font-semibold leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">+ <div class="w-80 text-sm font-semibold leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5"><%= turbo_frame_tag "category_dropdown", src: category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id), loading: :lazy do %><div class="p-6 flex items-center justify-center"><p class="text-sm text-gray-500 animate-pulse"><%= t(".loading") %></p>diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erbindex 69c52c6d..e577bb5e 100644--- a/app/views/categories/edit.html.erb+++ b/app/views/categories/edit.html.erb@@ -1,3 +1,3 @@<%= modal_form_wrapper title: t(".edit") do %>- <%= render "form", category: @category %>+ <%= render "form", category: @category, categories: @categories %><% end %>diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erbindex 6e79fa13..c0cf8440 100644--- a/app/views/categories/index.html.erb+++ b/app/views/categories/index.html.erb@@ -23,18 +23,32 @@<div class="border border-alpha-black-25 rounded-md bg-white shadow-xs"><div class="overflow-hidden rounded-md">- <%= render partial: @categories, spacer_template: "categories/ruler" %>+ <% Category::Group.for(@categories).each_with_index do |group, idx| %>+ <%= render group.category %>++ <% group.subcategories.each do |subcategory| %>+ <%= render subcategory %>+ <% end %>++ <% unless idx == Category::Group.for(@categories).count - 1 %>+ <%= render "categories/ruler" %>+ <% end %>+ <% end %></div></div></div><% else %><div class="flex justify-center items-center py-20">- <div class="text-center flex flex-col items-center max-w-[300px]">- <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>- <%= link_to new_category_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>- <%= lucide_icon("plus", class: "w-5 h-5") %>- <span><%= t(".new") %></span>- <% end %>+ <div class="text-center flex flex-col items-center max-w-[500px]">+ <p class="text-sm text-gray-500 mb-4"><%= t(".empty") %></p>+ <div class="flex items-center gap-2">+ <%= button_to t(".bootstrap"), bootstrap_categories_path, class: "btn btn--primary" %>++ <%= link_to new_category_path, class: "btn btn--outline flex items-center gap-1", data: { turbo_frame: "modal" } do %>+ <%= lucide_icon("plus", class: "w-5 h-5") %>+ <span><%= t(".new") %></span>+ <% end %>+ </div></div></div><% end %>diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erbindex de8e68d3..2d100b49 100644--- a/app/views/categories/new.html.erb+++ b/app/views/categories/new.html.erb@@ -1,3 +1,3 @@<%= modal_form_wrapper title: t(".new_category") do %>- <%= render "form", category: @category %>+ <%= render "form", category: @category, categories: @categories %><% end %>diff --git a/app/views/category/dropdowns/_row.html.erb b/app/views/category/dropdowns/_row.html.erbindex 47865fb7..45879b7c 100644--- a/app/views/category/dropdowns/_row.html.erb+++ b/app/views/category/dropdowns/_row.html.erb@@ -15,6 +15,9 @@<span class="w-5 h-5"><%= lucide_icon("check", class: "w-5 h-5 text-gray-500") if is_selected %></span>+ <% if category.subcategory? %>+ <%= lucide_icon "corner-down-right", class: "shrink-0 w-5 h-5 text-gray-400" %>+ <% end %><%= render partial: "categories/badge", locals: { category: category } %><% end %>diff --git a/app/views/category/dropdowns/show.html.erb b/app/views/category/dropdowns/show.html.erbindex 4f3baa63..082cd836 100644--- a/app/views/category/dropdowns/show.html.erb+++ b/app/views/category/dropdowns/show.html.erb@@ -10,8 +10,21 @@<div class="pb-2 pl-4 mr-2 text-gray-500 hidden" data-list-filter-target="emptyMessage"><%= t(".no_categories") %></div>- <% @categories.each do |category| %>- <%= render partial: "category/dropdowns/row", locals: { category: } %>+ <% if @categories.any? %>+ <% Category::Group.for(@categories).each do |group| %>+ <%= render "category/dropdowns/row", category: group.category %>++ <% group.subcategories.each do |category| %>+ <%= render "category/dropdowns/row", category: category %>+ <% end %>+ <% end %>+ <% else %>+ <div class="flex justify-center items-center py-12">+ <div class="text-center flex flex-col items-center max-w-[500px]">+ <p class="text-sm text-gray-500 font-normal mb-4"><%= t(".empty") %></p>+ <%= button_to t(".bootstrap"), bootstrap_categories_path, class: "btn btn--outline", data: { turbo_frame: :_top } %>+ </div>+ </div><% end %></div><hr>diff --git a/config/locales/models/transaction/en.yml b/config/locales/models/transaction/en.ymldeleted file mode 100644index 8e71e17b..00000000--- a/config/locales/models/transaction/en.yml+++ /dev/null@@ -1,12 +0,0 @@-----en:- transaction:- default_category:- auto_and_transport: Auto & Transport- entertainment: Entertainment- food_and_drink: Food & Drink- general_services: General Services- home_improvement: Home Improvement- income: Income- personal_care: Personal Care- rent_and_utilities: Rent & Utilitiesdiff --git a/config/locales/views/categories/en.yml b/config/locales/views/categories/en.ymlindex 6dd57a4c..7951e328 100644--- a/config/locales/views/categories/en.yml+++ b/config/locales/views/categories/en.yml@@ -1,12 +1,16 @@---en:+ category:+ dropdowns:+ show:+ empty: No categories found+ bootstrap: Generate default categoriescategories:category:delete: Delete categoryedit: Edit categorycreate:- failure: 'Failed to create category: %{error}'- success: New transaction category created successfully+ success: Category created successfullydestroy:success: Category deleted successfullyedit:@@ -17,9 +21,12 @@ en:categories: Categoriesempty: No categories foundnew: New category+ bootstrap: Use default categories+ bootstrap:+ success: Default categories created successfullymenu:loading: Loading...new:new_category: New categoryupdate:- success: Transaction category updated successfully+ success: Category updated successfullydiff --git a/config/routes.rb b/config/routes.rbindex de480f35..73673ced 100644--- a/config/routes.rb+++ b/config/routes.rb@@ -40,6 +40,8 @@ Rails.application.routes.draw doresources :categories doresources :deletions, only: %i[new create], module: :category++ post :bootstrap, on: :collectionendresources :merchants, only: %i[index new create edit update destroy]diff --git a/db/migrate/20241219174803_add_parent_category.rb b/db/migrate/20241219174803_add_parent_category.rbnew file mode 100644index 00000000..85457d08--- /dev/null+++ b/db/migrate/20241219174803_add_parent_category.rb@@ -0,0 +1,6 @@+class AddParentCategory < ActiveRecord::Migration[7.2]+ def change+ add_column :categories, :parent_id, :uuid+ remove_column :categories, :internal_category, :string+ end+enddiff --git a/db/schema.rb b/db/schema.rbindex 7beb5097..70d0357b 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_12_18_132503) do+ActiveRecord::Schema[7.2].define(version: 2024_12_19_174803) do# These are extensions that must be enabled in order to support this databaseenable_extension "pgcrypto"enable_extension "plpgsql"@@ -110,7 +110,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_18_132503) dot.decimal "balance", precision: 19, scale: 4t.string "currency"t.boolean "is_active", default: true, null: false- t.virtual "classification", type: :string, as: "\nCASE\n WHEN ((accountable_type)::text = ANY (ARRAY[('Loan'::character varying)::text, ('CreditCard'::character varying)::text, ('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['Loan'::character varying, 'CreditCard'::character varying, 'OtherLiability'::character varying])::text[])) THEN 'liability'::text\n ELSE 'asset'::text\nEND", stored: truet.uuid "import_id"t.uuid "plaid_account_id"t.boolean "scheduled_for_deletion", default: false@@ -171,10 +171,10 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_18_132503) docreate_table "categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|t.string "name", null: falset.string "color", default: "#6172F3", null: false- t.string "internal_category"t.uuid "family_id", null: falset.datetime "created_at", null: falset.datetime "updated_at", null: false+ t.uuid "parent_id"t.index ["family_id"], name: "index_categories_on_family_id"enddiff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rbindex cc71a340..3809d38f 100644--- a/test/controllers/categories_controller_test.rb+++ b/test/controllers/categories_controller_test.rb@@ -28,7 +28,7 @@ class CategoriesControllerTest < ActionDispatch::IntegrationTestnew_category = Category.order(:created_at).last- assert_redirected_to transactions_url+ assert_redirected_to categories_urlassert_equal "New Category", new_category.nameassert_equal color, new_category.colorend@@ -46,7 +46,7 @@ class CategoriesControllerTest < ActionDispatch::IntegrationTestnew_category = Category.order(:created_at).last- assert_redirected_to transactions_url+ assert_redirected_to categories_urlassert_equal "New Category", new_category.nameassert_equal color, new_category.colorassert_equal @transaction.reload.category, new_category@@ -69,6 +69,14 @@ class CategoriesControllerTest < ActionDispatch::IntegrationTestendend- assert_redirected_to transactions_url+ assert_redirected_to categories_url+ end++ test "bootstrap" do+ assert_difference "Category.count", 16 do+ post bootstrap_categories_url+ end++ assert_redirected_to categories_urlendenddiff --git a/test/controllers/registrations_controller_test.rb b/test/controllers/registrations_controller_test.rbindex 1c3169f6..273e89ae 100644--- a/test/controllers/registrations_controller_test.rb+++ b/test/controllers/registrations_controller_test.rb@@ -15,15 +15,6 @@ class RegistrationsControllerTest < ActionDispatch::IntegrationTestassert_redirected_to root_urlend- test "create seeds default transaction categories" do- assert_difference "Category.count", Category::DEFAULT_CATEGORIES.size do- post registration_url, params: { user: {- email: "[email protected]",- password: "password",- password_confirmation: "password" } }- end- end-test "create when hosted requires an invite code" dowith_env_overrides REQUIRE_INVITE_CODE: "true" doassert_no_difference "User.count" dodiff --git a/test/fixtures/categories.yml b/test/fixtures/categories.ymlindex 1c32bf80..958e450e 100644--- a/test/fixtures/categories.yml+++ b/test/fixtures/categories.yml@@ -4,11 +4,14 @@ one:income:name: Income- internal_category: incomecolor: "#fd7f6f"family: dylan_familyfood_and_drink:name: Food & Drink- internal_category: food_and_drink+ family: dylan_family++subcategory:+ name: Restaurants+ parent: food_and_drinkfamily: dylan_familydiff --git a/test/models/account/entry_test.rb b/test/models/account/entry_test.rbindex 5a9d9ec9..6d22179c 100644--- a/test/models/account/entry_test.rb+++ b/test/models/account/entry_test.rb@@ -63,10 +63,6 @@ class Account::EntryTest < ActiveSupport::TestCaseassert_equal 2, family.entries.search(params).size- params = params.merge(categories: [ category.name ], merchants: [ merchant.name ]) # transaction specific search param-- assert_equal 1, family.entries.search(params).size-params = { search: "%" }assert_equal 0, family.entries.search(params).sizeenddiff --git a/test/models/category_test.rb b/test/models/category_test.rbindex b7e60b20..0f29843d 100644--- a/test/models/category_test.rb+++ b/test/models/category_test.rb@@ -5,34 +5,6 @@ class CategoryTest < ActiveSupport::TestCase@family = families(:dylan_family)end- test "create_default_categories should generate categories if none exist" do- @family.accounts.destroy_all- @family.categories.destroy_all- assert_difference "Category.count", Category::DEFAULT_CATEGORIES.size do- Category.create_default_categories(@family)- end- end-- test "create_default_categories should raise when there are existing categories" do- assert_raises(ArgumentError) do- Category.create_default_categories(@family)- end- end-- test "updating name should clear the internal_category field" do- category = categories(:income)- assert_changes "category.reload.internal_category", to: nil do- category.update_attribute(:name, "new name")- end- end-- test "updating other field than name should not clear the internal_category field" do- category = Category.take- assert_no_changes "category.reload.internal_category" do- category.update_attribute(:color, "#000")- end- end-test "replacing and destroying" dotransactions = categories(:food_and_drink).transactions.to_a@@ -48,4 +20,14 @@ class CategoryTest < ActiveSupport::TestCaseassert_nil transactions.map { |t| t.reload.category }.uniq.firstend++ test "subcategory can only be one level deep" do+ category = categories(:subcategory)++ error = assert_raises(ActiveRecord::RecordInvalid) do+ category.subcategories.create!(name: "Invalid category", color: "#000", family: @family)+ end++ assert_equal "Validation failed: Parent can't have more than 2 levels of subcategories", error.message+ endend