Move categories to top-level namespace (#894)

app/controllers/categories/deletions_controller.rb

@@ -1,4 +1,4 @@
-class Transactions::Categories::DeletionsController < ApplicationController
+class Categories::DeletionsController < ApplicationController
   layout "with_sidebar"
 
   before_action :set_category
@@ -15,12 +15,12 @@ class Transactions::Categories::DeletionsController < ApplicationController
 
   private
     def set_category
-      @category = Current.family.transaction_categories.find(params[:category_id])
+      @category = Current.family.categories.find(params[:category_id])
     end
 
     def set_replacement_category
       if params[:replacement_category_id].present?
-        @replacement_category = Current.family.transaction_categories.find(params[:replacement_category_id])
+        @replacement_category = Current.family.categories.find(params[:replacement_category_id])
       end
     end
 end

app/controllers/categories/dropdowns_controller.rb

@@ -1,4 +1,4 @@
-class Transactions::Categories::DropdownsController < ApplicationController
+class Categories::DropdownsController < ApplicationController
   before_action :set_from_params
 
   def show
@@ -17,6 +17,6 @@ class Transactions::Categories::DropdownsController < ApplicationController
   end
 
   def categories_scope
-    Current.family.transaction_categories.alphabetically
+    Current.family.categories.alphabetically
   end
 end

app/controllers/categories_controller.rb

@@ -1,20 +1,20 @@
-class Transactions::CategoriesController < ApplicationController
+class CategoriesController < ApplicationController
   layout "with_sidebar"
 
   before_action :set_category, only: %i[ edit update ]
   before_action :set_transaction, only: :create
 
   def index
-    @categories = Current.family.transaction_categories.alphabetically
+    @categories = Current.family.categories.alphabetically
   end
 
   def new
-    @category = Current.family.transaction_categories.new color: Transaction::Category::COLORS.sample
+    @category = Current.family.categories.new color: Category::COLORS.sample
   end
 
   def create
-    Transaction::Category.transaction do
-      category = Current.family.transaction_categories.create!(category_params)
+    Category.transaction do
+      category = Current.family.categories.create!(category_params)
       @transaction.update!(category_id: category.id) if @transaction
     end
 
@@ -32,7 +32,7 @@ class Transactions::CategoriesController < ApplicationController
 
   private
     def set_category
-      @category = Current.family.transaction_categories.find(params[:id])
+      @category = Current.family.categories.find(params[:id])
     end
 
     def set_transaction
@@ -42,6 +42,6 @@ class Transactions::CategoriesController < ApplicationController
     end
 
     def category_params
-      params.require(:transaction_category).permit(:name, :color)
+      params.require(:category).permit(:name, :color)
     end
 end

app/controllers/registrations_controller.rb

@@ -16,7 +16,7 @@ class RegistrationsController < ApplicationController
     @user.role = :admin
 
     if @user.save
-      Transaction::Category.create_default_categories(@user.family)
+      Category.create_default_categories(@user.family)
       login @user
       flash[:notice] = t(".success")
       redirect_to root_path

app/helpers/categories_helper.rb

@@ -0,0 +1,7 @@
+module CategoriesHelper
+  def null_category
+    Category.new \
+      name: "Uncategorized",
+      color: Category::UNCATEGORIZED_COLOR
+  end
+end

app/helpers/transactions/categories_helper.rb

@@ -1,7 +0,0 @@
-module Transactions::CategoriesHelper
-  def null_category
-    Transaction::Category.new \
-      name: "Uncategorized",
-      color: Transaction::Category::UNCATEGORIZED_COLOR
-  end
-end

app/models/category.rb

@@ -1,4 +1,4 @@
-class Transaction::Category < ApplicationRecord
+class Category < ApplicationRecord
   has_many :transactions, dependent: :nullify
   belongs_to :family
 
@@ -24,7 +24,7 @@ class Transaction::Category < ApplicationRecord
   ]
 
   def self.create_default_categories(family)
-    if family.transaction_categories.size > 0
+    if family.categories.size > 0
       raise ArgumentError, "Family already has some categories"
     end
 

app/models/family.rb

@@ -5,7 +5,7 @@ class Family < ApplicationRecord
   has_many :institutions, dependent: :destroy
   has_many :transactions, through: :accounts
   has_many :imports, through: :accounts
