Parse transferable days from FK instead of deriving them
The scraper never read "överlåtbara dagar" from Försäkringskassan. It only visited ansok-och-planera-foraldrapenning#/valjdagar and derived the reserved/transferable split in build_snapshot, assuming transferable days are spent before reserved ones. On real data that gave 49 for the user and 0 for the partner where FK states 129 and 71. The assumption cannot be repaired: reserved-first, transferable-first, proportional and cap-based models were all checked against real figures and none reproduces FK's accounting (reserved-first fits the partner but is 10 days off for the user). FK publishes the real numbers per parent per tier on the min-foraldrapenning page, which the scraper had never visited. - Scrape the "Dagar ni kan föra över" panel after the valjdagar extraction, summing sjukpenningnivå + lägstanivå per parent. The totals are not literals on the page. Parse only direct-child <p> elements: the first group embeds a tooltip with decoy "45 dagar"/"90 dagar" text. - build_snapshot accepts the reported value and derives reserved days from it; the old arithmetic remains only as a fallback. An implausible FK value degrades to that fallback rather than failing the fetch. - Record provenance in transferable_days_reported (migration 006) and badge derived values as estimates in the dashboard breakdown. Drop the footnote's claim that at most 150 days are transferable — real data contradicts it as a per-family figure. - Select the child's section by name when FK lists several; never guess. Verified against a live BankID scrape: scraped 240/101/139 with 129 transferable, deduced partner 240/169/71 with 71, both flagged as reported. Incidental fixes found along the way: - The fetch router never forwarded the partner's transferable figure to persist_partner_deduction, so the partner's stored snapshot would have kept the flawed split even once the parse landed. - 'deduced' snapshots were labelled "Manually entered" by a two-way ternary over a three-value union. Replaced with a compiler-checked exhaustive map. - Alembic resolved its database from alembic.ini alone, ignoring APP_SQLITE_PATH, so migrations silently targeted the developer's real database even when pointed elsewhere. env.py now resolves it, preferring -x sqlalchemy.url, then a real APP_SQLITE_PATH, then the ini value. - backend/captures/ was not ignored: the root pattern was anchored as /captures/ despite a comment saying scraper dumps must never be tracked. - CLAUDE.md quoted test counts and coverage percentages that had gone stale, which made a correct verification report look suspect. Gate thresholds kept. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DXPBfr1v7F71t6QcbHCaaT
This commit is contained in:
@@ -120,6 +120,101 @@ class TestReservedTransferableSplit:
|
||||
assert fetch.transferable_days_left == 0
|
||||
|
||||
|
||||
class TestTransferableDaysReported:
|
||||
"""`transferable_days_left` as FK's own reported figure (vs. the
|
||||
transferable-first fallback) — ground-truth numbers from real FK data,
|
||||
see the task that added this: user 129 reported -> reserved 10; partner
|
||||
71 reported -> reserved 0.
|
||||
"""
|
||||
|
||||
def test_fk_reported_transferable_user_figures(self) -> None:
|
||||
fetch = build_snapshot(
|
||||
**_ids(),
|
||||
source="scraped",
|
||||
total_days=240,
|
||||
sjukpenning_left=94,
|
||||
lagsta_niva_left=45,
|
||||
dubbeldagar_left=0,
|
||||
transferable_days_left=129,
|
||||
)
|
||||
assert fetch.days_left == 139
|
||||
assert fetch.reserved_days_left == 10
|
||||
assert fetch.transferable_days_left == 129
|
||||
assert fetch.transferable_days_reported is True
|
||||
|
||||
def test_fk_reported_transferable_partner_figures(self) -> None:
|
||||
fetch = build_snapshot(
|
||||
**_ids(),
|
||||
source="scraped",
|
||||
total_days=240,
|
||||
sjukpenning_left=26,
|
||||
lagsta_niva_left=45,
|
||||
dubbeldagar_left=0,
|
||||
transferable_days_left=71,
|
||||
)
|
||||
assert fetch.days_left == 71
|
||||
assert fetch.reserved_days_left == 0
|
||||
assert fetch.transferable_days_left == 71
|
||||
assert fetch.transferable_days_reported is True
|
||||
|
||||
def test_both_reserved_and_transferable_overrides_raises(self) -> None:
|
||||
with pytest.raises(ValidationError, match="mutually exclusive") as exc_info:
|
||||
build_snapshot(
|
||||
**_ids(),
|
||||
source="manual",
|
||||
total_days=240,
|
||||
sjukpenning_left=94,
|
||||
lagsta_niva_left=45,
|
||||
dubbeldagar_left=0,
|
||||
reserved_days_left=10,
|
||||
transferable_days_left=129,
|
||||
)
|
||||
assert exc_info.value.message_key == "parentalLeave.conflictingTransferableOverride"
|
||||
|
||||
def test_implausible_reported_transferable_raises(self) -> None:
|
||||
"""days_left is 139; a reported transferable of 200 would make
|
||||
reserved_days_left negative (139 - 200 = -61) — the existing
|
||||
negative-reserved-days validator must catch it."""
|
||||
with pytest.raises(ValidationError, match="negative") as exc_info:
|
||||
build_snapshot(
|
||||
**_ids(),
|
||||
source="scraped",
|
||||
total_days=240,
|
||||
sjukpenning_left=94,
|
||||
lagsta_niva_left=45,
|
||||
dubbeldagar_left=0,
|
||||
transferable_days_left=200,
|
||||
)
|
||||
assert exc_info.value.message_key == "parentalLeave.negativeReservedDaysLeft"
|
||||
|
||||
def test_derived_fallback_sets_transferable_days_reported_false(self) -> None:
|
||||
fetch = build_snapshot(
|
||||
**_ids(),
|
||||
source="manual",
|
||||
total_days=240,
|
||||
sjukpenning_left=60,
|
||||
lagsta_niva_left=40,
|
||||
dubbeldagar_left=60,
|
||||
)
|
||||
assert fetch.reserved_days_left == 90
|
||||
assert fetch.transferable_days_left == 10
|
||||
assert fetch.transferable_days_reported is False
|
||||
|
||||
def test_explicit_reserved_days_left_also_not_reported(self) -> None:
|
||||
"""A caller-supplied `reserved_days_left` is a user estimate too —
|
||||
only `transferable_days_left` counts as FK-reported."""
|
||||
fetch = build_snapshot(
|
||||
**_ids(),
|
||||
source="manual",
|
||||
total_days=240,
|
||||
sjukpenning_left=150,
|
||||
lagsta_niva_left=20,
|
||||
dubbeldagar_left=60,
|
||||
reserved_days_left=60,
|
||||
)
|
||||
assert fetch.transferable_days_reported is False
|
||||
|
||||
|
||||
class TestNegativeAndOverTotalGuards:
|
||||
def test_negative_sjukpenning_left_raises(self) -> None:
|
||||
with pytest.raises(ValidationError, match="negative"):
|
||||
|
||||
Reference in New Issue
Block a user