Open-source personal finance manager. Self-hosted, privacy-first.
preserve intended day_of_month when advancing recurring dates (#67)
Tássio Noronha16bf3c258231
diff --git a/backend/app/services/dashboard_service.py b/backend/app/services/dashboard_service.pyindex 6bee2154..ee99ecde 100644--- a/backend/app/services/dashboard_service.py+++ b/backend/app/services/dashboard_service.py@@ -54,6 +54,7 @@ async def _get_recurring_projections(end_date=rec.end_date,range_start=month_start,range_end=month_end,+ intended_day=rec.day_of_month or rec.start_date.day,)for occ_date in occurrences:projections.append({@@ -431,6 +432,7 @@ async def get_projected_transactions(end_date=rec.end_date,range_start=month_start,range_end=month_end,+ intended_day=rec.day_of_month or rec.start_date.day,)cat_name, cat_icon, cat_color = cat_map.get(rec.category_id, (None, None, None)) if rec.category_id else (None, None, None)diff --git a/backend/app/services/recurring_transaction_service.py b/backend/app/services/recurring_transaction_service.pyindex 8a57b4e2..b2eef814 100644--- a/backend/app/services/recurring_transaction_service.py+++ b/backend/app/services/recurring_transaction_service.py@@ -61,7 +61,10 @@ async def create_recurring_transaction(await _verify_account_owned(session, user_id, data.account_id)next_occ = data.start_dateif data.skip_first:- next_occ = _advance_date(data.start_date, data.frequency)+ next_occ = _advance_date(+ data.start_date, data.frequency,+ intended_day=data.day_of_month or data.start_date.day,+ )recurring = RecurringTransaction(user_id=user_id,account_id=data.account_id,@@ -125,51 +128,53 @@ async def delete_recurring_transaction(return True-def _advance_date(current: date, frequency: str) -> date:- """Advance a date by the given frequency."""+def _advance_date(+ current: date, frequency: str, intended_day: Optional[int] = None,+) -> date:+ """Advance a date by the given frequency.++ For monthly/yearly, ``intended_day`` is the day the user actually wants+ (e.g. 31). We cap it to the target month's length so Feb clamps to 28/29,+ but subsequent months recover to 31/30 instead of sticking at 28.+ Falls back to ``current.day`` when not provided."""if frequency == "weekly":return current + timedelta(weeks=1)- elif frequency == "monthly":- month = current.month + 1- year = current.year- if month > 12:- month = 1- year += 1- day = min(current.day, calendar.monthrange(year, month)[1])- return date(year, month, day)- elif frequency == "yearly":+ target_day = intended_day if intended_day else current.day+ if frequency == "yearly":year = current.year + 1- day = min(current.day, calendar.monthrange(year, current.month)[1])+ day = min(target_day, calendar.monthrange(year, current.month)[1])return date(year, current.month, day)- # Default: monthly+ # monthly (default)month = current.month + 1year = current.yearif month > 12:month = 1year += 1- day = min(current.day, calendar.monthrange(year, month)[1])+ day = min(target_day, calendar.monthrange(year, month)[1])return date(year, month, day)def get_occurrences_in_range(start: date, frequency: str, end_date: Optional[date],range_start: date, range_end: date,+ intended_day: Optional[int] = None,) -> list[date]:"""Compute all occurrence dates for a recurring pattern within [range_start, range_end).Pure date math — no DB writes. Used by dashboard for virtual projections."""+ day = intended_day if intended_day else start.dayoccurrences: list[date] = []current = start# Advance to range_start without collectingwhile current < range_start:if end_date and current > end_date:return occurrences- current = _advance_date(current, frequency)+ current = _advance_date(current, frequency, intended_day=day)# Collect occurrences within rangewhile current < range_end:if end_date and current > end_date:breakoccurrences.append(current)- current = _advance_date(current, frequency)+ current = _advance_date(current, frequency, intended_day=day)if len(occurrences) > 200: # safety limitbreakreturn occurrences@@ -227,7 +232,10 @@ async def generate_pending(count += 1# Advance to next occurrence- recurring.next_occurrence = _advance_date(recurring.next_occurrence, recurring.frequency)+ recurring.next_occurrence = _advance_date(+ recurring.next_occurrence, recurring.frequency,+ intended_day=recurring.day_of_month or recurring.start_date.day,+ )# Check again if past end_date after advancingif recurring.end_date and recurring.next_occurrence > recurring.end_date:diff --git a/backend/tests/test_recurring_transaction_service.py b/backend/tests/test_recurring_transaction_service.pyindex 3513d947..39e73f39 100644--- a/backend/tests/test_recurring_transaction_service.py+++ b/backend/tests/test_recurring_transaction_service.py@@ -227,6 +227,38 @@ def test_advance_date_yearly():assert _advance_date(date(2024, 2, 29), "yearly") == date(2025, 2, 28)+def test_advance_date_monthly_intended_day_recovers_after_february():+ # After Jan 31 clamps to Feb 28, advancing again must hit Mar 31 — not drift to Mar 28.+ feb = _advance_date(date(2026, 1, 31), "monthly", intended_day=31)+ assert feb == date(2026, 2, 28)+ mar = _advance_date(feb, "monthly", intended_day=31)+ assert mar == date(2026, 3, 31)+ apr = _advance_date(mar, "monthly", intended_day=31)+ assert apr == date(2026, 4, 30) # April has 30 days+ may = _advance_date(apr, "monthly", intended_day=31)+ assert may == date(2026, 5, 31)+++def test_advance_date_monthly_intended_day_30():+ # Day 30 pattern: Jan 30 -> Feb 28 -> Mar 30 (not Mar 28).+ feb = _advance_date(date(2026, 1, 30), "monthly", intended_day=30)+ assert feb == date(2026, 2, 28)+ mar = _advance_date(feb, "monthly", intended_day=30)+ assert mar == date(2026, 3, 30)+++def test_advance_date_yearly_intended_day_leap_recovery():+ # Feb 29 on a leap year should recover to Feb 29 four years later, not stick at 28.+ y1 = _advance_date(date(2024, 2, 29), "yearly", intended_day=29)+ assert y1 == date(2025, 2, 28)+ y2 = _advance_date(y1, "yearly", intended_day=29)+ assert y2 == date(2026, 2, 28)+ y3 = _advance_date(y2, "yearly", intended_day=29)+ assert y3 == date(2027, 2, 28)+ y4 = _advance_date(y3, "yearly", intended_day=29)+ assert y4 == date(2028, 2, 29)++# ---------------------------------------------------------------------------# get_occurrences_in_range# ---------------------------------------------------------------------------@@ -276,6 +308,65 @@ def test_get_occurrences_in_range_empty():assert occurrences == []+def test_get_occurrences_in_range_monthly_day_31_does_not_drift():+ # Regression test for #67: after Feb clamps to 28, subsequent months must+ # recover to their true month-end (31 / 30 / 31 / 30) instead of sticking at 28.+ occurrences = get_occurrences_in_range(+ start=date(2026, 1, 31),+ frequency="monthly",+ end_date=None,+ range_start=date(2026, 1, 1),+ range_end=date(2026, 7, 1),+ intended_day=31,+ )+ assert occurrences == [+ date(2026, 1, 31),+ date(2026, 2, 28),+ date(2026, 3, 31),+ date(2026, 4, 30),+ date(2026, 5, 31),+ date(2026, 6, 30),+ ]+++def test_get_occurrences_in_range_monthly_day_30_does_not_drift():+ occurrences = get_occurrences_in_range(+ start=date(2026, 1, 30),+ frequency="monthly",+ end_date=None,+ range_start=date(2026, 1, 1),+ range_end=date(2026, 7, 1),+ intended_day=30,+ )+ assert occurrences == [+ date(2026, 1, 30),+ date(2026, 2, 28),+ date(2026, 3, 30),+ date(2026, 4, 30),+ date(2026, 5, 30),+ date(2026, 6, 30),+ ]+++def test_get_occurrences_in_range_monthly_day_29_does_not_drift():+ occurrences = get_occurrences_in_range(+ start=date(2026, 1, 29),+ frequency="monthly",+ end_date=None,+ range_start=date(2026, 1, 1),+ range_end=date(2026, 7, 1),+ intended_day=29,+ )+ assert occurrences == [+ date(2026, 1, 29),+ date(2026, 2, 28),+ date(2026, 3, 29),+ date(2026, 4, 29),+ date(2026, 5, 29),+ date(2026, 6, 29),+ ]++# ---------------------------------------------------------------------------# generate_pending# ---------------------------------------------------------------------------