-  has_many :transaction_categories, dependent: :destroy, class_name: "Transaction::Category"
+  has_many :categories, dependent: :destroy
   has_many :transaction_merchants, dependent: :destroy, class_name: "Transaction::Merchant"
 
   def snapshot(period = Period.all)

app/models/import.rb

@@ -124,7 +124,7 @@ class Import < ApplicationRecord
           tags << tag_cache[tag_string] ||= account.family.tags.find_or_initialize_by(name: tag_string)
         end
 
-        category = category_cache[category_name] ||= account.family.transaction_categories.find_or_initialize_by(name: category_name) if category_name.present?
+        category = category_cache[category_name] ||= account.family.categories.find_or_initialize_by(name: category_name) if category_name.present?
 
         txn = account.transactions.build \
           name: row["name"].presence || FALLBACK_TRANSACTION_NAME,

app/models/transaction.rb

@@ -18,7 +18,7 @@ class Transaction < ApplicationRecord
   scope :inflows, -> { where("amount <= 0") }
   scope :outflows, -> { where("amount > 0") }
   scope :by_name, ->(name) { where("transactions.name ILIKE ?", "%#{name}%") }
-  scope :with_categories, ->(categories) { joins(:category).where(transaction_categories: { name: categories }) }
+  scope :with_categories, ->(categories) { joins(:category).where(categories: { name: categories }) }
   scope :with_accounts, ->(accounts) { joins(:account).where(accounts: { name: accounts }) }
   scope :with_account_ids, ->(account_ids) { joins(:account).where(accounts: { id: account_ids }) }
   scope :with_merchants, ->(merchants) { joins(:merchant).where(transaction_merchants: { name: merchants }) }

app/views/accounts/transactions/_transaction.html.erb

@@ -10,7 +10,7 @@
         <p>Transfer</p>
       </div>
     <% else %>
-      <%= render "transactions/categories/badge", category: transaction.category %>
+      <%= render "categories/badge", category: transaction.category %>
     <% end %>
   </div>
 

app/views/categories/_form.html.erb

@@ -14,7 +14,7 @@
       <%= form.hidden_field :color, data: { color_select_target: "input" } %>
 
       <ul role="radiogroup" class="flex justify-between items-center py-2">
-        <% Transaction::Category::COLORS.each do |color| %>
+        <% Category::COLORS.each do |color| %>
           <li tabindex="0"
               role="radio"
               data-action="click->color-select#select keydown.enter->color-select#select keydown.space->color-select#select"

app/views/categories/_menu.html.erb

@@ -1,11 +1,11 @@
 <%# locals: (transaction:) %>
 <div class="relative" data-controller="menu">
   <button data-menu-target="button" class="flex cursor-pointer">
-    <%= render partial: "transactions/categories/badge", locals: { category: transaction.category } %>
+    <%= 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">
-      <%= turbo_frame_tag "category_dropdown", src: transaction_category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id), loading: :lazy do %>
+      <%= 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>
         </div>

app/views/categories/_row.html.erb

@@ -1,9 +1,9 @@
 <div class="flex justify-between mx-4 py-5 border-b last:border-b-0 border-alpha-black-50">
-  <%= render partial: "transactions/categories/badge", locals: { category: row } %>
+  <%= render partial: "categories/badge", locals: { category: row } %>
 
   <%= contextual_menu do %>
     <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-      <%= link_to edit_transaction_category_path(row),
+      <%= link_to edit_category_path(row),
             class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",
             data: { turbo_frame: :modal } do %>
         <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
@@ -11,7 +11,7 @@
         <span><%= t(".edit") %></span>
       <% end %>
 
-      <%= link_to new_transaction_category_deletion_path(row),
+      <%= link_to new_category_deletion_path(row),
             class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
             data: { turbo_frame: :modal } do %>
         <%= lucide_icon "trash-2", class: "w-5 h-5" %>

app/views/categories/deletions/new.html.erb

@@ -11,7 +11,7 @@
       </p>
     </div>
 
