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

Account::Entry Delegated Type (namespace updates part 7) (#923)

Browse source 
* Initial entryable models

* Update transfer and tests

* Update transaction controllers and tests

* Update sync process to use new entries model

* Get dashboard working again

* Update transfers, imports, and accounts to use Account::Entry

* Update system tests

* Consolidate transaction management into entries controller

* Add permitted partial key helper

* Move account transactions list to entries controller

* Delegate transaction entries search

* Move transfer relation to entry

* Update bulk transaction management flows to use entries

* Remove test code

* Test fix attempt

* Update demo data script

* Consolidate remaining transaction partials to entries

* Consolidate valuations controller to entries controller

* Lint fix

* Remove unused files, additional cleanup

* Add back valuation creation

* Make migrations fully reversible

* Stale routes cleanup

* Migrations reversible fix

* Move types to entryable concern

* Fix search when no entries found

* Remove more unused code
This commit is contained in:
Zach Gollwitzer 2024-07-01 10:49:43 -04:00 • committed by GitHub
parent 320954282a
commit c3314e62d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
105 changed files with 2150 additions and 1576 deletions
Download patch file Download diff file Expand all files Collapse all files

74
config/brakeman.ignore Normal file
View file

@ -0,0 +1,74 @@
{
"ignored_warnings": [
{
"warning_type": "Dynamic Render Path",
"warning_code": 15,
"fingerprint": "6179565a9eb1786348e6bbaf5d838b77f9075551930a6ca8ba33fbbf6d2adf26",
"check_name": "Render",
"message": "Render path contains parameter value",
"file": "app/views/account/entries/show.html.erb",
"line": 1,
"link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
"code": "render(partial => permitted_entryable_partial_path(Current.family.accounts.find(params[:account_id]).entries.find(params[:id]), \"show\"), { :locals => ({ :entry => Current.family.accounts.find(params[:account_id]).entries.find(params[:id]) }) })",
"render_path": [
{
"type": "controller",
"class": "Account::EntriesController",
"method": "show",
"line": 42,
"file": "app/controllers/account/entries_controller.rb",
"rendered": {
"name": "account/entries/show",
"file": "app/views/account/entries/show.html.erb"
}
}
],
"location": {
"type": "template",
"template": "account/entries/show"
},
"user_input": "params[:id]",
"confidence": "Weak",
"cwe_id": [
22
],
"note": ""
},
{
"warning_type": "Dynamic Render Path",
"warning_code": 15,
"fingerprint": "7a182d062523a7fe890fbe5945c0004aeec1044ac764430f1d464326e5fa2710",
"check_name": "Render",
"message": "Render path contains parameter value",
"file": "app/views/account/entries/edit.html.erb",
"line": 2,
"link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
"code": "render(action => permitted_entryable_partial_path(Current.family.accounts.find(params[:account_id]).entries.find(params[:id]), \"edit\"), { :entry => Current.family.accounts.find(params[:account_id]).entries.find(params[:id]) })",
"render_path": [
{
"type": "controller",
"class": "Account::EntriesController",
"method": "edit",
"line": 29,
"file": "app/controllers/account/entries_controller.rb",
"rendered": {
"name": "account/entries/edit",
"file": "app/views/account/entries/edit.html.erb"
}
}
],
"location": {
"type": "template",
"template": "account/entries/edit"
},
"user_input": "params[:id]",
"confidence": "Weak",
"cwe_id": [
22
],
"note": ""
}
],
"updated": "2024-06-30 12:52:10 -0400",
"brakeman_version": "6.1.2"
}

5
config/locales/models/account/transfer/en.yml Normal file
View file

@ -0,0 +1,5 @@
---
en:
account:
transfer:
name: Transfer from %{from_account} to %{to_account}

76
config/locales/views/account/entries/en.yml Normal file
View file

@ -0,0 +1,76 @@
---
en:
account:
entries:
create:
success: "%{name} created"
destroy:
success: Entry deleted
empty:
description: Try adding an entry, editing filters or refining your search
title: No entries found
entryables:
transaction:
show:
account_label: Account
account_placeholder: Select an account
additional: Additional
category_label: Category
category_placeholder: Select a category
date_label: Date
delete: Delete
delete_subtitle: This permanently deletes the transaction, affects your
historical balances, and cannot be undone.
delete_title: Delete transaction
exclude_subtitle: This excludes the transaction from any in-app features
or analytics.
exclude_title: Exclude transaction
merchant_label: Merchant
merchant_placeholder: Select a merchant
name_label: Name
note_label: Notes
note_placeholder: Enter a note
overview: Overview
settings: Settings
tags_label: Select one or more tags
transaction:
remove_transfer: Remove transfer
remove_transfer_body: This will remove the transfer from this transaction
remove_transfer_confirm: Confirm
valuation:
form:
cancel: Cancel
valuation:
confirm_accept: Delete entry
confirm_body_html: "<p>Deleting this entry will remove it from the account’s
history which will impact different parts of your account. This includes
the net worth and account graphs.</p></br><p>The only way you’ll be
able to add this entry back is by re-entering it manually via a new
entry</p>"
confirm_title: Delete Entry?
delete_entry: Delete entry
edit_entry: Edit entry
no_change: No change
start_balance: Starting balance
value_update: Value update
loading:
loading: Loading entries...
selection_bar:
mark_transfers: Mark as transfers?
mark_transfers_confirm: Mark as transfers
mark_transfers_message: By marking transactions as transfers, they will no
longer be included in income or spending calculations.
transactions:
new: New transaction
no_transactions: No transactions for this account yet.
transaction: transaction
transactions: Transactions
update:
success: Entry updated
valuations:
change: change
date: date
new_entry: New entry
no_valuations: No valuations for this account yet
valuations: Value history
value: value

49
config/locales/views/account/transactions/en.yml
View file

@ -1,49 +0,0 @@
---
en:
account:
transactions:
destroy:
success: Transaction deleted successfully
empty:
description: Try adding a transaction, editing filters or refining your search
title: No transactions found
index:
new: New transaction
no_transactions: No transactions for this account yet.
transaction: transaction
transactions: Transactions
loading:
loading: Loading transactions...
selection_bar:
mark_transfers: Mark as transfers?
mark_transfers_confirm: Mark as transfers
mark_transfers_message: By marking transactions as transfers, they will no
longer be included in income or spending calculations.
show:
account_label: Account
account_placeholder: Select an account
additional: Additional
category_label: Category
category_placeholder: Select a category
date_label: Date
delete: Delete
delete_subtitle: This permanently deletes the transaction, affects your historical
balances, and cannot be undone.
delete_title: Delete transaction
exclude_subtitle: This excludes the transaction from any in-app features or
analytics.
exclude_title: Exclude transaction
merchant_label: Merchant
merchant_placeholder: Select a merchant
name_label: Name
note_label: Notes
note_placeholder: Enter a note
overview: Overview
settings: Settings
tags_label: Select one or more tags
transaction:
remove_transfer: Remove transfer
remove_transfer_body: This will remove the transfer from this transaction
remove_transfer_confirm: Confirm
update:
success: Transaction updated successfully

1
config/locales/views/account/transfers/en.yml
View file

@ -25,4 +25,3 @@ en:
remove the transfer.
remove_confirm: Confirm
remove_title: Remove transfer?
transfer_name: Transfer from %{from_account} to %{to_account}

31
config/locales/views/account/valuations/en.yml
View file

@ -1,31 +0,0 @@
---
en:
account:
valuations:
destroy:
success: Valuation deleted
form:
cancel: Cancel
index:
change: change
date: date
new_entry: New entry
no_valuations: No valuations for this account yet
valuations: Value history
value: value
loading:
loading: Loading history...
update:
success: Valuation updated
valuation:
confirm_accept: Delete entry
confirm_body_html: "<p>Deleting this entry will remove it from the account’s
history which will impact different parts of your account. This includes
the net worth and account graphs.</p></br><p>The only way you’ll be able
to add this entry back is by re-entering it manually via a new entry</p>"
confirm_title: Delete Entry?
delete_entry: Delete entry
edit_entry: Edit entry
no_change: No change
start_balance: Starting balance
value_update: Value update

7
config/locales/views/transactions/en.yml
View file

@ -4,23 +4,18 @@ en:
bulk_delete:
success: "%{count} transactions deleted"
bulk_edit:
additional: Additional
cancel: Cancel
category_label: Category
category_placeholder: Select a category
date_label: Date
exclude_subtitle: This excludes the transaction from any in-app features or
analytics.
exclude_title: Exclude transaction
details: Details
merchant_label: Merchant
merchant_placeholder: Select a merchant
note_label: Notes
note_placeholder: Enter a note that will be applied to selected transactions
overview: Overview
save: Save
settings: Settings
bulk_update:
failure: Could not update transactions
success: "%{count} transactions updated"
create:
success: New transaction created successfully

10
config/routes.rb
View file

@ -72,10 +72,11 @@ Rails.application.routes.draw do
scope module: :account do
resource :logo, only: :show
resources :valuations
resources :transactions, only: %i[ index show update destroy ] do
resource :row, only: %i[ show update ], module: :transaction
resources :entries, except: :index do
collection do
get "transactions", as: :transaction
get "valuations", as: :valuation
end
end
end
end
@ -87,6 +88,7 @@ Rails.application.routes.draw do
post "bulk_update"
post "mark_transfers"
post "unmark_transfers"
get "rules"
end
end