Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-28 17:49:38 +02:00
Code Issues Releases Activity Actions

Fix account deletion cascade bug (#1644)

Browse source 
* Fix account deletion cascade bug

* Rubocop fixes
This commit is contained in:
Zach Gollwitzer 2025-01-20 11:37:01 -05:00 • committed by GitHub
parent 9808641110
commit abccba3947
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 65 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/accounts_controller.rb
View file

@ -4,8 +4,8 @@ class AccountsController < ApplicationController
before_action :set_account, only: %i[sync] before_action :set_account, only: %i[sync]
def index def index
@manual_accounts = Current.family.accounts.where(scheduled_for_deletion: false).manual.alphabetically @manual_accounts = Current.family.accounts.manual.alphabetically
@plaid_items = Current.family.plaid_items.where(scheduled_for_deletion: false).ordered @plaid_items = Current.family.plaid_items.ordered
end end
def summary def summary

4
app/models/account/transaction.rb
View file

@ -6,8 +6,8 @@ class Account::Transaction < ApplicationRecord
has_many :taggings, as: :taggable, dependent: :destroy has_many :taggings, as: :taggable, dependent: :destroy
has_many :tags, through: :taggings has_many :tags, through: :taggings
has_one :transfer_as_inflow, class_name: "Transfer", foreign_key: "inflow_transaction_id", dependent: :restrict_with_exception has_one :transfer_as_inflow, class_name: "Transfer", foreign_key: "inflow_transaction_id", dependent: :destroy
has_one :transfer_as_outflow, class_name: "Transfer", foreign_key: "outflow_transaction_id", dependent: :restrict_with_exception has_one :transfer_as_outflow, class_name: "Transfer", foreign_key: "outflow_transaction_id", dependent: :destroy
accepts_nested_attributes_for :taggings, allow_destroy: true accepts_nested_attributes_for :taggings, allow_destroy: true

43
app/views/accounts/_account.html.erb
View file

@ -8,18 +8,31 @@
</div> </div>
<div> <div>
<%= link_to account.name, account, class: [(account.is_active ? "text-gray-900" : "text-gray-400"), "text-sm font-medium hover:underline"], data: { turbo_frame: "_top" } %> <% if account.scheduled_for_deletion? %>
<% if account.has_issues? %> <p class="text-sm font-medium text-gray-900">
<div class="text-sm flex items-center gap-1 text-error"> <span>
<%= lucide_icon "alert-octagon", class: "shrink-0 w-4 h-4" %> <%= account.name %>
<%= tag.span t(".has_issues") %> </span>
<%= link_to t(".troubleshoot"), issue_path(account.issues.first), class: "underline", data: { turbo_frame: :drawer } %> <span class="text-red-500 animate-pulse">
</div> (deletion in progress...)
</span>
</p>
<% else %>
<%= link_to account.name, account, class: [(account.is_active ? "text-gray-900" : "text-gray-400"), "text-sm font-medium hover:underline"], data: { turbo_frame: "_top" } %>
<% if account.has_issues? %>
<div class="text-sm flex items-center gap-1 text-error">
<%= lucide_icon "alert-octagon", class: "shrink-0 w-4 h-4" %>
<%= tag.span t(".has_issues") %>
<%= link_to t(".troubleshoot"), issue_path(account.issues.first), class: "underline", data: { turbo_frame: :drawer } %>
</div>
<% end %>
<% end %> <% end %>
</div> </div>
<%= link_to edit_account_path(account, return_to: return_to), data: { turbo_frame: :modal }, class: "group-hover/account:flex hidden hover:opacity-80 items-center justify-center" do %> <% unless account.scheduled_for_deletion? %>
<%= lucide_icon "pencil-line", class: "w-4 h-4 text-gray-500" %> <%= link_to edit_account_path(account, return_to: return_to), data: { turbo_frame: :modal }, class: "group-hover/account:flex hidden hover:opacity-80 items-center justify-center" do %>
<%= lucide_icon "pencil-line", class: "w-4 h-4 text-gray-500" %>
<% end %>
<% end %> <% end %>
</div> </div>
<div class="flex items-center gap-8"> <div class="flex items-center gap-8">
@ -27,13 +40,15 @@
<%= format_money account.balance_money %> <%= format_money account.balance_money %>
</p> </p>
<%= form_with model: account, <% unless account.scheduled_for_deletion? %>
<%= form_with model: account,
namespace: account.id, namespace: account.id,
data: { controller: "auto-submit-form", turbo_frame: "_top" } do |form| %> data: { controller: "auto-submit-form", turbo_frame: "_top" } do |form| %>
<div class="relative inline-block select-none"> <div class="relative inline-block select-none">
<%= form.check_box :is_active, { class: "sr-only peer", data: { "auto-submit-form-target": "auto" } } %> <%= form.check_box :is_active, { class: "sr-only peer", data: { "auto-submit-form-target": "auto" } } %>
<%= form.label :is_active, "&nbsp;".html_safe, class: "maybe-switch" %> <%= form.label :is_active, "&nbsp;".html_safe, class: "maybe-switch" %>
</div> </div>
<% end %>
<% end %> <% end %>
</div> </div>
</div> </div>

32
app/views/plaid_items/_plaid_item.html.erb
View file

@ -17,7 +17,12 @@
</div> </div>
<div class="pl-1 text-sm"> <div class="pl-1 text-sm">
<%= tag.p plaid_item.name, class: "font-medium text-gray-900" %> <div class="flex items-center gap-2">
<%= tag.p plaid_item.name, class: "font-medium text-gray-900" %>
<% if plaid_item.scheduled_for_deletion? %>
<p class="text-red-500 text-sm animate-pulse">(deletion in progress...)</p>
<% end %>
</div>
<% if plaid_item.syncing? %> <% if plaid_item.syncing? %>
<div class="text-gray-500 flex items-center gap-1"> <div class="text-gray-500 flex items-center gap-1">
<%= lucide_icon "loader", class: "w-4 h-4 animate-pulse" %> <%= lucide_icon "loader", class: "w-4 h-4 animate-pulse" %>
@ -37,7 +42,7 @@
</div> </div>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<%= button_to sync_plaid_item_path(plaid_item), disabled: plaid_item.syncing?, class: "disabled:text-gray-400 text-gray-900 flex hover:text-gray-800 items-center text-sm font-medium hover:underline" do %> <%= button_to sync_plaid_item_path(plaid_item), disabled: plaid_item.syncing? || plaid_item.scheduled_for_deletion?, class: "disabled:text-gray-400 text-gray-900 flex hover:text-gray-800 items-center text-sm font-medium hover:underline" do %>
<%= lucide_icon "refresh-cw", class: "w-4 h-4" %> <%= lucide_icon "refresh-cw", class: "w-4 h-4" %>
<% end %> <% end %>
@ -46,6 +51,7 @@
<%= button_to plaid_item_path(plaid_item), <%= button_to plaid_item_path(plaid_item),
method: :delete, method: :delete,
class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg", class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
disabled: plaid_item.syncing? || plaid_item.scheduled_for_deletion?,
data: { data: {
turbo_confirm: { turbo_confirm: {
title: t(".confirm_title"), title: t(".confirm_title"),
@ -62,15 +68,17 @@
</div> </div>
</summary> </summary>
<div class="space-y-4 mt-4"> <% unless plaid_item.scheduled_for_deletion? %>
<% if plaid_item.accounts.any? %> <div class="space-y-4 mt-4">
<%= render "accounts/index/account_groups", accounts: plaid_item.accounts %> <% if plaid_item.accounts.any? %>
<% else %> <%= render "accounts/index/account_groups", accounts: plaid_item.accounts %>
<div class="p-4 flex flex-col gap-3 items-center justify-center"> <% else %>
<p class="text-gray-900 font-medium text-sm"><%= t(".no_accounts_title") %></p> <div class="p-4 flex flex-col gap-3 items-center justify-center">
<p class="text-gray-500 text-sm"><%= t(".no_accounts_description") %></p> <p class="text-gray-900 font-medium text-sm"><%= t(".no_accounts_title") %></p>
</div> <p class="text-gray-500 text-sm"><%= t(".no_accounts_description") %></p>
<% end %> </div>
</div> <% end %>
</div>
<% end %>
</details> </details>
<% end %> <% end %>

6
test/models/account_test.rb
View file

@ -8,6 +8,12 @@ class AccountTest < ActiveSupport::TestCase
@family = families(:dylan_family) @family = families(:dylan_family)
end end
test "can destroy" do
assert_difference "Account.count", -1 do
@account.destroy
end
end
test "groups accounts by type" do test "groups accounts by type" do
result = @family.accounts.by_group(period: Period.all) result = @family.accounts.by_group(period: Period.all)
assets = result[:assets] assets = result[:assets]

6
test/models/transfer_test.rb
View file

@ -8,6 +8,12 @@ class TransferTest < ActiveSupport::TestCase
@inflow = account_transactions(:transfer_in) @inflow = account_transactions(:transfer_in)
end end
test "transfer destroyed if either transaction is destroyed" do
assert_difference [ "Transfer.count", "Account::Transaction.count", "Account::Entry.count" ], -1 do
@outflow.entry.destroy
end
end
test "auto matches transfers" do test "auto matches transfers" do
outflow_entry = create_transaction(date: 1.day.ago.to_date, account: accounts(:depository), amount: 500) outflow_entry = create_transaction(date: 1.day.ago.to_date, account: accounts(:depository), amount: 500)
inflow_entry = create_transaction(date: Date.current, account: accounts(:credit_card), amount: -500) inflow_entry = create_transaction(date: Date.current, account: accounts(:credit_card), amount: -500)