-    <%= form_with url: transaction_category_deletions_path(@category),
+    <%= form_with url: category_deletions_path(@category),
           data: {
             turbo: false,
             controller: "deletion",
@@ -20,7 +20,7 @@
             deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", category_name: @category.name),
             deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", category_name: @category.name) } do |f| %>
       <%= f.collection_select :replacement_category_id,
-            Current.family.transaction_categories.alphabetically.without(@category),
+                              Current.family.categories.alphabetically.without(@category),
             :id, :name,
             { prompt: t(".replacement_category_prompt"), label: t(".category") },
                               { data: { deletion_target: "replacementField", action: "deletion#updateSubmitButton" } } %>

app/views/categories/dropdowns/_row.html.erb

@@ -6,12 +6,12 @@
     <span class="w-5 h-5">
       <%= lucide_icon("check", class: "w-5 h-5 text-gray-500") if is_selected %>
     </span>
-    <%= render partial: "transactions/categories/badge", locals: { category: category } %>
+    <%= render partial: "categories/badge", locals: { category: category } %>
   <% end %>
 
   <%= contextual_menu do %>
     <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-      <%= link_to edit_transaction_category_path(category),
+      <%= link_to edit_category_path(category),
             class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",
             data: { turbo_frame: :modal } do %>
         <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
@@ -19,7 +19,7 @@
         <span><%= t(".edit") %></span>
       <% end %>
 
-      <%= link_to new_transaction_category_deletion_path(category),
+      <%= link_to new_category_deletion_path(category),
             class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
             data: { turbo_frame: :modal } do %>
         <%= lucide_icon "trash-2", class: "w-5 h-5" %>

app/views/categories/dropdowns/show.html.erb

@@ -11,12 +11,12 @@
         <%= t(".no_categories") %>
       </div>
       <% @categories.each do |category| %>
-        <%= render partial: "transactions/categories/dropdowns/row", locals: { category: } %>
+        <%= render partial: "categories/dropdowns/row", locals: { category: } %>
       <% end %>
     </div>
     <hr>
     <div class="relative p-1.5 w-full">
-      <%= link_to new_transaction_category_path(transaction_id: @transaction),
+      <%= link_to new_category_path(transaction_id: @transaction),
                   class: "flex text-sm font-medium items-center gap-2 text-gray-500 w-full rounded-lg p-2 hover:bg-gray-100",
                   data: { turbo_frame: "modal" } do %>
         <%= lucide_icon "plus", class: "w-5 h-5" %>

app/views/categories/index.html.erb

@@ -5,7 +5,7 @@
   <header class="flex items-center justify-between">
     <h1 class="text-gray-900 text-xl font-medium"><%= t(".categories") %></h1>
 
-    <%= link_to new_transaction_category_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>
+    <%= link_to new_category_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>
       <%= lucide_icon "plus", class: "w-5 h-5" %>
       <p><%= t(".new") %></p>
     <% end %>
@@ -16,7 +16,7 @@
       <h2 class="uppercase px-4 py-2 text-gray-500 text-xs"><%= t(".categories") %> · <%= @categories.size %></h2>
 
       <div class="border border-alpha-gray-100 rounded-lg bg-white shadow-xs">
-        <%= render collection: @categories, partial: "transactions/categories/row" %>
+        <%= render collection: @categories, partial: "categories/row" %>
       </div>
     </div>
   </div>

app/views/imports/transactions/_transaction.html.erb

@@ -5,7 +5,7 @@
   </div>
 
   <div class="col-span-2">
-    <%= render partial: "transactions/categories/badge", locals: { category: transaction.category } %>
+    <%= render partial: "categories/badge", locals: { category: transaction.category } %>
   </div>
 
   <div class="col-span-2 flex items-center gap-1">

app/views/settings/_nav.html.erb

@@ -50,7 +50,7 @@
       <%= sidebar_link_to t(".tags_label"), tags_path, icon: "tags" %>
     </li>
     <li>
-      <%= sidebar_link_to t(".categories_label"), transaction_categories_path, icon: "tags" %>
+      <%= sidebar_link_to t(".categories_label"), categories_path, icon: "tags" %>
     </li>
     <li>
       <%= sidebar_link_to t(".merchants_label"), transaction_merchants_path, icon: "store" %>

app/views/tags/index.html.erb

@@ -44,6 +44,6 @@
 
   <footer class="flex justify-between gap-4">
     <%= previous_setting("Accounts", accounts_path) %>
-    <%= next_setting("Categories", transaction_categories_path) %>
+    <%= next_setting("Categories", categories_path) %>
   </footer>
 </section>

app/views/transactions/_form.html.erb

@@ -14,7 +14,7 @@
     <%= f.text_field :name, label: t(".description"), placeholder: t(".description_placeholder"), required: true %>
     <%= f.collection_select :account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") }, required: true %>
     <%= f.money_field :amount_money, label: t(".amount"), required: true %>
-    <%= f.collection_select :category_id, Current.family.transaction_categories.alphabetically, :id, :name, { prompt: t(".category_prompt"), label: t(".category") } %>
+    <%= f.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_prompt"), label: t(".category") } %>
     <%= f.date_field :date, label: t(".date"), required: true, max: Date.today %>
   </section>
 

app/views/transactions/_header.html.erb

@@ -4,7 +4,7 @@
     <div class="flex items-center gap-2">
       <%= contextual_menu do %>
         <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-          <%= link_to transaction_categories_path,
+          <%= link_to categories_path,
                       class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg font-normal" do %>
             <%= lucide_icon "tags", class: "w-5 h-5 text-gray-500" %>
             <span class="text-black"><%= t(".edit_categories") %></span>

app/views/transactions/_transaction.html.erb

@@ -28,7 +28,7 @@
 
   <% unless unconfirmed_transfer?(transaction) %>
     <div class="col-span-3">
-      <%= render "transactions/categories/menu", transaction: transaction %>
+      <%= render "categories/menu", transaction: transaction %>
     </div>
 
     <%= link_to transaction.account.name,

app/views/transactions/bulk_edit.html.erb

@@ -28,7 +28,7 @@
 
                   <div class="pb-6 space-y-2">
                     <%= form.date_field :date, label: t(".date_label"), max: Date.current %>
-                    <%= form.collection_select :category_id, Current.family.transaction_categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" } %>
+                    <%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" } %>
                     <%= form.collection_select :merchant_id, Current.family.transaction_merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" } %>
                   </div>
                 </details>

app/views/transactions/merchants/index.html.erb

@@ -32,7 +32,7 @@
     <% end %>
   </div>
   <div class="flex justify-between gap-4">
-    <%= previous_setting("Categories", transaction_categories_path) %>
+    <%= previous_setting("Categories", categories_path) %>
     <%= next_setting("Rules", transaction_rules_path) %>
   </div>
 </div>

app/views/transactions/searches/filters/_category_filter.html.erb

@@ -5,18 +5,18 @@
     <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
   </div>
   <div class="my-2" id="list" data-list-filter-target="list">
-    <% Current.family.transaction_categories.alphabetically.each do |transaction_category| %>
-      <div class="filterable-item flex items-center gap-2 p-2" data-filter-name="<%= transaction_category.name %>">
+    <% Current.family.categories.alphabetically.each do |category| %>
+      <div class="filterable-item flex items-center gap-2 p-2" data-filter-name="<%= category.name %>">
         <%= form.check_box :categories,
                            {
                              multiple: true,
-                             checked: @q[:categories]&.include?(transaction_category.name),
+                             checked: @q[:categories]&.include?(category.name),
                              class: "rounded-sm border-gray-300 text-indigo-600 shadow-xs focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
                            },
-                           transaction_category.name,
+                           category.name,
                            nil %>
-        <%= form.label :categories, transaction_category.name, value: transaction_category.name, class: "text-sm text-gray-900 cursor-pointer" do %>
-          <%= render partial: "transactions/categories/badge", locals: { category: transaction_category } %>
+        <%= form.label :categories, category.name, value: category.name, class: "text-sm text-gray-900 cursor-pointer" do %>
+          <%= render partial: "categories/badge", locals: { category: category } %>
         <% end %>
       </div>
     <% end %>

app/views/transactions/show.html.erb

@@ -29,7 +29,7 @@
               <%= f.date_field :date, label: t(".date_label"), max: Date.today, "data-auto-submit-form-target": "auto" %>
 
               <% unless @transaction.marked_as_transfer %>
-                <%= f.collection_select :category_id, Current.family.transaction_categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %>
+                <%= f.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %>
                 <%= f.collection_select :merchant_id, Current.family.transaction_merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %>
               <% end %>
 

config/locales/views/categories/en.yml

@@ -0,0 +1,43 @@
+---
+en:
+  categories:
+    create:
+      success: New transaction category created successfully
+    deletions:
+      create:
+        success: Transaction category deleted successfully
+      new:
+        category: Category
+        delete_and_leave_uncategorized: Delete "%{category_name}" and leave uncategorized
+        delete_and_recategorize: Delete "%{category_name}" and assign new category
+        delete_category: Delete category?
+        explanation: By deleting this category, every transaction that has the "%{category_name}"
+          category will be uncategorized. Instead of leaving them uncategorized, you
+          can also assign a new category below.
+        replacement_category_prompt: Select category
+    dropdowns:
+      row:
+        delete: Delete category
+        edit: Edit category
+      show:
+        add_new: Add new
+        clear: Clear
+        no_categories: No categories found
+        search_placeholder: Search
+    edit:
+      edit: Edit category
+    form:
+      create: Create category
+      update: Update
+    index:
+      categories: Categories
+      new: New
+    menu:
+      loading: Loading...
+    new:
+      new_category: New category
+    row:
+      delete: Delete category
+      edit: Edit category
+    update:
+      success: Transaction category updated successfully

config/locales/views/transactions/en.yml

@@ -22,47 +22,6 @@ en:
     bulk_update:
       failure: Could not update transactions
       success: "%{count} transactions updated"
-    categories:
-      create:
-        success: New transaction category created successfully
-      deletions:
-        create:
-          success: Transaction category deleted successfully
-        new:
-          category: Category
-          delete_and_leave_uncategorized: Delete "%{category_name}" and leave uncategorized
-          delete_and_recategorize: Delete "%{category_name}" and assign new category
-          delete_category: Delete category?
-          explanation: By deleting this category, every transaction that has the "%{category_name}"
-            category will be uncategorized. Instead of leaving them uncategorized,
-            you can also assign a new category below.
-          replacement_category_prompt: Select category
-      dropdowns:
-        row:
-          delete: Delete category
-          edit: Edit category
-        show:
-          add_new: Add new
-          clear: Clear
-          no_categories: No categories found
-          search_placeholder: Search
-      edit:
-        edit: Edit category
-      form:
-        create: Create category
-        update: Update
-      index:
-        categories: Categories
-        new: New
-      menu:
-        loading: Loading...
-      new:
-        new_category: New category
-      row:
-        delete: Delete category
-        edit: Edit category
-      update:
-        success: Transaction category updated successfully
     create:
       success: New transaction created successfully
     destroy:

config/routes.rb

@@ -41,6 +41,13 @@ Rails.application.routes.draw do
     resources :deletions, only: %i[ new create ], module: :tags
   end
 
+  resources :categories do
+    resources :deletions, only: %i[ new create ], module: :categories
+    collection do
+      resource :dropdown, only: :show, module: :categories, as: :category_dropdown
+    end
+  end
+
   resources :transactions do
     collection do
       post "bulk_delete"
@@ -51,14 +58,6 @@ Rails.application.routes.draw do
 
       scope module: :transactions, as: :transaction do
         resources :rows, only: %i[ show update ]
-
-        resources :categories do
-          resources :deletions, only: %i[ new create ], module: :categories
-          collection do
-            resource :dropdown, only: :show, module: :categories, as: :category_dropdown
-          end
-        end
-
         resources :rules, only: %i[ index ]
         resources :merchants, only: %i[ index new create edit update destroy ]
       end

db/migrate/20240620114307_rename_categories_table.rb

@@ -0,0 +1,5 @@
+class RenameCategoriesTable < ActiveRecord::Migration[7.2]
+  def change
+    rename_table :transaction_categories, :categories
+  end
+end

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_06_19_125949) do
+ActiveRecord::Schema[7.2].define(version: 2024_06_20_114307) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -48,7 +48,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_06_19_125949) do
     t.jsonb "sync_errors", default: [], null: false
     t.date "last_sync_date"
     t.uuid "institution_id"
