Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-08-04 21:15:19 +02:00
Code Issues Releases Activity Actions

Account Activity View + Account Forms (#1406)
Some checks are pending
Publish Docker image / ci (push) Waiting to run
Details
Publish Docker image / Build docker image (push) Blocked by required conditions
Details

Browse source 
* Remove balance mode, sketch out refactor

* Activity view checkpoint

* Entry partials, checkpoint

* Finish txn partial

* Give entries context when editing for different turbo responses

* Calculate change of balance for each entry

* Account tabs consolidation

* Translations, linting, brakeman updates

* Account actions concern

* Finalize forms, get account system tests passing

* Get tests passing

* Lint, rubocop, schema updates

* Improve routing and stream responses

* Fix broken routes

* Add import option for adding accounts

* Fix system test

* Fix test specificity

* Fix sparklines

* Improve account redirects
This commit is contained in:
Zach Gollwitzer 2024-11-04 20:27:31 -05:00 • committed by GitHub
parent 12e4f1067d
commit 65db49273c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
216 changed files with 2043 additions and 1620 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/account/entries_controller.rb
View file

@ -4,13 +4,21 @@ class Account::EntriesController < ApplicationController
before_action :set_account
before_action :set_entry, only: %i[edit update show destroy]
def index
@q = search_params
@pagy, @entries = pagy(@account.entries.search(@q).reverse_chronological, limit: params[:per_page] || "10")
end
def edit
render entryable_view_path(:edit)
end
def update
prev_amount = @entry.amount
prev_date = @entry.date
@entry.update!(entry_params)
@entry.sync_account_later
@entry.sync_account_later if prev_amount != @entry.amount || prev_date != @entry.date
respond_to do |format|
format.html { redirect_to account_entry_path(@account, @entry), notice: t(".success") }
@ -43,6 +51,11 @@ class Account::EntriesController < ApplicationController
end
def entry_params
params.require(:account_entry).permit(:name, :date, :amount, :currency)
params.require(:account_entry).permit(:name, :date, :amount, :currency, :notes)
end
def search_params
params.fetch(:q, {})
.permit(:search)
end
end

4
app/controllers/account/trades_controller.rb
View file

@ -17,10 +17,10 @@ class Account::TradesController < ApplicationController
if entry = @builder.save
entry.sync_account_later
redirect_to account_path(@account), notice: t(".success")
redirect_to @account, notice: t(".success")
else
flash[:alert] = t(".failure")
redirect_back_or_to account_path(@account)
redirect_back_or_to @account
end
end

25
app/controllers/account/transactions_controller.rb
View file

@ -12,16 +12,25 @@ class Account::TransactionsController < ApplicationController
end
def update
@entry.update!(entry_params)
prev_amount = @entry.amount
prev_date = @entry.date
@entry.update!(entry_params.except(:origin))
@entry.sync_account_later if prev_amount != @entry.amount || prev_date != @entry.date
respond_to do |format|
format.html { redirect_to account_entry_path(@account, @entry), notice: t(".success") }
format.turbo_stream { render turbo_stream: turbo_stream.replace(@entry) }
format.turbo_stream do
render turbo_stream: turbo_stream.replace(
@entry,
partial: "account/entries/entry",
locals: entry_locals.merge(entry: @entry)
)
end
end
end
private
def set_account
@account = Current.family.accounts.find(params[:account_id])
end
@ -30,10 +39,18 @@ class Account::TransactionsController < ApplicationController
@entry = @account.entries.find(params[:id])
end
def entry_locals
{
selectable: entry_params[:origin].present?,
show_balance: entry_params[:origin] == "account",
origin: entry_params[:origin]
}
end
def entry_params
params.require(:account_entry)
.permit(
:name, :date, :amount, :currency, :excluded, :notes, :entryable_type, :nature,
:name, :date, :amount, :currency, :excluded, :notes, :entryable_type, :nature, :origin,
entryable_attributes: [
:id,
:category_id,

26
app/controllers/account/transfers_controller.rb
View file

@ -1,12 +1,15 @@
class Account::TransfersController < ApplicationController
layout :with_sidebar
before_action :set_transfer, only: :destroy
before_action :set_transfer, only: %i[destroy show update]
def new
@transfer = Account::Transfer.new
end
def show
end
def create
from_account = Current.family.accounts.find(transfer_params[:from_account_id])
to_account = Current.family.accounts.find(transfer_params[:to_account_id])
@ -27,18 +30,33 @@ class Account::TransfersController < ApplicationController
end
end
def update
@transfer.update_entries!(transfer_update_params)
redirect_back_or_to transactions_url, notice: t(".success")
end
def destroy
@transfer.destroy_and_remove_marks!
@transfer.destroy!
redirect_back_or_to transactions_url, notice: t(".success")
end
private
def set_transfer
@transfer = Account::Transfer.find(params[:id])
record = Account::Transfer.find(params[:id])
unless record.entries.all? { |entry| Current.family.accounts.include?(entry.account) }
raise ActiveRecord::RecordNotFound
end
@transfer = record
end
def transfer_params
params.require(:account_transfer).permit(:from_account_id, :to_account_id, :amount, :date, :name)
params.require(:account_transfer).permit(:from_account_id, :to_account_id, :amount, :date, :name, :excluded)
end
def transfer_update_params
params.require(:account_transfer).permit(:excluded, :notes)
end
end

2
app/controllers/account/valuations_controller.rb
View file

@ -15,7 +15,7 @@ class Account::ValuationsController < ApplicationController
redirect_back_or_to account_valuations_path(@account), notice: t(".success")
else
flash[:alert] = @entry.errors.full_messages.to_sentence
redirect_to account_path(@account)
redirect_to @account
end
end

48
app/controllers/accounts_controller.rb
View file

@ -1,8 +1,7 @@
class AccountsController < ApplicationController
layout :with_sidebar
include Filterable
before_action :set_account, only: %i[edit show destroy sync update]
before_action :set_account, only: %i[sync]
def index
@institutions = Current.family.institutions
@ -10,6 +9,7 @@ class AccountsController < ApplicationController
end
def summary
@period = Period.from_param(params[:period])
snapshot = Current.family.snapshot(@period)
@net_worth_series = snapshot[:net_worth_series]
@asset_series = snapshot[:asset_series]
@ -22,45 +22,6 @@ class AccountsController < ApplicationController
render layout: false
end
def new
@account = Account.new(currency: Current.family.currency)
@account.accountable = Accountable.from_type(params[:type])&.new if params[:type].present?
@account.accountable.address = Address.new if @account.accountable.is_a?(Property)
if params[:institution_id]
@account.institution = Current.family.institutions.find_by(id: params[:institution_id])
end
end
def show
end
def edit
@account.accountable.build_address if @account.accountable.is_a?(Property) && @account.accountable.address.blank?
end
def update
@account.update_with_sync!(account_params)
redirect_back_or_to account_path(@account), notice: t(".success")
end
def create
@account = Current.family
.accounts
.create_with_optional_start_balance! \
attributes: account_params.except(:start_date, :start_balance),
start_date: account_params[:start_date],
start_balance: account_params[:start_balance]
@account.sync_later
redirect_back_or_to account_path(@account), notice: t(".success")
end
def destroy
@account.destroy!
redirect_to accounts_path, notice: t(".success")
end
def sync
unless @account.syncing?
@account.sync_later
@ -73,12 +34,7 @@ class AccountsController < ApplicationController
end
private
def set_account
@account = Current.family.accounts.find(params[:id])
end
def account_params
params.require(:account).permit(:name, :accountable_type, :mode, :balance, :start_date, :start_balance, :currency, :subtype, :is_active, :institution_id)
end
end

60
app/controllers/concerns/accountable_resource.rb Normal file
View file

@ -0,0 +1,60 @@
module AccountableResource
extend ActiveSupport::Concern
included do
layout :with_sidebar
before_action :set_account, only: [ :show, :edit, :update, :destroy ]
end
class_methods do
def permitted_accountable_attributes(*attrs)
@permitted_accountable_attributes = attrs if attrs.any?
@permitted_accountable_attributes ||= [ :id ]
end
end
def new
@account = Current.family.accounts.build(
currency: Current.family.currency,
accountable: accountable_type.new,
institution_id: params[:institution_id]
)
end
def show
end
def edit
end
def create
@account = Current.family.accounts.create_and_sync(account_params.except(:return_to))
redirect_to account_params[:return_to].presence || @account, notice: t(".success")
end
def update
@account.update_with_sync!(account_params.except(:return_to))
redirect_back_or_to @account, notice: t(".success")
end
def destroy
@account.destroy!
redirect_to accounts_path, notice: t(".success")
end
private
def accountable_type
controller_name.classify.constantize
end
def set_account
@account = Current.family.accounts.find(params[:id])
end
def account_params
params.require(:account).permit(
:name, :is_active, :balance, :subtype, :currency, :institution_id, :accountable_type, :return_to,
accountable_attributes: self.class.permitted_accountable_attributes
)
end
end

23
app/controllers/concerns/filterable.rb
View file

@ -1,23 +0,0 @@
module Filterable
extend ActiveSupport::Concern
included do
before_action :set_period
end
private
def set_period
@period = Period.find_by_name(params[:period])
if @period.nil?
start_date = params[:start_date].presence&.to_date
end_date = params[:end_date].presence&.to_date
if start_date.is_a?(Date) && end_date.is_a?(Date) && start_date <= end_date
@period = Period.new(name: "custom", date_range: start_date..end_date)
else
params[:period] = "last_30_days"
@period = Period.find_by_name(params[:period])
end
end
end
end

47
app/controllers/credit_cards_controller.rb
View file

@ -1,41 +1,12 @@
class CreditCardsController < ApplicationController
before_action :set_account, only: :update
include AccountableResource
def create
account = Current.family
.accounts
.create_with_optional_start_balance! \
attributes: account_params.except(:start_date, :start_balance),
start_date: account_params[:start_date],
start_balance: account_params[:start_balance]
account.sync_later
redirect_to account, notice: t(".success")
end
def update
@account.update_with_sync!(account_params)
redirect_to @account, notice: t(".success")
end
private
def set_account
@account = Current.family.accounts.find(params[:id])
end
def account_params
params.require(:account)
.permit(
:name, :balance, :institution_id, :mode, :start_date, :start_balance, :currency, :accountable_type,
accountable_attributes: [
:id,
:available_credit,
:minimum_payment,
:apr,
:annual_fee,
:expiration_date
]
)
end
permitted_accountable_attributes(
:id,
:available_credit,
:minimum_payment,
:apr,
:annual_fee,
:expiration_date
)
end

3
app/controllers/cryptos_controller.rb Normal file
View file

@ -0,0 +1,3 @@
class CryptosController < ApplicationController
include AccountableResource
end

3
app/controllers/depositories_controller.rb Normal file
View file

@ -0,0 +1,3 @@
class DepositoriesController < ApplicationController
include AccountableResource
end

3
app/controllers/investments_controller.rb Normal file
View file

@ -0,0 +1,3 @@
class InvestmentsController < ApplicationController
include AccountableResource
end

5
app/controllers/issue/exchange_rate_provider_missings_controller.rb
View file

@ -3,8 +3,9 @@ class Issue::ExchangeRateProviderMissingsController < ApplicationController
def update
Setting.synth_api_key = exchange_rate_params[:synth_api_key]
@issue.issuable.sync_later
redirect_back_or_to account_path(@issue.issuable)
account = @issue.issuable
account.sync_later
redirect_back_or_to account
end
private

40
app/controllers/loans_controller.rb
View file

@ -1,39 +1,7 @@
class LoansController < ApplicationController
before_action :set_account, only: :update
include AccountableResource
def create
account = Current.family
.accounts
.create_with_optional_start_balance! \
attributes: account_params.except(:start_date, :start_balance),
start_date: account_params[:start_date],
start_balance: account_params[:start_balance]
account.sync_later
redirect_to account, notice: t(".success")
end
def update
@account.update_with_sync!(account_params)
redirect_to @account, notice: t(".success")
end
private
def set_account
@account = Current.family.accounts.find(params[:id])
end
def account_params
params.require(:account)
.permit(
:name, :balance, :institution_id, :start_date, :mode, :start_balance, :currency, :accountable_type,
accountable_attributes: [
:id,
:rate_type,
:interest_rate,
:term_months
]
)
end
permitted_accountable_attributes(
:id, :rate_type, :interest_rate, :term_months
)
end

3
app/controllers/other_assets_controller.rb Normal file
View file

@ -0,0 +1,3 @@
class OtherAssetsController < ApplicationController
include AccountableResource
end

3
app/controllers/other_liabilities_controller.rb Normal file
View file

@ -0,0 +1,3 @@
class OtherLiabilitiesController < ApplicationController
include AccountableResource
end

3
app/controllers/pages_controller.rb
View file

@ -2,9 +2,8 @@ class PagesController < ApplicationController
skip_before_action :authenticate_user!, only: %i[early_access]
layout :with_sidebar, except: %i[early_access]
include Filterable
def dashboard
@period = Period.from_param(params[:period])
snapshot = Current.family.snapshot(@period)
@net_worth_series = snapshot[:net_worth_series]
@asset_series = snapshot[:asset_series]

48
app/controllers/properties_controller.rb
View file

@ -1,40 +1,22 @@
class PropertiesController < ApplicationController
before_action :set_account, only: :update
include AccountableResource
def create
account = Current.family
.accounts
.create_with_optional_start_balance! \
attributes: account_params.except(:start_date, :start_balance),
start_date: account_params[:start_date],
start_balance: account_params[:start_balance]
permitted_accountable_attributes(
:id, :year_built, :area_unit, :area_value,
address_attributes: [ :line1, :line2, :locality, :region, :country, :postal_code ]
)
account.sync_later
redirect_to account, notice: t(".success")
def new
@account = Current.family.accounts.build(
currency: Current.family.currency,
accountable: Property.new(
address: Address.new
),
institution_id: params[:institution_id]
)
end
def update
@account.update_with_sync!(account_params)
redirect_to @account, notice: t(".success")
def edit
@account.accountable.address ||= Address.new
end
private
def set_account
@account = Current.family.accounts.find(params[:id])
end
def account_params
params.require(:account)
.permit(
:name, :balance, :institution_id, :start_date, :mode, :start_balance, :currency, :accountable_type,
accountable_attributes: [
:id,
:year_built,
:area_unit,
:area_value,
address_attributes: [ :line1, :line2, :locality, :region, :country, :postal_code ]
]
)
end
end

2
app/controllers/transactions_controller.rb
View file

@ -32,7 +32,7 @@ class TransactionsController < ApplicationController
.create!(transaction_entry_params.merge(amount: amount))
@entry.sync_account_later
redirect_back_or_to account_path(@entry.account), notice: t(".success")
redirect_back_or_to @entry.account, notice: t(".success")
end
def bulk_delete

42
app/controllers/vehicles_controller.rb
View file

@ -1,41 +1,7 @@
class VehiclesController < ApplicationController
before_action :set_account, only: :update
include AccountableResource
def create
account = Current.family
.accounts
.create_with_optional_start_balance! \
attributes: account_params.except(:start_date, :start_balance),
start_date: account_params[:start_date],
start_balance: account_params[:start_balance]
account.sync_later
redirect_to account, notice: t(".success")
end
def update
@account.update_with_sync!(account_params)
redirect_to @account, notice: t(".success")
end
private
def set_account
@account = Current.family.accounts.find(params[:id])
end
def account_params
params.require(:account)
.permit(
:name, :balance, :institution_id, :start_date, :mode, :start_balance, :currency, :accountable_type,
accountable_attributes: [
:id,
:make,
:model,
:year,
:mileage_value,
:mileage_unit
]
)
end
permitted_accountable_attributes(
:id, :make, :model, :year, :mileage_value, :mileage_unit
)
end