Add scoped net-worth views (Business / House / Personal / Savings)

Replace the single global net-worth figure with a per-role breakdown.
Account gains a role (house, personal, business) and a data migration
seeds it from existing data — any account that already has a Mortgage
transaction is tagged house, the rest fall back to the role implied by
scope. The endpoint now returns business, personal, house and savings
components plus an all-up total that finally includes the business cash
the old summary-only formula was missing.

House equity is just the household account balance minus the mortgage;
savings (A Prazo) is its own component and lives alongside the other
views rather than being folded into the household figure. Net worth =
business + house + personal + savings + investments.

The Net worth page gains a pill segmented control with five views (All
/ Business / House / Personal / Savings) that re-renders the hero
number, the relevant KPI tiles and the chart for the chosen view.
Overview swaps Investments and YTD income for Business / House /
Personal / Savings tiles and moves YTD income into the month-to-date
row.

Author: xhico

finance/admin.py

@@ -16,8 +16,8 @@ class AccountAdmin(admin.ModelAdmin):
     - Allows filtering by scope and kind
     """
 
-    list_display = ("name", "bank", "scope", "kind", "iban", "currency")
-    list_filter = ("scope", "kind", "bank")
+    list_display = ("name", "bank", "scope", "role", "kind", "iban", "currency")
+    list_filter = ("scope", "role", "kind", "bank")
     search_fields = ("name", "iban", "bank")
 
 

finance/api.py

@@ -200,17 +200,82 @@ def get(self, request):
         return Response(series)
 
 
+def _account_balance_at(account, on_date):
+    """
+    Return the running balance of an account on or before a given date.
+
+    Args:
+        account (Account): The account to inspect
+        on_date (datetime.date): The cut-off date
+
+    Returns:
+        float: The latest known balance, or 0 when the account has no movements
+    """
+
+    last = account.transactions.filter(date__lte=on_date).order_by("-date", "-id").first()
+    if last and last.balance is not None:
+        return float(last.balance)
+    return 0.0
+
+
+def _compute_net_worth_series():
+    """
+    Build the net-worth time series broken down by account role.
+
+    Returns:
+        list[dict]: One entry per balance snapshot, oldest first, with the
+        business / personal / house components and the all-up net worth.
+    """
+
+    # Cache the accounts per role so we don't re-query inside the loop
+    house_accounts = list(Account.objects.filter(role=Account.Role.HOUSE))
+    personal_accounts = list(Account.objects.filter(role=Account.Role.PERSONAL))
+    business_accounts = list(Account.objects.filter(role=Account.Role.BUSINESS))
+
+    series = []
+    for snap in BalanceSnapshot.objects.order_by("as_of"):
+        as_of = snap.as_of
+        savings = float(snap.savings_total or 0)
+        investments = float(snap.investments_total or 0)
+        mortgage = float(snap.mortgage_balance or 0)
+
+        house_current = sum(_account_balance_at(a, as_of) for a in house_accounts)
+        personal_current = sum(_account_balance_at(a, as_of) for a in personal_accounts)
+        business_current = sum(_account_balance_at(a, as_of) for a in business_accounts)
+
+        # House equity is the household current account net of the mortgage;
+        # savings and investments are tracked as their own components below
+        house_total = house_current - mortgage
+        net_worth = business_current + personal_current + house_total + savings + investments
+
+        series.append(
+            {
+                "as_of": as_of.isoformat(),
+                "business": business_current,
+                "personal": personal_current,
+                "house": house_total,
+                "house_current": house_current,
+                "savings": savings,
+                "investments": investments,
+                "mortgage": mortgage,
+                "net_worth": net_worth,
+            }
+        )
+
+    return series
+
+
 class NetWorthView(APIView):
     """
-    Savings and net worth over time from the balance snapshots.
+    Net worth over time, broken down by account role.
 
-    - Reports the headline balances captured each month
-    - Computes net worth as assets minus the mortgage balance
+    - Combines the BalanceSnapshot figures with the per-account running balances
+    - Returns the business / personal / household components plus the all-up total
     """
 
     def get(self, request):
         """
-        Return the net-worth series.
+        Return the scoped net-worth series.
 
         Args:
             request (Request): The incoming request