-    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: true
+    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.index ["accountable_type"], name: "index_accounts_on_accountable_type"
     t.index ["family_id"], name: "index_accounts_on_family_id"
     t.index ["institution_id"], name: "index_accounts_on_institution_id"
@@ -82,6 +82,16 @@ ActiveRecord::Schema[7.2].define(version: 2024_06_19_125949) do
     t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
   end
 
+  create_table "categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "name", null: false
+    t.string "color", default: "#6172F3", null: false
+    t.string "internal_category"
+    t.uuid "family_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id"], name: "index_categories_on_family_id"
+  end
+
   create_table "credit_cards", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -274,16 +284,6 @@ ActiveRecord::Schema[7.2].define(version: 2024_06_19_125949) do
     t.index ["family_id"], name: "index_tags_on_family_id"
   end
 
-  create_table "transaction_categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "name", null: false
-    t.string "color", default: "#6172F3", null: false
-    t.string "internal_category"
-    t.uuid "family_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["family_id"], name: "index_transaction_categories_on_family_id"
-  end
-
   create_table "transaction_merchants", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "name", null: false
     t.string "color", default: "#e99537", null: false
@@ -356,14 +356,14 @@ ActiveRecord::Schema[7.2].define(version: 2024_06_19_125949) do
   add_foreign_key "accounts", "institutions"
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "categories", "families"
   add_foreign_key "imports", "accounts"
   add_foreign_key "institutions", "families"
   add_foreign_key "taggings", "tags"
   add_foreign_key "tags", "families"
