mirror of
https://github.com/we-promise/sure.git
synced 2026-09-09 08:34:26 +00:00
Brandon
686205c0ff
* feat(bills): schema and domain core for the bills subsystem First of three chunks carved out of #3083. This one carries the schema and the domain layer: no bills pages, no calendar feed, no assistant tools. Nothing here is reachable from the UI yet, so it changes no user-visible behavior on its own. Schema, in a single migration with a full down: - recurrence_rules, recurring_occurrences, recurring_allocations, recurring_price_changes and recurring_match_rejections - bill columns on recurring_transactions (bill_type, payment_url, autopay, notes, anchor and end conditions, weekend adjustment, dedup scope) - the four data backfills, in their original order Domain layer: - Schedule, the pure date PORO every cadence resolves through, and FrequencyPreset for the labels - OccurrenceGenerator, Matcher, Allocator, PriceChangeDetector, Classifier, DeclaredBill, HistoryBackfiller and PaycheckPlanner - Pipeline, tying detection to generation, plus the nightly job and rake task Existing detection code changed in three places, each a bug this schema exposes: - Cleaner used a flat two-month staleness threshold, which silently retired every quarterly and annual series - SubscriptionAuditGenerator used a flat 45-day overdue threshold, meaningless at both ends of the frequency range - CashFlowWarningGenerator read one projected entry per series, which only equalled the monthly amount because every series was monthly; weekly bills were under-counted fourfold in its 30-day projection The JSON API travels with the model rather than the UI, because the status enum widens here. The API accepts only active and inactive on write; suggested, paused and ended are lifecycle states owned by detection, so the documented enum stays truthful. Uniqueness keys gain dedup_scope alongside amount, never instead of it: a series that is not price-forked carries a blank scope, so amount is what keeps two different prices apart. Suite 7,550 runs, 0 failures. Rubocop and brakeman clean. Eager loading verified, and the migration reverses and re-applies. Includes the first review round: orphan repair matches income and refuses coincidental twins, session imports persist occurrence mappings across chunks, semimonthly anchors canonicalize, classifier keywords match whole words, and the down refuses rather than failing when price-forked rows exist. * Address second review round Bound the cross-currency default allocation by the entry leftover and the occurrence remainder, matching the same-currency path. Let keyword stems carry a suffix again after the word-boundary fix silenced them. Skip an incoherent recurrence rule row instead of rolling back the whole import. Check rollback collisions per restored index so a refusal cannot land after the bills tables are dropped. Replay the closed_at test through a real second import. Preload the orphan repair associations and move the allocator errors to locale keys. * Match index NULL semantics in the rollback collision checks GROUP BY treats NULLs as equal but the restored unique indexes do not: account_id is nullable and indexed, so two accountless rows can never collide under any of them. Excluding NULL accounts keeps the guard from refusing a rollback PostgreSQL can perform. Verified live both ways: accountless duplicates roll back, a real collision still refuses. * Address maintainer review Scope the payable debt-destination subquery to the row and its family instead of scanning every account in the installation. Batch the cash flow generator remaining-amount sums into one grouped query, matching the two sibling sites. Enforce both window bounds in the after_count branch so a future-anchored plan cannot leak past the requested end date. Skip the explicit regeneration when the day column change will fire the model callback anyway. Add the missing locale entry for the allocation currency validation.
65 lines
2.8 KiB
Ruby
65 lines
2.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
json.id recurring_transaction.id
|
|
json.amount recurring_transaction.amount_money.format
|
|
money_to_minor_units = lambda do |money|
|
|
(money.amount * money.currency.minor_unit_conversion).round(0).to_i if money
|
|
end
|
|
json.amount_cents money_to_minor_units.call(recurring_transaction.amount_money)
|
|
json.currency recurring_transaction.currency
|
|
json.expected_day_of_month recurring_transaction.expected_day_of_month
|
|
json.last_occurrence_date recurring_transaction.last_occurrence_date
|
|
json.next_expected_date recurring_transaction.next_expected_date
|
|
json.status recurring_transaction.status
|
|
json.occurrence_count recurring_transaction.occurrence_count
|
|
json.name recurring_transaction.name
|
|
json.manual recurring_transaction.manual
|
|
json.payment_url recurring_transaction.payment_url
|
|
json.autopay recurring_transaction.autopay
|
|
json.notes recurring_transaction.notes
|
|
json.expected_amount_min recurring_transaction.expected_amount_min_money&.format
|
|
json.expected_amount_min_cents money_to_minor_units.call(recurring_transaction.expected_amount_min_money)
|
|
json.expected_amount_max recurring_transaction.expected_amount_max_money&.format
|
|
json.expected_amount_max_cents money_to_minor_units.call(recurring_transaction.expected_amount_max_money)
|
|
json.expected_amount_avg recurring_transaction.expected_amount_avg_money&.format
|
|
json.expected_amount_avg_cents money_to_minor_units.call(recurring_transaction.expected_amount_avg_money)
|
|
json.bill_type recurring_transaction.bill_type
|
|
json.category_id recurring_transaction.category_id
|
|
json.anchor_date recurring_transaction.anchor_date
|
|
json.weekend_adjust recurring_transaction.weekend_adjust
|
|
json.end_mode recurring_transaction.end_mode
|
|
json.end_on recurring_transaction.end_on
|
|
json.end_after_count recurring_transaction.end_after_count
|
|
json.renews_on recurring_transaction.renews_on
|
|
json.trial_ends_on recurring_transaction.trial_ends_on
|
|
json.cancelled_on recurring_transaction.cancelled_on
|
|
json.recurrence_rules recurring_transaction.recurrence_rules do |rule|
|
|
json.frequency rule.frequency
|
|
json.interval rule.interval
|
|
json.day_of_month rule.day_of_month
|
|
json.weekday rule.weekday
|
|
json.weekday_ordinal rule.weekday_ordinal
|
|
json.month_of_year rule.month_of_year
|
|
end
|
|
json.created_at recurring_transaction.created_at.iso8601
|
|
json.updated_at recurring_transaction.updated_at.iso8601
|
|
|
|
if recurring_transaction.account.present?
|
|
json.account do
|
|
json.id recurring_transaction.account.id
|
|
json.name recurring_transaction.account.name
|
|
json.account_type recurring_transaction.account.accountable_type&.underscore
|
|
end
|
|
else
|
|
json.account nil
|
|
end
|
|
|
|
if recurring_transaction.merchant.present?
|
|
json.merchant do
|
|
json.id recurring_transaction.merchant.id
|
|
json.name recurring_transaction.merchant.name
|
|
end
|
|
else
|
|
json.merchant nil
|
|
end
|