@@ -219,24 +284,7 @@ def get(self, request):
             Response: One entry per snapshot, oldest first
         """
 
-        series = []
-        for snap in BalanceSnapshot.objects.order_by("as_of"):
-            current = float(snap.current_total or 0)
-            savings = float(snap.savings_total or 0)
-            investments = float(snap.investments_total or 0)
-            mortgage = float(snap.mortgage_balance or 0)
-            series.append(
-                {
-                    "as_of": snap.as_of.isoformat(),
-                    "current": current,
-                    "savings": savings,
-                    "investments": investments,
-                    "mortgage": mortgage,
-                    "net_worth": current + savings + investments - mortgage,
-                }
-            )
-
-        return Response(series)
+        return Response(_compute_net_worth_series())
 
 
 class AccountsView(APIView):
@@ -298,22 +346,9 @@ def get(self, request):
             Response: Headline figures for the homepage
         """
 
-        # Latest balance snapshot, if any imports have produced one
-        snap = BalanceSnapshot.objects.order_by("-as_of").first()
-        net_worth_block = None
-        if snap:
-            current = float(snap.current_total or 0)
-            savings = float(snap.savings_total or 0)
-            investments = float(snap.investments_total or 0)
-            mortgage = float(snap.mortgage_balance or 0)
-            net_worth_block = {
-                "as_of": snap.as_of.isoformat(),
-                "current": current,
-                "savings": savings,
-                "investments": investments,
-                "mortgage": mortgage,
-                "net_worth": current + savings + investments - mortgage,
-            }
+        # Latest snapshot, blended with business and personal account balances
+        series = _compute_net_worth_series()
+        net_worth_block = series[-1] if series else None
 
         # Date range we report on: current month and current calendar year
         today = date.today()

finance/migrations/0003_account_role.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.14 on 2026-05-28 16:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("finance", "0002_categoryrule"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="account",
+            name="role",
+            field=models.CharField(
+                choices=[
+                    ("house", "Household (holds the mortgage)"),
+                    ("personal", "Personal"),
+                    ("business", "Business"),
+                ],
+                default="personal",
+                max_length=10,
+            ),
+        ),
+    ]

finance/migrations/0004_populate_account_role.py

@@ -0,0 +1,62 @@
+# Author: xhico
+# Date: May 27, 2026
+"""Populate Account.role from scope and Mortgage transactions."""
+
+from django.db import migrations
+
+
+def populate_roles(apps, schema_editor):
+    """
+    Seed Account.role from existing data.
+
+    A personal account that already has any "Mortgage" category transaction is
+    tagged as the household; the rest fall back to the role implied by scope.
+
+    Args:
+        apps (StateApps): Historical app registry from the migration framework
+        schema_editor: The database schema editor (unused)
+
+    Returns:
+        None
+    """
+
+    Account = apps.get_model("finance", "Account")
+    Category = apps.get_model("finance", "Category")
+
+    # Look up the Mortgage category if the user has seeded it
+    mortgage = Category.objects.filter(name="Mortgage").first()
+    mortgage_id = mortgage.id if mortgage else None
+
+    for account in Account.objects.all():
+        if account.scope == "business":
+            account.role = "business"
+        elif mortgage_id is not None and account.transactions.filter(category_id=mortgage_id).exists():
+            account.role = "house"
+        else:
+            account.role = "personal"
+        account.save(update_fields=["role"])
+
+
+def noop(apps, schema_editor):
+    """
+    Reverse migration is a no-op since the column is dropped on rollback.
+
+    Args:
+        apps (StateApps): Unused
+        schema_editor: Unused
+
+    Returns:
+        None
+    """
+
+
+class Migration(migrations.Migration):
+    """Seed Account.role values for existing accounts."""
+
+    dependencies = [
+        ("finance", "0003_account_role"),
+    ]
+
+    operations = [
+        migrations.RunPython(populate_roles, noop),
+    ]

finance/models.py

@@ -32,11 +32,18 @@ class Kind(models.TextChoices):
         TERM = "term", "Term deposit"
         CREDIT = "credit", "Credit"
 
+    class Role(models.TextChoices):
+        HOUSE = "house", "Household (holds the mortgage)"
+        PERSONAL = "personal", "Personal"
+        BUSINESS = "business", "Business"
+
     name = models.CharField(max_length=120)
     bank = models.CharField(max_length=120)
     # Normalised IBAN (no spaces) used to match transactions to this account
     iban = models.CharField(max_length=34, unique=True)
     scope = models.CharField(max_length=10, choices=Scope.choices)
+    # Finer breakdown for net-worth views; the migration seeds this from scope
+    role = models.CharField(max_length=10, choices=Role.choices, default=Role.PERSONAL)
     kind = models.CharField(max_length=10, choices=Kind.choices, default=Kind.CURRENT)
     currency = models.CharField(max_length=3, default="EUR")
     created_at = models.DateTimeField(auto_now_add=True)