-  add_foreign_key "transaction_categories", "families"
   add_foreign_key "transaction_merchants", "families"
   add_foreign_key "transactions", "accounts", on_delete: :cascade
-  add_foreign_key "transactions", "transaction_categories", column: "category_id", on_delete: :nullify
+  add_foreign_key "transactions", "categories", on_delete: :nullify
   add_foreign_key "transactions", "transaction_merchants", column: "merchant_id"
   add_foreign_key "transactions", "transfers"
   add_foreign_key "users", "families"

lib/tasks/demo_data.rake

@@ -5,10 +5,10 @@ namespace :demo_data do
 
     family.accounts.delete_all
     ExchangeRate.delete_all
-    family.transaction_categories.delete_all
+    family.categories.delete_all
     Tagging.delete_all
     family.tags.delete_all
-    Transaction::Category.create_default_categories(family)
+    Category.create_default_categories(family)
 
     user = User.find_or_create_by(email: "user@maybe.local") do |u|
       u.password = "password"

test/controllers/categories/deletions_controller_test.rb

@@ -1,24 +1,24 @@
 require "test_helper"
 
-class Transactions::Categories::DeletionsControllerTest < ActionDispatch::IntegrationTest
+class Categories::DeletionsControllerTest < ActionDispatch::IntegrationTest
   setup do
     sign_in users(:family_admin)
