Skip to content

Open-source personal finance manager. Self-hosted, privacy-first.

Add wallet tracking for goals (#356)

Romulo Gatto543bbeac83e1
diff --git a/backend/alembic/versions/063_goal_asset_group_tracking.py b/backend/alembic/versions/063_goal_asset_group_tracking.py
new file mode 100644
index 00000000..adfdc6c9
--- /dev/null
+++ b/backend/alembic/versions/063_goal_asset_group_tracking.py
@@ -0,0 +1,36 @@
+"""add asset group tracking to goals
+
+Revision ID: 063
+Revises: 062
+Create Date: 2026-06-20
+"""
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+revision: str = "063"
+down_revision: Union[str, None] = "062"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+ with op.batch_alter_table("goals") as batch_op:
+ batch_op.add_column(
+ sa.Column("asset_group_id", postgresql.UUID(as_uuid=True), nullable=True),
+ )
+ batch_op.create_foreign_key(
+ "fk_goals_asset_group_id",
+ "asset_groups",
+ ["asset_group_id"],
+ ["id"],
+ ondelete="SET NULL",
+ )
+
+
+def downgrade() -> None:
+ with op.batch_alter_table("goals") as batch_op:
+ batch_op.drop_constraint("fk_goals_asset_group_id", type_="foreignkey")
+ batch_op.drop_column("asset_group_id")
diff --git a/backend/app/api/goals.py b/backend/app/api/goals.py
index 8b5c4334..1ad0b240 100644
--- a/backend/app/api/goals.py
+++ b/backend/app/api/goals.py
@@ -65,7 +65,10 @@ async def update_goal(
ctx: WorkspaceContext = Depends(current_writable_workspace),
session: AsyncSession = Depends(get_async_session),
):
- goal = await goal_service.update_goal(session, goal_id, ctx.workspace.id, ctx.user_id, data)
+ try:
+ goal = await goal_service.update_goal(session, goal_id, ctx.workspace.id, ctx.user_id, data)
+ except ValueError as e:
+ raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
if not goal:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Goal not found")
return goal
diff --git a/backend/app/models/goal.py b/backend/app/models/goal.py
index bebaf9c1..d14663c7 100644
--- a/backend/app/models/goal.py
+++ b/backend/app/models/goal.py
@@ -14,6 +14,7 @@ from app.core.database import Base
if TYPE_CHECKING:
from app.models.account import Account
from app.models.asset import Asset
+ from app.models.asset_group import AssetGroup
from app.models.user import User
@@ -33,9 +34,10 @@ class Goal(Base):
target_amount_primary: Mapped[Optional[Decimal]] = mapped_column(Numeric(precision=15, scale=2), nullable=True)
current_amount_primary: Mapped[Optional[Decimal]] = mapped_column(Numeric(precision=15, scale=2), nullable=True)
target_date: Mapped[Optional[date]] = mapped_column(Date, nullable=True)
- tracking_type: Mapped[str] = mapped_column(String(20), default="manual") # manual, account, asset, net_worth
+ tracking_type: Mapped[str] = mapped_column(String(20), default="manual") # manual, account, asset, asset_group, net_worth
account_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("accounts.id", ondelete="SET NULL"), nullable=True)
asset_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("assets.id"), nullable=True)
+ asset_group_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("asset_groups.id", ondelete="SET NULL"), nullable=True)
status: Mapped[str] = mapped_column(String(20), default="active") # active, completed, paused, archived
icon: Mapped[Optional[str]] = mapped_column(String(50), nullable=True)
color: Mapped[Optional[str]] = mapped_column(String(7), nullable=True)
@@ -47,3 +49,4 @@ class Goal(Base):
user: Mapped["User"] = relationship()
account: Mapped[Optional["Account"]] = relationship()
asset: Mapped[Optional["Asset"]] = relationship()
+ asset_group: Mapped[Optional["AssetGroup"]] = relationship()
diff --git a/backend/app/schemas/goal.py b/backend/app/schemas/goal.py
index 05d46de2..b80ddf57 100644
--- a/backend/app/schemas/goal.py
+++ b/backend/app/schemas/goal.py
@@ -15,6 +15,7 @@ class GoalCreate(BaseModel):
tracking_type: str = "manual"
account_id: Optional[uuid.UUID] = None
asset_id: Optional[uuid.UUID] = None
+ asset_group_id: Optional[uuid.UUID] = None
icon: Optional[str] = None
color: Optional[str] = None
metadata_json: Optional[Any] = None
@@ -22,8 +23,8 @@ class GoalCreate(BaseModel):
@field_validator("tracking_type")
@classmethod
def validate_tracking_type(cls, v: str) -> str:
- if v not in ("manual", "account", "asset", "net_worth"):
- raise ValueError("tracking_type must be manual, account, asset, or net_worth")
+ if v not in ("manual", "account", "asset", "asset_group", "net_worth"):
+ raise ValueError("tracking_type must be manual, account, asset, asset_group, or net_worth")
return v
@@ -36,6 +37,7 @@ class GoalUpdate(BaseModel):
tracking_type: Optional[str] = None
account_id: Optional[uuid.UUID] = None
asset_id: Optional[uuid.UUID] = None
+ asset_group_id: Optional[uuid.UUID] = None
status: Optional[str] = None
icon: Optional[str] = None
color: Optional[str] = None
@@ -52,8 +54,8 @@ class GoalUpdate(BaseModel):
@field_validator("tracking_type")
@classmethod
def validate_tracking_type(cls, v: Optional[str]) -> Optional[str]:
- if v is not None and v not in ("manual", "account", "asset", "net_worth"):
- raise ValueError("tracking_type must be manual, account, asset, or net_worth")
+ if v is not None and v not in ("manual", "account", "asset", "asset_group", "net_worth"):
+ raise ValueError("tracking_type must be manual, account, asset, asset_group, or net_worth")
return v
@@ -70,6 +72,7 @@ class GoalRead(BaseModel):
tracking_type: str
account_id: Optional[uuid.UUID] = None
asset_id: Optional[uuid.UUID] = None
+ asset_group_id: Optional[uuid.UUID] = None
status: str
icon: Optional[str] = None
color: Optional[str] = None
@@ -86,6 +89,7 @@ class GoalRead(BaseModel):
# Linked account/asset info
account_name: Optional[str] = None
asset_name: Optional[str] = None
+ asset_group_name: Optional[str] = None
model_config = ConfigDict(from_attributes=True)
diff --git a/backend/app/services/goal_service.py b/backend/app/services/goal_service.py
index b69f5d04..ac0797c1 100644
--- a/backend/app/services/goal_service.py
+++ b/backend/app/services/goal_service.py
@@ -9,6 +9,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from app.core.config import get_settings
from app.models.account import Account
from app.models.asset import Asset
+from app.models.asset_group import AssetGroup
from app.models.goal import Goal
from app.models.user import User
from app.schemas.goal import GoalCreate, GoalRead, GoalSummary, GoalUpdate
@@ -23,6 +24,35 @@ async def _get_primary_currency(session: AsyncSession, user_id: uuid.UUID) -> st
return user.primary_currency if user else get_settings().default_currency
+async def _convert_amount(
+ session: AsyncSession, amount: Decimal, from_currency: str, to_currency: str
+) -> Decimal:
+ if from_currency == to_currency:
+ return amount
+ converted, _ = await convert(session, amount, from_currency, to_currency)
+ return converted
+
+
+async def _sum_native_totals_in_currency(
+ session: AsyncSession, totals_by_currency: dict[str, float], target_currency: str
+) -> Decimal:
+ total = Decimal("0")
+ for currency, amount in totals_by_currency.items():
+ total += await _convert_amount(session, Decimal(str(amount)), currency, target_currency)
+ return total
+
+
+async def _linked_name(session: AsyncSession, model: type, item_id: uuid.UUID | None) -> Optional[str]:
+ if not item_id:
+ return None
+ item = await session.get(model, item_id)
+ if not item:
+ return None
+ if isinstance(item, Account):
+ return get_account_name(item)
+ return item.name
+
+
async def _resolve_current_amount(
session: AsyncSession, goal: Goal, user_id: uuid.UUID
) -> Decimal:
@@ -39,12 +69,7 @@ async def _resolve_current_amount(
if account:
# Use dashboard's balance logic so manual accounts are computed correctly
bal = Decimal(str(await _account_balance_at(session, account, date.today())))
- if account.currency != goal_currency:
- converted, _ = await convert(
- session, bal, account.currency, goal_currency
- )
- return converted
- return bal
+ return await _convert_amount(session, bal, account.currency, goal_currency)
return goal.current_amount
elif goal.tracking_type == "asset" and goal.asset_id:
asset = await session.get(Asset, goal.asset_id)
@@ -52,13 +77,15 @@ async def _resolve_current_amount(
latest = await _get_latest_value(session, asset.id)
value = _compute_current_value(asset, latest)
if value is not None:
- bal = Decimal(str(value))
- if asset.currency != goal_currency:
- converted, _ = await convert(
- session, bal, asset.currency, goal_currency
- )
- return converted
- return bal
+ return await _convert_amount(session, Decimal(str(value)), asset.currency, goal_currency)
+ return goal.current_amount
+ elif goal.tracking_type == "asset_group" and goal.asset_group_id:
+ group = await session.get(AssetGroup, goal.asset_group_id)
+ if group:
+ assets_by_currency, _ = await get_asset_values_at(
+ session, workspace_id, by_workspace=True, group_ids=[group.id]
+ )
+ return await _sum_native_totals_in_currency(session, assets_by_currency, goal_currency)
return goal.current_amount
elif goal.tracking_type == "net_worth":
# Reuse dashboard's account query and balance logic so manual accounts
@@ -68,26 +95,44 @@ async def _resolve_current_amount(
total = Decimal("0")
for acc in accounts:
bal = Decimal(str(await _account_balance_at(session, acc, today)))
- if acc.currency == goal_currency:
- total += bal
- else:
- converted, _ = await convert(session, bal, acc.currency, goal_currency)
- total += converted
+ total += await _convert_amount(session, bal, acc.currency, goal_currency)
# Add asset values (scoped by the goal's workspace).
assets_by_currency, _ = await get_asset_values_at(session, workspace_id, by_workspace=True)
- for currency, amount in assets_by_currency.items():
- if currency == goal_currency:
- total += Decimal(str(amount))
- else:
- converted, _ = await convert(session, Decimal(str(amount)), currency, goal_currency)
- total += converted
+ total += await _sum_native_totals_in_currency(session, assets_by_currency, goal_currency)
return total
else:
return goal.current_amount
+async def _ensure_goal_link_scope(
+ session: AsyncSession, workspace_id: uuid.UUID, data: GoalCreate | GoalUpdate
+) -> None:
+ """Validate linked tracking targets stay inside the current workspace."""
+ checks = [
+ (data.account_id, Account, "Linked account not found"),
+ (data.asset_id, Asset, "Linked asset not found"),
+ (data.asset_group_id, AssetGroup, "Linked wallet not found"),
+ ]
+ for item_id, model, error in checks:
+ if not item_id:
+ continue
+ item = await session.get(model, item_id)
+ if not item or item.workspace_id != workspace_id:
+ raise ValueError(error)
+
+
+def _clear_inactive_tracking_links(goal: Goal) -> None:
+ """Keep only the link field used by the selected tracking type."""
+ if goal.tracking_type != "account":
+ goal.account_id = None
+ if goal.tracking_type != "asset":
+ goal.asset_id = None
+ if goal.tracking_type != "asset_group":
+ goal.asset_group_id = None
+
+
def _compute_percentage(current: Decimal, target: Decimal) -> float:
if target <= 0:
return 100.0 if current > 0 else 0.0
@@ -164,31 +209,17 @@ async def _enrich_goal(
current, goal.target_amount, goal.target_date, goal_start, goal.initial_amount
)
- # Get linked account/asset name
- account_name = None
- if goal.account_id:
- account = await session.get(Account, goal.account_id)
- if account:
- account_name = get_account_name(account)
- asset_name = None
- if goal.asset_id:
- asset = await session.get(Asset, goal.asset_id)
- if asset:
- asset_name = asset.name
+ account_name = await _linked_name(session, Account, goal.account_id)
+ asset_name = await _linked_name(session, Asset, goal.asset_id)
+ asset_group_name = await _linked_name(session, AssetGroup, goal.asset_group_id)
# Convert to primary currency if needed
primary_currency = await _get_primary_currency(session, user_id)
target_primary = None
current_primary = None
if goal.currency != primary_currency:
- target_converted, _ = await convert(
- session, goal.target_amount, goal.currency, primary_currency
- )
- current_converted, _ = await convert(
- session, current, goal.currency, primary_currency
- )
- target_primary = target_converted
- current_primary = current_converted
+ target_primary = await _convert_amount(session, goal.target_amount, goal.currency, primary_currency)
+ current_primary = await _convert_amount(session, current, goal.currency, primary_currency)
return GoalRead(
id=goal.id,
@@ -203,6 +234,7 @@ async def _enrich_goal(
tracking_type=goal.tracking_type,
account_id=goal.account_id,
asset_id=goal.asset_id,
+ asset_group_id=goal.asset_group_id,
status=goal.status,
icon=goal.icon,
color=goal.color,
@@ -215,6 +247,7 @@ async def _enrich_goal(
on_track=on_track,
account_name=account_name,
asset_name=asset_name,
+ asset_group_name=asset_group_name,
)
@@ -253,6 +286,7 @@ async def create_goal(
user_id: uuid.UUID,
data: GoalCreate,
) -> GoalRead:
+ await _ensure_goal_link_scope(session, workspace_id, data)
goal = Goal(
user_id=user_id,
workspace_id=workspace_id,
@@ -264,10 +298,12 @@ async def create_goal(
tracking_type=data.tracking_type,
account_id=data.account_id,
asset_id=data.asset_id,
+ asset_group_id=data.asset_group_id,
icon=data.icon,
color=data.color,
metadata_json=data.metadata_json,
)
+ _clear_inactive_tracking_links(goal)
# Capture the starting balance so on-track logic measures progress from baseline
initial = await _resolve_current_amount(session, goal, user_id)
goal.initial_amount = initial
@@ -290,8 +326,10 @@ async def update_goal(
goal = result.scalar_one_or_none()
if not goal:
return None
+ await _ensure_goal_link_scope(session, workspace_id, data)
for field, value in data.model_dump(exclude_unset=True).items():
setattr(goal, field, value)
+ _clear_inactive_tracking_links(goal)
await session.commit()
await session.refresh(goal)
return await _enrich_goal(session, goal, user_id)
diff --git a/backend/tests/test_goal_service_coverage.py b/backend/tests/test_goal_service_coverage.py
index 40d88916..06cec7dc 100644
--- a/backend/tests/test_goal_service_coverage.py
+++ b/backend/tests/test_goal_service_coverage.py
@@ -13,6 +13,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from app.models.account import Account
from app.models.asset import Asset
+from app.models.asset_group import AssetGroup
from app.models.asset_value import AssetValue
from app.models.fx_rate import FxRate
from app.models.goal import Goal
@@ -64,11 +65,11 @@ async def _add_txn(session, user_id, account_id, workspace_id, amount, typ, dt,
await session.commit()
-async def _make_asset(session, user_id, workspace_id, *, currency="BRL", price="0.00"):
+async def _make_asset(session, user_id, workspace_id, *, currency="BRL", price="0.00", group_id=None):
asset = Asset(
id=uuid.uuid4(), user_id=user_id, workspace_id=workspace_id,
name="Goal Asset", type="investment", currency=currency,
- purchase_price=Decimal(price),
+ purchase_price=Decimal(price), group_id=group_id,
)
session.add(asset)
await session.commit()
@@ -76,6 +77,17 @@ async def _make_asset(session, user_id, workspace_id, *, currency="BRL", price="
return asset
+async def _make_asset_group(session, user_id, workspace_id, *, name="Emergency Wallet"):
+ group = AssetGroup(
+ id=uuid.uuid4(), user_id=user_id, workspace_id=workspace_id,
+ name=name, icon="wallet", color="#0EA5E9",
+ )
+ session.add(group)
+ await session.commit()
+ await session.refresh(group)
+ return group
+
+
async def _make_goal(session, user_id, workspace_id, **kwargs):
defaults = dict(
id=uuid.uuid4(), user_id=user_id, workspace_id=workspace_id,
@@ -361,6 +373,55 @@ async def test_resolve_asset_missing_fallback(session, test_user, test_workspace
assert val == Decimal("55")
+async def test_resolve_asset_group_same_currency(session, test_user, test_workspace):
+ group = await _make_asset_group(session, test_user.id, test_workspace.id)
+ await _make_asset(
+ session, test_user.id, test_workspace.id,
+ currency="BRL", price="1250", group_id=group.id,
+ )
+ await _make_asset(
+ session, test_user.id, test_workspace.id,
+ currency="BRL", price="750", group_id=group.id,
+ )
+ await _make_asset(session, test_user.id, test_workspace.id, currency="BRL", price="999")
+ goal = await _make_goal(
+ session, test_user.id, test_workspace.id,
+ tracking_type="asset_group", asset_group_id=group.id, currency="BRL",
+ )
+ val = await _resolve_current_amount(session, goal, test_user.id)
+ assert val == pytest.approx(Decimal("2000"))
+
+
+async def test_resolve_asset_group_cross_currency(session, test_user, test_workspace):
+ today = date.today()
+ session.add(FxRate(base_currency="USD", quote_currency="BRL", date=today,
+ rate=Decimal("5.0"), source="test"))
+ group = await _make_asset_group(session, test_user.id, test_workspace.id)
+ await _make_asset(
+ session, test_user.id, test_workspace.id,
+ currency="USD", price="100", group_id=group.id,
+ )
+ await session.commit()
+ goal = await _make_goal(
+ session, test_user.id, test_workspace.id,
+ tracking_type="asset_group", asset_group_id=group.id, currency="BRL",
+ )
+ val = await _resolve_current_amount(session, goal, test_user.id)
+ assert float(val) == pytest.approx(500.0, abs=1.0)
+
+
+async def test_resolve_asset_group_missing_fallback(session, test_user, test_workspace):
+ goal = await _make_goal(
+ session, test_user.id, test_workspace.id,
+ tracking_type="asset_group", asset_group_id=uuid.uuid4(), current_amount=Decimal("88"),
+ )
+ val = await _resolve_current_amount(session, goal, test_user.id)
+ assert val == Decimal("88")
+
+
# ---------------------------------------------------------------------------
# _resolve_current_amount — net_worth
# ---------------------------------------------------------------------------
@@ -415,16 +476,18 @@ async def test_resolve_net_worth_cross_currency(session, test_user, test_workspa
@pytest.mark.asyncio
-async def test_enrich_goal_account_and_asset_names(session, test_user, test_workspace):
+async def test_enrich_goal_linked_names(session, test_user, test_workspace):
acc = await _make_account(session, test_user.id, test_workspace.id, currency="BRL")
asset = await _make_asset(session, test_user.id, test_workspace.id, currency="BRL", price="0")
+ group = await _make_asset_group(session, test_user.id, test_workspace.id, name="Reserva de emergência")
goal = await _make_goal(
session, test_user.id, test_workspace.id,
- tracking_type="manual", account_id=acc.id, asset_id=asset.id,
+ tracking_type="manual", account_id=acc.id, asset_id=asset.id, asset_group_id=group.id,
)
enriched = await _enrich_goal(session, goal, test_user.id)
assert enriched.account_name is not None
assert enriched.asset_name == "Goal Asset"
+ assert enriched.asset_group_name == "Reserva de emergência"
@pytest.mark.asyncio
diff --git a/backend/tests/test_goals_api.py b/backend/tests/test_goals_api.py
index b4350d86..5e830027 100644
--- a/backend/tests/test_goals_api.py
+++ b/backend/tests/test_goals_api.py
@@ -8,6 +8,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from app.models.account import Account
from app.models.asset import Asset
+from app.models.asset_group import AssetGroup
from app.models.fx_rate import FxRate
from app.models.user import User
@@ -238,7 +239,7 @@ async def test_update_goal_tracking_type(client: AsyncClient, auth_headers: dict
)
goal_id = resp.json()["id"]
- for tracking_type in ("manual", "account", "asset", "net_worth"):
+ for tracking_type in ("manual", "account", "asset", "asset_group", "net_worth"):
response = await client.patch(
f"/api/goals/{goal_id}",
json={"tracking_type": tracking_type},
@@ -476,6 +477,72 @@ async def test_goal_net_worth_tracking(
assert float(data["current_amount"]) > 0
+async def test_goal_asset_group_tracking(
+ client: AsyncClient, auth_headers: dict, test_user: User, test_workspace, session: AsyncSession
+):
+ """Goal with tracking_type=asset_group should track combined wallet asset value."""
+ group = AssetGroup(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ workspace_id=test_workspace.id,
+ name="Reserva de emergência",
+ icon="wallet",
+ color="#0EA5E9",
+ )
+ session.add(group)
+ asset_one = Asset(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ workspace_id=test_workspace.id,
+ name="Cofrinho depósito 1",
+ type="investment",
+ currency="BRL",
+ purchase_price=Decimal("1200.00"),
+ group_id=group.id,
+ )
+ asset_two = Asset(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ workspace_id=test_workspace.id,
+ name="Cofrinho depósito 2",
+ type="investment",
+ currency="BRL",
+ purchase_price=Decimal("800.00"),
+ group_id=group.id,
+ )
+ outside_asset = Asset(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ workspace_id=test_workspace.id,
+ name="Other asset",
+ type="investment",
+ currency="BRL",
+ purchase_price=Decimal("999.00"),
+ )
+ session.add_all([asset_one, asset_two, outside_asset])
+ await session.commit()
+
+ response = await client.post(
+ "/api/goals",
+ json={
+ "name": "Emergency Reserve",
+ "target_amount": "5000.00",
+ "currency": "BRL",
+ "tracking_type": "asset_group",
+ "asset_group_id": str(group.id),
+ },
+ headers=auth_headers,
+ )
+ assert response.status_code == 201
+ data = response.json()
+ assert data["tracking_type"] == "asset_group"
+ assert data["asset_group_id"] == str(group.id)
+ assert data["asset_group_name"] == "Reserva de emergência"
+ assert float(data["current_amount"]) == 2000.00
+ assert data["percentage"] == 40.0
+
+
@pytest.mark.asyncio
async def test_goal_asset_tracking(
client: AsyncClient, auth_headers: dict, test_user: User, session: AsyncSession
diff --git a/docs/pr-356/goal-wallet-dialog.png b/docs/pr-356/goal-wallet-dialog.png
new file mode 100644
index 00000000..d6d69af2
Binary files /dev/null and b/docs/pr-356/goal-wallet-dialog.png differ
diff --git a/docs/pr-356/goal-wallet-list.png b/docs/pr-356/goal-wallet-list.png
new file mode 100644
index 00000000..f326d40f
Binary files /dev/null and b/docs/pr-356/goal-wallet-list.png differ
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1da64802..6430f946 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -703,7 +703,11 @@
"viewAll": "View all goals",
"dashboardTitle": "Goals Progress",
"noTargetDate": "No deadline",
- "dashboardEmpty": "No goals yet. Set a target and start tracking your progress!"
+ "dashboardEmpty": "No goals yet. Set a target and start tracking your progress!",
+ "trackingWallet": "Wallet",
+ "wallet": "Wallet",
+ "selectWallet": "Select wallet",
+ "walletHint": "Track this goal with the combined value of all assets in the selected wallet."
},
"recurring": {
"title": "Recurring Transactions",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 11ea5c68..c69be8dc 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -703,7 +703,11 @@
"viewAll": "Ver todos los objetivos",
"dashboardTitle": "Progreso de objetivos",
"noTargetDate": "Sin fecha límite",
- "dashboardEmpty": "Aún no hay objetivos. Define una meta y empieza a seguir tu progreso."
+ "dashboardEmpty": "Aún no hay objetivos. Define una meta y empieza a seguir tu progreso.",
+ "trackingWallet": "Cartera",
+ "wallet": "Cartera",
+ "selectWallet": "Seleccionar cartera",
+ "walletHint": "Sigue este objetivo con el valor combinado de todos los activos en la cartera seleccionada."
},
"recurring": {
"title": "Transacciones recurrentes",
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index 539ff163..e8499c1e 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -703,7 +703,11 @@
"viewAll": "Visualizza tutti gli obiettivi",
"dashboardTitle": "Progresso obiettivi",
"noTargetDate": "Nessuna scadenza",
- "dashboardEmpty": "Ancora nessun obiettivo. Imposta un traguardo e inizia a tracciare i tuoi progressi!"
+ "dashboardEmpty": "Ancora nessun obiettivo. Imposta un traguardo e inizia a tracciare i tuoi progressi!",
+ "trackingWallet": "Portafoglio",
+ "wallet": "Portafoglio",
+ "selectWallet": "Seleziona portafoglio",
+ "walletHint": "Monitora questo obiettivo con il valore combinato di tutti gli asset nel portafoglio selezionato."
},
"recurring": {
"title": "Transazioni ricorrenti",
diff --git a/frontend/src/locales/pl.json b/frontend/src/locales/pl.json
index 18ea52c2..4c9ba077 100644
--- a/frontend/src/locales/pl.json
+++ b/frontend/src/locales/pl.json
@@ -745,7 +745,11 @@
"viewAll": "Zobacz wszystkie cele",
"dashboardTitle": "Postęp celów",
"noTargetDate": "Brak terminu",
- "dashboardEmpty": "Brak celów. Ustaw cel i zacznij śledzić swój postęp!"
+ "dashboardEmpty": "Brak celów. Ustaw cel i zacznij śledzić swój postęp!",
+ "trackingWallet": "Portfel",
+ "wallet": "Portfel",
+ "selectWallet": "Wybierz portfel",
+ "walletHint": "Śledź ten cel według łącznej wartości wszystkich aktywów w wybranym portfelu."
},
"recurring": {
"title": "Transakcje cykliczne",
diff --git a/frontend/src/locales/pt-BR.json b/frontend/src/locales/pt-BR.json
index dfe897c9..f9cb24e1 100644
--- a/frontend/src/locales/pt-BR.json
+++ b/frontend/src/locales/pt-BR.json
@@ -703,7 +703,11 @@
"viewAll": "Ver todas as metas",
"dashboardTitle": "Progresso das Metas",
"noTargetDate": "Sem prazo",
- "dashboardEmpty": "Nenhuma meta ainda. Defina um objetivo e comece a acompanhar seu progresso!"
+ "dashboardEmpty": "Nenhuma meta ainda. Defina um objetivo e comece a acompanhar seu progresso!",
+ "trackingWallet": "Carteira",
+ "wallet": "Carteira",
+ "selectWallet": "Selecionar carteira",
+ "walletHint": "Acompanhe este objetivo pelo valor combinado de todos os ativos na carteira selecionada."
},
"recurring": {
"title": "Transações Recorrentes",
diff --git a/frontend/src/locales/ru.json b/frontend/src/locales/ru.json
index 2fd787f5..06a24568 100644
--- a/frontend/src/locales/ru.json
+++ b/frontend/src/locales/ru.json
@@ -703,7 +703,11 @@
"viewAll": "Посмотреть все цели",
"dashboardTitle": "Прогресс целей",
"noTargetDate": "Без срока",
- "dashboardEmpty": "Целей пока нет. Установите цель и начните отслеживать прогресс!"
+ "dashboardEmpty": "Целей пока нет. Установите цель и начните отслеживать прогресс!",
+ "trackingWallet": "Кошелек",
+ "wallet": "Кошелек",
+ "selectWallet": "Выберите кошелек",
+ "walletHint": "Отслеживайте эту цель по суммарной стоимости всех активов в выбранном кошельке."
},
"recurring": {
"title": "Регулярные транзакции",
diff --git a/frontend/src/locales/uk.json b/frontend/src/locales/uk.json
index b9318af5..682466af 100644
--- a/frontend/src/locales/uk.json
+++ b/frontend/src/locales/uk.json
@@ -703,7 +703,11 @@
"viewAll": "Переглянути всі цілі",
"dashboardTitle": "Прогрес цілей",
"noTargetDate": "Без терміну",
- "dashboardEmpty": "Цілей поки немає. Установіть ціль і почніть відстежувати прогрес!"
+ "dashboardEmpty": "Цілей поки немає. Установіть ціль і почніть відстежувати прогрес!",
+ "trackingWallet": "Гаманець",
+ "wallet": "Гаманець",
+ "selectWallet": "Виберіть гаманець",
+ "walletHint": "Відстежуйте цю ціль за сумарною вартістю всіх активів у вибраному гаманці."
},
"recurring": {
"title": "Регулярні транзакції",
diff --git a/frontend/src/pages/goals.tsx b/frontend/src/pages/goals.tsx
index c840f303..fcdb7fba 100644
--- a/frontend/src/pages/goals.tsx
+++ b/frontend/src/pages/goals.tsx
@@ -3,7 +3,7 @@ import { getAccountName } from '@/lib/account-utils'
import { useTranslation } from 'react-i18next'
import { useDisplayLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
-import { goals as goalsApi, accounts as accountsApi, assets as assetsApi, currencies as currenciesApi } from '@/lib/api'
+import { goals as goalsApi, accounts as accountsApi, assets as assetsApi, assetGroups as assetGroupsApi, currencies as currenciesApi } from '@/lib/api'
import { toast } from 'sonner'
import { Button } from '@/components/ui/button'
import { DatePickerInput } from '@/components/ui/date-picker-input'
@@ -21,7 +21,7 @@ import {
PopoverTrigger,
PopoverContent,
} from '@/components/ui/popover'
-import type { Goal } from '@/types'
+import type { Account, Asset, AssetGroup, Goal } from '@/types'
import {
Pencil, Trash2, Plus, Pause, Play, CheckCircle2, Archive, Target,
ChevronDown,
@@ -46,6 +46,41 @@ const PRESET_COLORS = [
'#8B5CF6', '#EC4899', '#06B6D4', '#F97316',
]
+const SELECT_CLASS = 'w-full border border-border rounded-lg px-3 py-2 text-sm bg-card text-foreground focus:outline-none focus:ring-2 focus:ring-primary'
+
+function LinkedResourceSelect<T extends { id: string }>({
+ name,
+ label,
+ placeholder,
+ defaultValue,
+ items,
+ renderOption,
+ hint,
+}: {
+ name: string
+ label: string
+ placeholder: string
+ defaultValue: string | null | undefined
+ items: T[] | undefined
+ renderOption: (item: T) => React.ReactNode
+ hint?: string
+}) {
+ return (
+ <div className="space-y-2">
+ <Label>{label}</Label>
+ <select name={name} defaultValue={defaultValue ?? ''} className={SELECT_CLASS} required>
+ <option value="">{placeholder}</option>
+ {items?.map((item) => (
+ <option key={item.id} value={item.id}>
+ {renderOption(item)}
+ </option>
+ ))}
+ </select>
+ {hint && <p className="text-xs text-muted-foreground">{hint}</p>}
+ </div>
+ )
+}
+
function SectionCard({ children }: { children: React.ReactNode }) {
return (
<div className="bg-card rounded-xl border border-border shadow-sm overflow-hidden">
@@ -133,6 +168,11 @@ export default function GoalsPage() {
queryFn: () => assetsApi.list(),
})
+ const { data: walletsList } = useQuery({
+ queryKey: ['asset-groups'],
+ queryFn: assetGroupsApi.list,
+ })
+
const { data: supportedCurrencies } = useQuery({
queryKey: ['currencies'],
queryFn: currenciesApi.list,
@@ -302,6 +342,9 @@ export default function GoalsPage() {
{goal.asset_name && (
<span>{goal.asset_name}</span>
)}
+ {goal.asset_group_name && (
+ <span>{goal.asset_group_name}</span>
+ )}
</div>
</div>
@@ -400,6 +443,9 @@ export default function GoalsPage() {
if (tt === 'asset') {
payload.asset_id = (formData.get('asset_id') as string) || null
}
+ if (tt === 'asset_group') {
+ payload.asset_group_id = (formData.get('asset_group_id') as string) || null
+ }
if (editing) {
updateMutation.mutate({ id: editing.id, ...payload } as Partial<Goal> & { id: string })
@@ -430,7 +476,7 @@ export default function GoalsPage() {
<select
name="currency"
defaultValue={editing?.currency ?? userCurrency}
- className="w-full border border-border rounded-lg px-3 py-2 text-sm bg-card text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
+ className={SELECT_CLASS}
>
{supportedCurrencies?.map((c: { code: string; name: string; flag: string }) => (
<option key={c.code} value={c.code}>
@@ -456,11 +502,12 @@ export default function GoalsPage() {
name="tracking_type"
value={trackingType}
onChange={(e) => setTrackingType(e.target.value)}
- className="w-full border border-border rounded-lg px-3 py-2 text-sm bg-card text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
+ className={SELECT_CLASS}
>
<option value="manual">{t('goals.trackingManual')}</option>
<option value="account">{t('goals.trackingAccount')}</option>
<option value="asset">{t('goals.trackingAsset')}</option>
+ <option value="asset_group">{t('goals.trackingWallet')}</option>
<option value="net_worth">{t('goals.trackingNetWorth')}</option>
</select>
</div>
@@ -478,41 +525,37 @@ export default function GoalsPage() {
)}
{trackingType === 'account' && (
- <div className="space-y-2">
- <Label>{t('goals.account')}</Label>
- <select
- name="account_id"
- defaultValue={editing?.account_id ?? ''}
- className="w-full border border-border rounded-lg px-3 py-2 text-sm bg-card text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
- required
- >
- <option value="">{t('goals.selectAccount')}</option>
- {accountsList?.map((acc) => (
- <option key={acc.id} value={acc.id}>
- {getAccountName(acc)} ({acc.currency})
- </option>
- ))}
- </select>
- </div>
+ <LinkedResourceSelect<Account>
+ name="account_id"
+ label={t('goals.account')}
+ placeholder={t('goals.selectAccount')}
+ defaultValue={editing?.account_id}
+ items={accountsList}
+ renderOption={(acc) => `${getAccountName(acc)} (${acc.currency})`}
+ />
)}
{trackingType === 'asset' && (
- <div className="space-y-2">
- <Label>{t('goals.asset')}</Label>
- <select
- name="asset_id"
- defaultValue={editing?.asset_id ?? ''}
- className="w-full border border-border rounded-lg px-3 py-2 text-sm bg-card text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
- required
- >
- <option value="">{t('goals.selectAsset')}</option>
- {assetsList?.map((asset: { id: string; name: string; currency: string }) => (
- <option key={asset.id} value={asset.id}>
- {asset.name} ({asset.currency})
- </option>
- ))}
- </select>
- </div>
+ <LinkedResourceSelect<Asset>
+ name="asset_id"
+ label={t('goals.asset')}
+ placeholder={t('goals.selectAsset')}
+ defaultValue={editing?.asset_id}
+ items={assetsList}
+ renderOption={(asset) => `${asset.name} (${asset.currency})`}
+ />
+ )}
+
+ {trackingType === 'asset_group' && (
+ <LinkedResourceSelect<AssetGroup>
+ name="asset_group_id"
+ label={t('goals.wallet')}
+ placeholder={t('goals.selectWallet')}
+ defaultValue={editing?.asset_group_id}
+ items={walletsList}
+ renderOption={(wallet) => wallet.name}
+ hint={t('goals.walletHint')}
+ />
)}
{/* Icon & Color */}
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 8ca083c0..e8b9f3ee 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -622,9 +622,10 @@ export interface Goal {
target_amount_primary: number | null
current_amount_primary: number | null
target_date: string | null
- tracking_type: 'manual' | 'account' | 'asset' | 'net_worth'
+ tracking_type: 'manual' | 'account' | 'asset' | 'asset_group' | 'net_worth'
account_id: string | null
asset_id: string | null
+ asset_group_id: string | null
status: 'active' | 'completed' | 'paused' | 'archived'
icon: string | null
color: string | null
@@ -637,6 +638,7 @@ export interface Goal {
on_track: 'ahead' | 'on_track' | 'behind' | 'overdue' | 'achieved' | null
account_name: string | null
asset_name: string | null
+ asset_group_name: string | null
}
export interface GoalSummary {