mirror of
https://github.com/we-promise/sure.git
synced 2026-09-04 06:11:12 +00:00
* feat(plan): unify Budgets and Goals under a single Plan tab
Preview users get one "Plan" nav entry (compass icon) in place of the
separate Budgets and preview-gated Goals items. It fronts a new /plan
hub with two summary cards — this month's budget (spent vs budgeted,
days left, top categories) and active goals (total saved vs targets,
behind/pending counts, per-goal rows) — each drilling into the existing
/budgets and /goals pages, whose breadcrumbs now start Home > Plan.
The two features share a home, not a model: no schema changes, no URL
changes. Users without preview features keep exactly the pre-Plan nav
(Budgets entry, Goals hidden), and /plan falls through to /budgets for
them.
Supporting changes:
- Goal.active_prepared_for: index-style sorted active goals with the
family-wide pooled-allocations + market-flows injection reused
- Goal::FUNDABLE_ACCOUNT_TYPES and Goal::ACTIVE_DISPLAY_STATUS_RANK
extracted from GoalsController
- Budget#days_remaining (same day math as suggested_daily_spending)
- Breadcrumbable#plan_breadcrumb_prefix for the conditional Plan crumb
- New BudgetsController web tests (previously untested) + Plans tests
* fix(plan): address review feedback on the Plan hub
- Keep the "All goals" footer link rendered when the family has only
completed/archived goals — the hub is a preview user's only route to
the goals index now that the Goals nav entry is gone (Codex P2)
- Replace the two hand-rolled footer button-links with DS::Link
(variant secondary, full_width, right icon) per DS Drift Patrol
- Fix DS::Link template comparing icon_position against the string
"right" — the initializer symbolizes it, so right-positioned icons
never rendered on links (DS::Button already compared symbols);
existing callers passing icon_position now get the layout they asked for
- Clamp progress-bar percentages to 0..100 instead of capping only the
upper bound (CodeRabbit)
* refactor(plan): single source of truth for goal loading, sorting, and counts
Addresses jjmata's draft review notes:
- GoalsController#index now builds on the shared Goal loaders instead
of hand-rolling its own copy: Goal.prepared_for (preloads + family-
wide backing-math injection, scope-able) and Goal.active_display_sort
carry the algorithm once; active_prepared_for composes them for the
hub. The controller-side constant alias is gone
- One definition of "behind pace": Goal#behind_pace? (excludes paused —
pausing stops the pace clock on purpose). Both the Plan hub summary
and GoalsController#kpi_payload's behind/needs-this-month figures use
it, so adjacent pages can't disagree. While there, the kpi on-track
numerator also excludes paused goals — it was counted against a
paused-excluding denominator, so the "X of Y" fraction could exceed
its own total
- BudgetCategory#suggested_daily_spending calls Budget#days_remaining
instead of keeping an inline copy of the day math
- Per the fat-model convention, the hub's aggregation moved off the
controller: Budget#top_spending_categories(limit:) and
Goal.summary_for(goals, currency:)
* fix(plan): move Edit budget/New goal into their own cards
Both actions lived in the hub's shared page header, unlinked to either
card and, on mobile, wrapping above all content before any real data
appeared. Each now lives in its own card's header instead: Edit budget
as a compact icon-only control next to the status pill (only when a
budget exists — the uninitialized state already has its own "Set up"
CTA), New goal as a small outline button next to the goals count (only
once there's a goal to sit beside; the empty state keeps its own CTA).
Also swaps the edit icon from "pencil" to "square-pen" — at the sizes
these header controls render, lucide's plain pencil is a thin diagonal
stroke that reads noticeably smaller than a neighboring bold glyph like
"plus", even in the same size box. square-pen carries more visual mass
and reads clearly at the same footprint.
* fix(plan): match established DS precedent for the card header actions
Edit budget was a bare icon-only button; verified against the app's
own precedent for this exact action (app/views/budgets/_budget_donut.html.erb,
the budget card already shipped on /budgets) and it's a labeled
secondary link with a trailing pencil, not icon-only and not a
three-dot menu. Matched that: DS::Link, variant secondary, size sm,
icon right. New goal gets the same treatment for consistency between
the two cards' header actions, rather than the full-page-scoped
"primary" weight goals/index.html.erb uses for its own create button —
that's calibrated for a whole page's sole CTA, not a compact card.
Adding a labeled button (wider than the bare icon this replaces)
crowded the header row on mobile enough to wrap "This month" onto two
lines and truncate the "· July 2026" meta away entirely. Header rows
now wrap as a whole (flex-wrap) with the title pinned (shrink-0) so
the action cluster drops to its own line instead of squeezing the
title and meta text.
Also drops the hub's footer note ("Budgets cap your spend; goals track
what you're saving toward...") — redundant with the subtitle right
above the cards.
* fix(plan): lead the budget card header with status, not the edit action
On Track/Over/Warning is what a glance at the card wants first; Edit
budget is the secondary action. Swapped their order so status leads
and the edit control trails, gap-2 unchanged.
* fix(plan): put the status pill on the left, next to the title
Meant the left side of the card, not just left of the edit button. On
Track/Over/Warning now sits beside "This month · July 2026" in normal
flow; ml-auto carries only the Edit budget link, alone on the right —
matching the goals card's own left-meta/right-action split ("· 7
active" left, "New goal" right).
* fix(plan): lead Edit budget with its icon, matching same-shape precedent
Wrong axis on the earlier match: _budget_donut's trailing pencil labels
the VALUE itself ("$12,850 ✎"), not a static action. Our button's label
is a static "Edit budget", and that shape takes a leading icon
everywhere else it appears — the categories "Edit" on budgets/show.html.erb
(icon: settings-2) and "Edit split" in transactions/show.html.erb both
lead with their icon. Drops icon_position: :right so it defaults to
left, matching New goal's shape in the sibling card.
* fix(plan): use the divider token for row separators, not border-primary
Traced against the dashboard outflows list (pages/dashboard/_outflows_donut.html.erb),
which renders its row separators via shared/_ruler → border-divider
(border-tertiary: black/8%, white/10%). Our category and goal rows used
border-b border-primary instead (black/15%, white/30%) — 2-3x heavier
than the established row-separator weight elsewhere in the app. Swapped
both to border-divider.
* fix(plan): lift the duplicated card shell into DS::Card
Codex P1: _budget_card.html.erb and _goals_card.html.erb hand-rolled
the identical "bg-container rounded-xl shadow-border-xs p-5 flex
flex-col" shell twice, with no DS:: card primitive to reach for
instead. Extracted a minimal wrapper — content-only, no header/footer
slots — matching what both cards actually need right now; the roadmap
cards (envelopes #2153, retirement #2044) can adopt it too instead of
copying the class string a third time.
Verified pixel-identical in a browser: same classes, same DOM shape,
just rendered through the component.
* fix(plan): batch pace queries before sorting goals
Codex P2: active_display_sort calls goal.status per goal to build the
sort key; Goal#status reaches Goal#pace for any goal with a
target_date, which fired its own Entry.sum(:amount) query per goal.
The /plan hub renders only the first 5 of active_prepared_for's list,
but paid the full O(N) query cost sorting all of them.
Adds Goal.pace_for(family) (account_id => 90-day net inflow), grouped
in one query and injected via inject_backing_math! alongside the
existing pooled_allocations/market_flows pattern. #pace now sums from
that shared map instead of firing its own query — same math, same
90-day window, same exclusions, just computed once per family instead
of once per goal.
375 lines
11 KiB
Ruby
375 lines
11 KiB
Ruby
class Budget < ApplicationRecord
|
|
include Monetizable
|
|
|
|
PARAM_DATE_FORMAT = "%b-%Y"
|
|
|
|
attr_accessor :current_user
|
|
|
|
belongs_to :family
|
|
|
|
has_many :budget_categories, -> { includes(:category) }, dependent: :destroy
|
|
|
|
validates :start_date, :end_date, presence: true
|
|
validates :start_date, :end_date, uniqueness: { scope: :family_id }
|
|
|
|
monetize :budgeted_spending, :expected_income, :allocated_spending,
|
|
:actual_spending, :available_to_spend, :available_to_allocate,
|
|
:estimated_spending, :estimated_income, :actual_income, :remaining_expected_income
|
|
|
|
class << self
|
|
def date_to_param(date)
|
|
date.strftime(PARAM_DATE_FORMAT).downcase
|
|
end
|
|
|
|
def param_to_date(param, family: nil)
|
|
base_date = Date.strptime(param, PARAM_DATE_FORMAT)
|
|
if family&.uses_custom_month_start?
|
|
Date.new(base_date.year, base_date.month, family.month_start_day)
|
|
else
|
|
base_date.beginning_of_month
|
|
end
|
|
end
|
|
|
|
def budget_date_valid?(date, family:)
|
|
budget_start, _ = period_for(date, family: family)
|
|
budget_start >= oldest_valid_budget_date(family) &&
|
|
budget_start <= latest_valid_budget_start_date(family)
|
|
end
|
|
|
|
def period_for(date, family:)
|
|
if family.uses_custom_month_start?
|
|
[ family.custom_month_start_for(date), family.custom_month_end_for(date) ]
|
|
else
|
|
[ date.beginning_of_month, date.end_of_month ]
|
|
end
|
|
end
|
|
|
|
def find_or_bootstrap(family, start_date:, user: nil)
|
|
return nil unless budget_date_valid?(start_date, family: family)
|
|
|
|
Budget.transaction do
|
|
budget_start, budget_end = period_for(start_date, family: family)
|
|
|
|
budget = Budget.find_or_create_by!(
|
|
family: family,
|
|
start_date: budget_start,
|
|
end_date: budget_end
|
|
) do |b|
|
|
b.currency = family.currency
|
|
end
|
|
|
|
budget.current_user = user
|
|
budget.sync_budget_categories
|
|
|
|
budget
|
|
end
|
|
end
|
|
|
|
private
|
|
def oldest_valid_budget_date(family)
|
|
two_years_ago = 2.years.ago.beginning_of_month
|
|
oldest_entry_date = family.oldest_entry_date.beginning_of_month
|
|
[ two_years_ago, oldest_entry_date ].min
|
|
end
|
|
|
|
def latest_valid_budget_start_date(family)
|
|
if family.uses_custom_month_start?
|
|
family.current_custom_month_period.start_date + 2.years
|
|
else
|
|
Date.current.beginning_of_month + 2.years
|
|
end
|
|
end
|
|
end
|
|
|
|
def period
|
|
Period.custom(start_date: start_date, end_date: end_date)
|
|
end
|
|
|
|
def to_param
|
|
self.class.date_to_param(start_date)
|
|
end
|
|
|
|
def sync_budget_categories
|
|
# Category changes can leave the association memoized before this sync runs.
|
|
current_categories_by_id = family.categories.reload.index_by(&:id)
|
|
current_category_ids = current_categories_by_id.keys.to_set
|
|
existing_budget_category_ids = budget_categories.pluck(:category_id).to_set
|
|
categories_to_add = current_category_ids - existing_budget_category_ids
|
|
categories_to_remove = existing_budget_category_ids - current_category_ids
|
|
|
|
# Create missing categories
|
|
categories_to_add.each do |category_id|
|
|
budget_categories.create!(
|
|
category: current_categories_by_id.fetch(category_id),
|
|
budgeted_spending: 0,
|
|
currency: family.currency
|
|
)
|
|
end
|
|
|
|
# Remove old categories
|
|
budget_categories.where(category_id: categories_to_remove).destroy_all if categories_to_remove.any?
|
|
end
|
|
|
|
def uncategorized_budget_category
|
|
budget_categories.uncategorized.tap do |bc|
|
|
bc.budgeted_spending = [ available_to_allocate, 0 ].max
|
|
bc.currency = family.currency
|
|
end
|
|
end
|
|
|
|
def transactions
|
|
scope = family.transactions.visible.in_period(period)
|
|
if current_user
|
|
scope = scope.joins(:entry).where(entries: { account_id: family.accounts.accessible_by(current_user).included_in_reports.select(:id) })
|
|
end
|
|
scope
|
|
end
|
|
|
|
def name
|
|
if family.uses_custom_month_start?
|
|
I18n.t(
|
|
"budgets.name.custom_range",
|
|
start: I18n.l(start_date, format: :short),
|
|
end_date: I18n.l(end_date, format: :long)
|
|
)
|
|
else
|
|
I18n.t("budgets.name.month_year", month: I18n.l(start_date, format: :month_year))
|
|
end
|
|
end
|
|
|
|
def initialized?
|
|
budgeted_spending.present?
|
|
end
|
|
|
|
def most_recent_initialized_budget
|
|
family.budgets
|
|
.includes(:budget_categories)
|
|
.where("start_date < ?", start_date)
|
|
.where.not(budgeted_spending: nil)
|
|
.order(start_date: :desc)
|
|
.first
|
|
end
|
|
|
|
def copy_from!(source_budget)
|
|
raise ArgumentError, "source budget must belong to the same family" unless source_budget.family_id == family_id
|
|
raise ArgumentError, "source budget must precede target budget" unless source_budget.start_date < start_date
|
|
|
|
Budget.transaction do
|
|
update!(
|
|
budgeted_spending: source_budget.budgeted_spending,
|
|
expected_income: source_budget.expected_income
|
|
)
|
|
|
|
target_by_category = budget_categories.index_by(&:category_id)
|
|
|
|
source_budget.budget_categories.each do |source_bc|
|
|
target_bc = target_by_category[source_bc.category_id]
|
|
next unless target_bc
|
|
|
|
target_bc.update!(budgeted_spending: source_bc.budgeted_spending)
|
|
end
|
|
end
|
|
end
|
|
|
|
def income_category_totals
|
|
net_totals.net_income_categories.reject { |ct| ct.total.zero? }.sort_by(&:weight).reverse
|
|
end
|
|
|
|
def expense_category_totals
|
|
net_totals.net_expense_categories.reject { |ct| ct.total.zero? }.sort_by(&:weight).reverse
|
|
end
|
|
|
|
def current?
|
|
if family.uses_custom_month_start?
|
|
current_period = family.current_custom_month_period
|
|
start_date == current_period.start_date && end_date == current_period.end_date
|
|
else
|
|
start_date == Date.current.beginning_of_month && end_date == Date.current.end_of_month
|
|
end
|
|
end
|
|
|
|
# Whole days from today through the period's last day (today counts).
|
|
# 0 once the period is over. Also feeds
|
|
# BudgetCategory#suggested_daily_spending's per-day split.
|
|
def days_remaining
|
|
[ (end_date - Date.current).to_i + 1, 0 ].max
|
|
end
|
|
|
|
# Biggest parent categories by what's actually been spent this period,
|
|
# falling back to allocation size early in the month before spending
|
|
# lands. Categories with neither spend nor an allocation are noise in a
|
|
# summary. (The budget_categories association preloads :category.)
|
|
def top_spending_categories(limit: 4)
|
|
budget_categories
|
|
.reject(&:subcategory?)
|
|
.reject { |bc| bc.actual_spending.to_d.zero? && bc.budgeted_spending.to_d.zero? }
|
|
.sort_by { |bc| [ -bc.actual_spending.to_d, -bc.budgeted_spending.to_d ] }
|
|
.first(limit)
|
|
end
|
|
|
|
def previous_budget_param
|
|
previous_date = start_date - 1.month
|
|
return nil unless self.class.budget_date_valid?(previous_date, family: family)
|
|
|
|
self.class.date_to_param(previous_date)
|
|
end
|
|
|
|
def next_budget_param
|
|
next_date = start_date + 1.month
|
|
return nil unless self.class.budget_date_valid?(next_date, family: family)
|
|
|
|
self.class.date_to_param(next_date)
|
|
end
|
|
|
|
def to_donut_segments_json
|
|
unused_segment_id = "unused"
|
|
|
|
# Continuous gray segment for empty budgets
|
|
return [ { color: "var(--budget-unallocated-fill)", amount: 1, id: unused_segment_id } ] unless allocations_valid?
|
|
|
|
segments = donut_budget_categories.map do |bc|
|
|
{ color: bc.category.color, amount: budget_category_actual_spending(bc), id: bc.id }
|
|
end
|
|
|
|
if available_to_spend.positive?
|
|
segments.push({ color: "var(--budget-unallocated-fill)", amount: available_to_spend, id: unused_segment_id })
|
|
end
|
|
|
|
segments
|
|
end
|
|
|
|
def donut_budget_categories
|
|
categories = budget_categories.reject(&:subcategory?).to_a
|
|
uncategorized = uncategorized_budget_category
|
|
|
|
if budget_category_actual_spending(uncategorized).positive?
|
|
categories << uncategorized
|
|
end
|
|
|
|
categories
|
|
end
|
|
|
|
# =============================================================================
|
|
# Actuals: How much user has spent on each budget category
|
|
# =============================================================================
|
|
def estimated_spending
|
|
income_statement.median_expense(interval: "month")
|
|
end
|
|
|
|
def actual_spending
|
|
net_totals.total_net_expense
|
|
end
|
|
|
|
def budget_category_actual_spending(budget_category)
|
|
key = budget_category.category_id || stable_synthetic_key(budget_category.category)
|
|
expense = expense_totals_by_category[key]&.total || 0
|
|
refund = income_totals_by_category[key]&.total || 0
|
|
[ expense - refund, 0 ].max
|
|
end
|
|
|
|
def category_median_monthly_expense(category)
|
|
income_statement.median_expense(category: category)
|
|
end
|
|
|
|
def category_avg_monthly_expense(category)
|
|
income_statement.avg_expense(category: category)
|
|
end
|
|
|
|
def available_to_spend
|
|
(budgeted_spending || 0) - actual_spending
|
|
end
|
|
|
|
def percent_of_budget_spent
|
|
return 0 unless budgeted_spending > 0
|
|
|
|
(actual_spending / budgeted_spending.to_f) * 100
|
|
end
|
|
|
|
def overage_percent
|
|
return 0 unless available_to_spend.negative?
|
|
|
|
available_to_spend.abs / actual_spending.to_f * 100
|
|
end
|
|
|
|
# =============================================================================
|
|
# Budget allocations: How much user has budgeted for all parent categories combined
|
|
# =============================================================================
|
|
def allocated_spending
|
|
budget_categories.reject { |bc| bc.subcategory? }.sum(&:budgeted_spending)
|
|
end
|
|
|
|
def allocated_percent
|
|
return 0 unless budgeted_spending && budgeted_spending > 0
|
|
|
|
(allocated_spending / budgeted_spending.to_f) * 100
|
|
end
|
|
|
|
def available_to_allocate
|
|
(budgeted_spending || 0) - allocated_spending
|
|
end
|
|
|
|
def allocations_valid?
|
|
initialized? && available_to_allocate >= 0 && allocated_spending > 0
|
|
end
|
|
|
|
# =============================================================================
|
|
# Income: How much user earned relative to what they expected to earn
|
|
# =============================================================================
|
|
def estimated_income
|
|
family.income_statement.median_income(interval: "month")
|
|
end
|
|
|
|
def actual_income
|
|
family.income_statement.income_totals(period: self.period).total
|
|
end
|
|
|
|
def actual_income_percent
|
|
return 0 unless expected_income > 0
|
|
|
|
(actual_income / expected_income.to_f) * 100
|
|
end
|
|
|
|
def remaining_expected_income
|
|
expected_income - actual_income
|
|
end
|
|
|
|
def surplus_percent
|
|
return 0 unless remaining_expected_income.negative?
|
|
|
|
remaining_expected_income.abs / expected_income.to_f * 100
|
|
end
|
|
|
|
private
|
|
def income_statement
|
|
@income_statement ||= family.income_statement(user: current_user)
|
|
end
|
|
|
|
def net_totals
|
|
@net_totals ||= income_statement.net_category_totals(period: period)
|
|
end
|
|
|
|
def expense_totals
|
|
@expense_totals ||= income_statement.expense_totals(period: period)
|
|
end
|
|
|
|
def income_totals
|
|
@income_totals ||= income_statement.income_totals(period: period)
|
|
end
|
|
|
|
def expense_totals_by_category
|
|
@expense_totals_by_category ||= expense_totals.category_totals.index_by { |ct| ct.category.id || stable_synthetic_key(ct.category) }
|
|
end
|
|
|
|
def income_totals_by_category
|
|
@income_totals_by_category ||= income_totals.category_totals.index_by { |ct| ct.category.id || stable_synthetic_key(ct.category) }
|
|
end
|
|
|
|
def stable_synthetic_key(category)
|
|
if category.uncategorized?
|
|
:uncategorized
|
|
elsif category.other_investments?
|
|
:other_investments
|
|
end
|
|
end
|
|
end
|