-    @category = transaction_categories(:food_and_drink)
+    @category = categories(:food_and_drink)
   end
 
   test "new" do
-    get new_transaction_category_deletion_url(@category)
+    get new_category_deletion_url(@category)
     assert_response :success
   end
 
   test "create with replacement" do
-    replacement_category = transaction_categories(:income)
+    replacement_category = categories(:income)
 
     assert_not_empty @category.transactions
 
-    assert_difference "Transaction::Category.count", -1 do
+    assert_difference "Category.count", -1 do
       assert_difference "replacement_category.transactions.count", @category.transactions.count do
-        post transaction_category_deletions_url(@category),
+        post category_deletions_url(@category),
           params: { replacement_category_id: replacement_category.id }
       end
     end
@@ -29,9 +29,9 @@ class Transactions::Categories::DeletionsControllerTest < ActionDispatch::Integr
   test "create without replacement" do
     assert_not_empty @category.transactions
 
-    assert_difference "Transaction::Category.count", -1 do
+    assert_difference "Category.count", -1 do
       assert_difference "Transaction.where(category: nil).count", @category.transactions.count do
-        post transaction_category_deletions_url(@category)
+        post category_deletions_url(@category)
       end
     end
 

test/controllers/categories_controller_test.rb

@@ -0,0 +1,73 @@
+require "test_helper"
+
+class CategoriesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in users(:family_admin)
+  end
+
+  test "index" do
+    get categories_url
+    assert_response :success
+  end
+
+  test "new" do
+    get new_category_url
+    assert_response :success
+  end
+
+  test "create" do
+    color = Category::COLORS.sample
+
+    assert_difference "Category.count", +1 do
+      post categories_url, params: {
+        category: {
+          name: "New Category",
+          color: color } }
+    end
+
+    new_category = Category.order(:created_at).last
+
+    assert_redirected_to transactions_url
+    assert_equal "New Category", new_category.name
+    assert_equal color, new_category.color
+  end
+
+  test "create and assign to transaction" do
+    color = Category::COLORS.sample
+
+    assert_difference "Category.count", +1 do
+      post categories_url, params: {
+        transaction_id: transactions(:checking_one).id,
+        category: {
+          name: "New Category",
+          color: color } }
+    end
+
+    new_category = Category.order(:created_at).last
+
+    assert_redirected_to transactions_url
+    assert_equal "New Category", new_category.name
+    assert_equal color, new_category.color
+    assert_equal transactions(:checking_one).reload.category, new_category
+  end
+
+  test "edit" do
+    get edit_category_url(categories(:food_and_drink))
+    assert_response :success
+  end
+
+  test "update" do
+    new_color = Category::COLORS.without(categories(:income).color).sample
+
+    assert_changes -> { categories(:income).name }, to: "New Name" do
+      assert_changes -> { categories(:income).reload.color }, to: new_color do
+        patch category_url(categories(:income)), params: {
+          category: {
+            name: "New Name",
+            color: new_color } }
+      end
+    end
+
+    assert_redirected_to transactions_url
+  end
+end

