feat: API für Szenario-Zeitraum, Neuer Betrag und szenario-eigene wiederkehrende Zahlungen (A14-T3)

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-09-30 13:03:16 +02:00
parent aaf05b9209
commit 2aed685d7e
4 changed files with 259 additions and 22 deletions
@@ -1,11 +1,11 @@
 from datetime import date
 from decimal import Decimal

-from app.engine.scenario import (PlainModifier, PlainRecurring, effective_end,
-                                 modified_amount)
-from app.models.tables import (Loan, PlannedItem, RecurringItem, Scenario,
-                               ScenarioLoan, ScenarioModifier,
-                               ScenarioPlannedItem)
+from app.engine.scenario import (PlainModifier, PlainRecurring, build_cashflows,
+                                 effective_end, modified_amount)
+from app.models.tables import (Category, Loan, PlannedItem, RecurringItem,
+                               Scenario, ScenarioLoan, ScenarioModifier,
+                               ScenarioPlannedItem, ScenarioRecurringItem)
 from app.services.projection_service import load_scenario_inputs


@@ -66,3 +66,46 @@ def test_load_scenario_inputs_system_plan(db):
    assert [p.name for p in inp.planned] == ["P"]
    assert [l.name for l in inp.loans] == ["K1", "K2"]
    assert inp.modifiers == []
+
+
+def test_szenario_zahlung_zaehlt_immer_und_id_kollision(db):
+    rec = RecurringItem(name="R", amount=Decimal("-10.00"), rhythm="monthly", due_day=1)
+    sc = Scenario(name="S-A14", description="", include_recurring=False,
+                  include_planned=False)
+    db.add_all([rec, sc])
+    db.flush()
+    sri = ScenarioRecurringItem(scenario_id=sc.id, name="SR", amount=Decimal("-100.00"),
+                                rhythm="monthly", due_day=1)
+    db.add(sri)
+    db.flush()
+    # Posten-Eintrag, dessen target_id zufällig der ID der Szenario-Zahlung entspricht:
+    db.add(ScenarioModifier(scenario_id=sc.id, target_type="recurring",
+                            target_id=sri.id, kind="remove", value=Decimal("0")))
+    db.commit()
+    inp = load_scenario_inputs(db, sc)
+    # include_recurring=False: globaler Posten fehlt, Szenario-Zahlung zählt, id=None.
+    assert [(r.id, r.name) for r in inp.recurring] == [(None, "SR")]
+    flows = build_cashflows(inp.recurring, inp.planned, [], [], inp.modifiers,
+                            date(2030, 1, 1), date(2030, 1, 31))
+    assert flows == [(date(2030, 1, 1), Decimal("-100.00"))]
+    # System-Plan kennt keine Szenario-Zahlungen.
+    assert [r.name for r in load_scenario_inputs(db, None).recurring] == ["R"]
+
+
+def test_zeitraum_und_kategorie_werden_geladen(db):
+    cat = Category(name="K-A14")
+    sc = Scenario(name="S-A14b", description="")
+    db.add_all([cat, sc])
+    db.flush()
+    db.add_all([
+        ScenarioModifier(scenario_id=sc.id, target_type="category", target_id=cat.id,
+                         kind="percent", value=Decimal("50"),
+                         start_date=date(2030, 2, 1), end_date=date(2030, 3, 31)),
+        ScenarioPlannedItem(scenario_id=sc.id, name="E", amount=Decimal("-5.00"),
+                            due=date(2030, 2, 1), category_id=cat.id),
+    ])
+    db.commit()
+    inp = load_scenario_inputs(db, sc)
+    m = inp.modifiers[0]
+    assert (m.start_date, m.end_date) == (date(2030, 2, 1), date(2030, 3, 31))
+    assert [(p.name, p.category_id) for p in inp.planned] == [("E", cat.id)]