test/controllers/registrations_controller_test.rb

@@ -16,7 +16,7 @@ class RegistrationsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "create seeds default transaction categories" do
-    assert_difference "Transaction::Category.count", Transaction::Category::DEFAULT_CATEGORIES.size do
+    assert_difference "Category.count", Category::DEFAULT_CATEGORIES.size do
       post registration_url, params: { user: {
       email: "john@example.com",
       password: "password",

test/controllers/transactions/categories_controller_test.rb

@@ -1,73 +0,0 @@
-require "test_helper"
-
-class Transactions::CategoriesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in users(:family_admin)
-  end
-
-  test "index" do
-    get transaction_categories_url
-    assert_response :success
-  end
-
-  test "new" do
-    get new_transaction_category_url
-    assert_response :success
-  end
-
-  test "create" do
-    color = Transaction::Category::COLORS.sample
-
-    assert_difference "Transaction::Category.count", +1 do
-      post transaction_categories_url, params: {
-        transaction_category: {
-          name: "New Category",
-          color: color } }
-    end
-
-    new_category = Transaction::Category.order(:created_at).last
-
-    assert_redirected_to transactions_url
-    assert_equal "New Category", new_category.name
-    assert_equal color, new_category.color
-  end
-
-  test "create and assign to transaction" do
-    color = Transaction::Category::COLORS.sample
-
-    assert_difference "Transaction::Category.count", +1 do
-      post transaction_categories_url, params: {
-        transaction_id: transactions(:checking_one).id,
-        transaction_category: {
-          name: "New Category",
-          color: color } }
-    end
-
-    new_category = Transaction::Category.order(:created_at).last
-
-    assert_redirected_to transactions_url
-    assert_equal "New Category", new_category.name
-    assert_equal color, new_category.color
-    assert_equal transactions(:checking_one).reload.category, new_category
-  end
-
-  test "edit" do
-    get edit_transaction_category_url(transaction_categories(:food_and_drink))
-    assert_response :success
-  end
-
-  test "update" do
-    new_color = Transaction::Category::COLORS.without(transaction_categories(:income).color).sample
-
-    assert_changes -> { transaction_categories(:income).name }, to: "New Name" do
-      assert_changes -> { transaction_categories(:income).reload.color }, to: new_color do
-        patch transaction_category_url(transaction_categories(:income)), params: {
-          transaction_category: {
-            name: "New Name",
-            color: new_color } }
-      end
-    end
-
-    assert_redirected_to transactions_url
-  end
-end

test/controllers/transactions_controller_test.rb

@@ -159,7 +159,7 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTest
     transactions.each do |transaction|
       transaction.update! \
         excluded: false,
-        category_id: Transaction::Category.first.id,
+        category_id: Category.first.id,
         merchant_id: Transaction::Merchant.first.id,
         notes: "Starting note"
     end
@@ -169,7 +169,7 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTest
         date: Date.current,
         transaction_ids: transactions.map(&:id),
         excluded: true,
-        category_id: Transaction::Category.second.id,
+        category_id: Category.second.id,
         merchant_id: Transaction::Merchant.second.id,
         notes: "Updated note"
       }
@@ -181,7 +181,7 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTest
     transactions.reload.each do |transaction|
       assert_equal Date.current, transaction.date
       assert transaction.excluded
-      assert_equal Transaction::Category.second, transaction.category
+      assert_equal Category.second, transaction.category
       assert_equal Transaction::Merchant.second, transaction.merchant
       assert_equal "Updated note", transaction.notes
     end

test/models/category_test.rb

@@ -1,50 +1,50 @@
 require "test_helper"
 
-class Transaction::CategoryTest < ActiveSupport::TestCase
+class CategoryTest < ActiveSupport::TestCase
   def setup
     @family = families(:dylan_family)
   end
 
   test "create_default_categories should generate categories if none exist" do
     @family.accounts.destroy_all
-    @family.transaction_categories.destroy_all
-    assert_difference "Transaction::Category.count", Transaction::Category::DEFAULT_CATEGORIES.size do
-      Transaction::Category.create_default_categories(@family)
+    @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
-      Transaction::Category.create_default_categories(@family)
+      Category.create_default_categories(@family)
     end
   end
 
   test "updating name should clear the internal_category field" do
-    category = Transaction::Category.take
+    category = Category.take
     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 = Transaction::Category.take
+    category = Category.take
     assert_no_changes "category.reload.internal_category" do
       category.update_attribute(:color, "#000")
     end
   end
 
   test "replacing and destroying" do
-    transctions = transaction_categories(:food_and_drink).transactions.to_a
+    transctions = categories(:food_and_drink).transactions.to_a
 
-    transaction_categories(:food_and_drink).replace_and_destroy!(transaction_categories(:income))
+    categories(:food_and_drink).replace_and_destroy!(categories(:income))
 
-    assert_equal transaction_categories(:income), transactions.map { |t| t.reload.category }.uniq.first
+    assert_equal categories(:income), transactions.map { |t| t.reload.category }.uniq.first
   end
 
   test "replacing with nil should nullify the category" do
-    transactions = transaction_categories(:food_and_drink).transactions.to_a
+    transactions = categories(:food_and_drink).transactions.to_a
 
-    transaction_categories(:food_and_drink).replace_and_destroy!(nil)
+    categories(:food_and_drink).replace_and_destroy!(nil)
 
     assert_nil transactions.map { |t| t.reload.category }.uniq.first
   end

test/models/family_test.rb

@@ -33,7 +33,7 @@ class FamilyTest < ActiveSupport::TestCase
   end
 
   test "should destroy dependent transaction categories" do
-    assert_difference("Transaction::Category.count", -@family.transaction_categories.count) do
+    assert_difference("Category.count", -@family.categories.count) do
       @family.destroy
     end
   end

test/models/import_test.rb

@@ -46,7 +46,7 @@ class ImportTest < ActiveSupport::TestCase
     # "Shopping" is a new category, but should only be created 1x during import
     assert_difference \
       -> { Transaction.count } => 4,
-      -> { Transaction::Category.count } => 1,
+      -> { Category.count } => 1,
       -> { Tagging.count } => 4,
       -> { Tag.count } => 2 do
       @loaded_import.publish
@@ -59,7 +59,7 @@ class ImportTest < ActiveSupport::TestCase
 
   test "publishes a valid import with missing data" do
     @empty_import.update! raw_csv_str: valid_csv_with_missing_data
-    assert_difference -> { Transaction::Category.count } => 1, -> { Transaction.count } => 2 do
+    assert_difference -> { Category.count } => 1, -> { Transaction.count } => 2 do
       @empty_import.publish
     end
 

test/system/settings_test.rb

@@ -12,7 +12,7 @@ class SettingsTest < ApplicationSystemTestCase
       [ "Billing", "Billing", settings_billing_path ],
       [ "Accounts", "Accounts", accounts_path ],
       [ "Tags", "Tags", tags_path ],
-      [ "Categories", "Categories", transaction_categories_path ],
+      [ "Categories", "Categories", categories_path ],
       [ "Merchants", "Merchants", transaction_merchants_path ],
       [ "Rules", "Rules", transaction_rules_path ],
       [ "Imports", "Imports", imports_path ],

test/system/transactions_test.rb

@@ -5,7 +5,7 @@ class TransactionsTest < ApplicationSystemTestCase
     sign_in @user = users(:family_admin)
 
     @latest_transactions = @user.family.transactions.ordered.limit(20).to_a
-    @test_category = @user.family.transaction_categories.create! name: "System Test Category"
+    @test_category = @user.family.categories.create! name: "System Test Category"
     @test_merchant = @user.family.transaction_merchants.create! name: "System Test Merchant"
     @target_txn = @user.family.accounts.first.transactions.create! \
       name: "Oldest transaction",