Skip to content

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

Bug/account unlink keeping entries (#148)

Gustavo Henrique Rodrigues Guterres9621fa00486d
diff --git a/backend/app/services/asset_group_service.py b/backend/app/services/asset_group_service.py
index 9a4a68da..7f860b6f 100644
--- a/backend/app/services/asset_group_service.py
+++ b/backend/app/services/asset_group_service.py
@@ -135,6 +135,12 @@ async def get_groups(session: AsyncSession, user_id: uuid.UUID) -> list[AssetGro
reads = []
for g in groups:
count, cv, cvp = await _rollup(session, g, primary)
+ # Synced wallets are auto-generated by providers. Keep manual wallets
+ # visible even when empty, but hide empty synced wallets (connected or
+ # orphaned) to avoid duplicate provider placeholders like
+ # "MeuPluggy 4 · 0 items" after reconnects/migrations.
+ if g.source != "manual" and count == 0:
+ continue
institution = await _institution_name_for(session, g.connection_id)
reads.append(_group_to_read(g, count, cv, cvp, institution))
return reads
diff --git a/backend/app/services/connection_service.py b/backend/app/services/connection_service.py
index f2d53249..09f43099 100644
--- a/backend/app/services/connection_service.py
+++ b/backend/app/services/connection_service.py
@@ -4,7 +4,7 @@ from datetime import date, datetime, timedelta, timezone
from decimal import Decimal, InvalidOperation
from typing import Optional
-from sqlalchemy import or_, select, update
+from sqlalchemy import delete, exists, or_, select, update
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import selectinload
@@ -16,6 +16,7 @@ from app.models.bank_connection import BankConnection
from app.models.account import Account
from app.models.category import Category
from app.models.credit_card_bill import CreditCardBill
+from app.models.payee import Payee, PayeeMapping
from app.models.transaction import Transaction
from app.models.user import User
from app.providers import get_provider
@@ -220,7 +221,12 @@ async def _upsert_asset_from_holding(
asset.currency = holding.currency
# external_metadata is a snapshot blob: we want the latest every time.
asset.external_metadata = holding.metadata
+ previous_connection_id = asset.connection_id
asset.connection_id = connection_id
+ # Only auto-unarchive when the holding moved to a different connection
+ # (e.g. unlink + reconnect). This avoids overriding user-archived assets.
+ if asset.is_archived and previous_connection_id != connection_id:
+ asset.is_archived = False
# Sparse fields — merge, don't clobber. Pluggy sometimes returns
# these on first sync and null on later ones (e.g. amountOriginal
@@ -1113,6 +1119,41 @@ async def delete_connection(
.values(is_archived=True)
)
+ # Track payees referenced by this connection's transactions so we can
+ # remove only newly-orphaned records after deleting the connection.
+ affected_payee_ids = (
+ await session.execute(
+ select(Transaction.payee_id)
+ .join(Account, Account.id == Transaction.account_id)
+ .where(
+ Account.connection_id == connection.id,
+ Transaction.payee_id.isnot(None),
+ )
+ .distinct()
+ )
+ ).scalars().all()
+
await session.delete(connection)
+ await session.flush()
+
+ if affected_payee_ids:
+ has_transactions = exists(
+ select(Transaction.id).where(Transaction.payee_id == Payee.id)
+ )
+ has_external_mappings = exists(
+ select(PayeeMapping.id).where(
+ PayeeMapping.target_id == Payee.id,
+ PayeeMapping.id != Payee.id,
+ )
+ )
+ await session.execute(
+ delete(Payee).where(
+ Payee.user_id == user_id,
+ Payee.id.in_(affected_payee_ids),
+ ~has_transactions,
+ ~has_external_mappings,
+ )
+ )
+
await session.commit()
return True
diff --git a/backend/app/services/payee_service.py b/backend/app/services/payee_service.py
index 32a5e291..ebffbebb 100644
--- a/backend/app/services/payee_service.py
+++ b/backend/app/services/payee_service.py
@@ -23,8 +23,9 @@ async def get_payees(session: AsyncSession, user_id: uuid.UUID) -> list[Payee]:
.group_by(Transaction.payee_id)
.subquery()
)
+ tx_count = func.coalesce(count_subq.c.tx_count, 0)
result = await session.execute(
- select(Payee, func.coalesce(count_subq.c.tx_count, 0).label("transaction_count"))
+ select(Payee, tx_count.label("transaction_count"))
.outerjoin(count_subq, Payee.id == count_subq.c.payee_id)
.where(Payee.user_id == user_id)
.order_by(Payee.name)
diff --git a/backend/tests/test_asset_group_service.py b/backend/tests/test_asset_group_service.py
new file mode 100644
index 00000000..945d4458
--- /dev/null
+++ b/backend/tests/test_asset_group_service.py
@@ -0,0 +1,56 @@
+import uuid
+from datetime import datetime, timezone
+
+import pytest
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.models.asset_group import AssetGroup
+from app.models.bank_connection import BankConnection
+from app.services.asset_group_service import get_groups
+
+
+async def test_get_groups_hides_empty_synced_wallets(
+ session: AsyncSession, test_user
+):
+ active_connection = BankConnection(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ provider="pluggy",
+ external_id="item-active",
+ institution_name="Active Bank",
+ credentials={"token": "x"},
+ status="active",
+ created_at=datetime.now(timezone.utc),
+ )
+ session.add(active_connection)
+
+ manual_group = AssetGroup(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ name="Manual Wallet",
+ source="manual",
+ )
+ orphan_synced_group = AssetGroup(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ name="MeuPluggy",
+ source="pluggy",
+ connection_id=None,
+ )
+ active_synced_group = AssetGroup(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ name="Connected Wallet",
+ source="pluggy",
+ connection_id=active_connection.id,
+ )
+ session.add_all([manual_group, orphan_synced_group, active_synced_group])
+ await session.commit()
+
+ groups = await get_groups(session, test_user.id)
+ names = {g.name for g in groups}
+
+ assert "Manual Wallet" in names
+ assert "Connected Wallet" not in names
+ assert "MeuPluggy" not in names
diff --git a/backend/tests/test_asset_service.py b/backend/tests/test_asset_service.py
index ae863993..0e086d20 100644
--- a/backend/tests/test_asset_service.py
+++ b/backend/tests/test_asset_service.py
@@ -810,3 +810,18 @@ async def test_get_assets_include_archived(session: AsyncSession, test_user: Use
names = [a.name for a in assets]
assert "A1" in names
assert "A2" in names
+
+
+async def test_get_assets_excludes_archived_by_default(session: AsyncSession, test_user: User):
+ await asset_service.create_asset(
+ session, test_user.id, AssetCreate(name="Visible", type="other", currency="BRL"),
+ )
+ await asset_service.create_asset(
+ session, test_user.id, AssetCreate(name="Archived", type="other", currency="BRL", is_archived=True),
+ )
+
+ assets = await asset_service.get_assets(session, test_user.id)
+ names = [a.name for a in assets]
+ assert "Visible" in names
+ assert "Archived" not in names
diff --git a/backend/tests/test_connection_service.py b/backend/tests/test_connection_service.py
index 0358be68..48d5d512 100644
--- a/backend/tests/test_connection_service.py
+++ b/backend/tests/test_connection_service.py
@@ -285,6 +285,121 @@ async def test_delete_connection_not_found(session: AsyncSession, test_user):
assert result is False
+async def test_delete_connection_archives_linked_assets(session: AsyncSession, test_user):
+ """Deleting a connection archives linked assets before removing the connection."""
+ from app.models.asset import Asset
+
+ conn = await _make_connection(session, test_user.id, "Asset Bank")
+ asset = Asset(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ name="Synced ETF",
+ type="etf",
+ currency="BRL",
+ source="pluggy",
+ external_id="asset-ext-1",
+ connection_id=conn.id,
+ is_archived=False,
+ )
+ session.add(asset)
+ await session.commit()
+
+ result = await delete_connection(session, conn.id, test_user.id)
+ assert result is True
+
+ refreshed = (await session.execute(select(Asset).where(Asset.id == asset.id))).scalar_one()
+ assert refreshed.is_archived is True
+
+
+async def test_delete_connection_deletes_orphan_payees(session: AsyncSession, test_user):
+ """Unlink should remove payees that become orphaned after tx deletion."""
+ from app.models.account import Account
+ from app.models.payee import Payee
+
+ conn = await _make_connection(session, test_user.id, "Cleanup Bank")
+ account = Account(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ connection_id=conn.id,
+ name="Connected Account",
+ type="checking",
+ balance=Decimal("0"),
+ currency="BRL",
+ )
+ payee = Payee(id=uuid.uuid4(), user_id=test_user.id, name="Ghost Payee")
+ session.add_all([account, payee])
+ await session.flush()
+
+ session.add(
+ Transaction(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ account_id=account.id,
+ description="Synced tx",
+ amount=Decimal("10"),
+ date=date.today(),
+ type="debit",
+ source="sync",
+ payee_id=payee.id,
+ created_at=datetime.now(timezone.utc),
+ )
+ )
+ await session.commit()
+
+ assert await delete_connection(session, conn.id, test_user.id) is True
+
+ refreshed = (await session.execute(select(Payee).where(Payee.id == payee.id))).scalar_one_or_none()
+ assert refreshed is None
+
+
+async def test_delete_connection_keeps_payees_with_external_mappings(session: AsyncSession, test_user):
+ """Unlink should not remove payees that still have external mappings."""
+ from app.models.account import Account
+ from app.models.payee import Payee, PayeeMapping
+
+ conn = await _make_connection(session, test_user.id, "Mapped Bank")
+ account = Account(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ connection_id=conn.id,
+ name="Connected Account",
+ type="checking",
+ balance=Decimal("0"),
+ currency="BRL",
+ )
+ payee = Payee(id=uuid.uuid4(), user_id=test_user.id, name="Mapped Payee")
+ session.add_all([account, payee])
+ await session.flush()
+
+ session.add_all(
+ [
+ PayeeMapping(id=payee.id, user_id=test_user.id, target_id=payee.id),
+ PayeeMapping(id=uuid.uuid4(), user_id=test_user.id, target_id=payee.id),
+ Transaction(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ account_id=account.id,
+ description="Synced tx",
+ amount=Decimal("15"),
+ date=date.today(),
+ type="debit",
+ source="sync",
+ payee_id=payee.id,
+ created_at=datetime.now(timezone.utc),
+ ),
+ ]
+ )
+ await session.commit()
+
+ assert await delete_connection(session, conn.id, test_user.id) is True
+
+ refreshed = (await session.execute(select(Payee).where(Payee.id == payee.id))).scalar_one_or_none()
+ assert refreshed is not None
+
+
# ---------------------------------------------------------------------------
# create_connect_token
# ---------------------------------------------------------------------------
diff --git a/backend/tests/test_payee_service.py b/backend/tests/test_payee_service.py
index d9e2a535..7e626031 100644
--- a/backend/tests/test_payee_service.py
+++ b/backend/tests/test_payee_service.py
@@ -153,6 +153,31 @@ async def test_get_payees_ordered_by_name(session: AsyncSession, test_user):
assert names == sorted(names)
+async def test_get_payees_includes_zero_transaction_payees(session: AsyncSession, test_user):
+ orphan = await create_payee(session, test_user.id, PayeeCreate(name="No Tx"))
+ active = await create_payee(session, test_user.id, PayeeCreate(name="Has Tx"))
+ account = await _make_account(session, test_user)
+
+ session.add(Transaction(
+ id=uuid.uuid4(), user_id=test_user.id, account_id=account.id,
+ description="Paid", amount=Decimal("12"), date=date.today(),
+ type="debit", source="manual", payee_id=active.id,
+ created_at=datetime.now(timezone.utc),
+ ))
+ await session.commit()
+
+ payees = await get_payees(session, test_user.id)
+ ids = {p.id for p in payees}
+
+ assert active.id in ids
+ assert orphan.id in ids
+
+ payees_by_id = {p.id: p for p in payees}
+ assert payees_by_id[active.id].transaction_count == 1
+ assert payees_by_id[orphan.id].transaction_count == 0
+
+
# ---------------------------------------------------------------------------
# get_or_create_payee
# ---------------------------------------------------------------------------
diff --git a/backend/tests/test_sync_holdings.py b/backend/tests/test_sync_holdings.py
index d6895431..17d0653c 100644
--- a/backend/tests/test_sync_holdings.py
+++ b/backend/tests/test_sync_holdings.py
@@ -453,6 +453,70 @@ async def test_disappeared_holding_gets_archived(
assert assets["h-2"].is_archived is True
+async def test_returned_holding_is_unarchived_after_reconnect(
+ session: AsyncSession, test_user: User, mock_connection: BankConnection
+):
+ """A holding archived on unlink should become active again when reconnected."""
+ _MockProvider._holdings = [_holding(external_id="h-1", current_value=Decimal("500"))]
+ await _sync_holdings(session, test_user.id, mock_connection, mock_connection.credentials)
+ await session.commit()
+
+ # Next sync does not include h-1 -> archived.
+ _MockProvider._holdings = []
+ await _sync_holdings(session, test_user.id, mock_connection, mock_connection.credentials)
+ await session.commit()
+
+ assets = {a.external_id: a for a in await _assets_for(session, test_user)}
+ assert assets["h-1"].is_archived is True
+
+ # Simulate unlink/reconnect: old connection disappears and a new one syncs.
+ await session.delete(mock_connection)
+ await session.commit()
+
+ reconnected = BankConnection(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ provider="mock",
+ external_id="item-reconnected",
+ institution_name="Mock Bank",
+ credentials={"item_id": "item-reconnected"},
+ status="active",
+ created_at=datetime.now(timezone.utc),
+ )
+ session.add(reconnected)
+ await session.commit()
+
+ # Later sync includes h-1 again -> should unarchive.
+ _MockProvider._holdings = [_holding(external_id="h-1", current_value=Decimal("525"))]
+ await _sync_holdings(session, test_user.id, reconnected, reconnected.credentials)
+ await session.commit()
+
+ assets = {a.external_id: a for a in await _assets_for(session, test_user)}
+ assert assets["h-1"].is_archived is False
+
+
+async def test_user_archived_holding_stays_archived_on_same_connection_sync(
+ session: AsyncSession, test_user: User, mock_connection: BankConnection
+):
+ """Sync must not override a user archive decision on the same connection."""
+ _MockProvider._holdings = [_holding(external_id="h-1", current_value=Decimal("500"))]
+ await _sync_holdings(session, test_user.id, mock_connection, mock_connection.credentials)
+ await session.commit()
+
+ assets = {a.external_id: a for a in await _assets_for(session, test_user)}
+ assets["h-1"].is_archived = True
+ await session.commit()
+
+ _MockProvider._holdings = [_holding(external_id="h-1", current_value=Decimal("510"))]
+ await _sync_holdings(session, test_user.id, mock_connection, mock_connection.credentials)
+ await session.commit()
+
+ assets = {a.external_id: a for a in await _assets_for(session, test_user)}
+ assert assets["h-1"].is_archived is True
+
+
@pytest.mark.asyncio
async def test_user_moved_asset_to_custom_wallet_not_overridden(
session: AsyncSession, test_user: User, mock_connection: BankConnection
diff --git a/frontend/src/lib/invalidate-queries.ts b/frontend/src/lib/invalidate-queries.ts
index 0cc018b8..bd31e121 100644
--- a/frontend/src/lib/invalidate-queries.ts
+++ b/frontend/src/lib/invalidate-queries.ts
@@ -13,5 +13,6 @@ export function invalidateFinancialQueries(queryClient: QueryClient) {
queryClient.invalidateQueries({ queryKey: ['dashboard'] })
queryClient.invalidateQueries({ queryKey: ['accounts'] })
queryClient.invalidateQueries({ queryKey: ['budgets'] })
+ queryClient.invalidateQueries({ queryKey: ['reports'] })
queryClient.invalidateQueries({ queryKey: ['drill-down'] })
}
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index c8122283..9dee33b3 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -337,6 +337,8 @@
"connected": "Bank connected successfully",
"connectError": "Failed to connect bank",
"disconnected": "Connection removed",
+ "confirmDisconnectTitle": "Disconnect bank connection?",
+ "confirmDisconnectDesc": "This will unlink {{institution}} and remove synced accounts and transactions from the app. This action is irreversible.",
"viewTransactions": "View transactions",
"currentBalance": "Current balance",
"income": "Income",
diff --git a/frontend/src/locales/pt-BR.json b/frontend/src/locales/pt-BR.json
index 75a97d50..e7446fe3 100644
--- a/frontend/src/locales/pt-BR.json
+++ b/frontend/src/locales/pt-BR.json
@@ -337,6 +337,8 @@
"connected": "Banco conectado com sucesso",
"connectError": "Erro ao conectar banco",
"disconnected": "Conexão removida",
+ "confirmDisconnectTitle": "Desconectar conexão bancária?",
+ "confirmDisconnectDesc": "Isso vai desvincular {{institution}} e remover do app as contas e transações sincronizadas. Esta ação é irreversível.",
"viewTransactions": "Ver transações",
"currentBalance": "Saldo atual",
"income": "Entradas",
diff --git a/frontend/src/pages/accounts.tsx b/frontend/src/pages/accounts.tsx
index 8d988e86..199eb35c 100644
--- a/frontend/src/pages/accounts.tsx
+++ b/frontend/src/pages/accounts.tsx
@@ -78,6 +78,7 @@ export default function AccountsPage() {
const [connectorSelectOpen, setConnectorSelectOpen] = useState(false)
const [selectedProvider, setSelectedProvider] = useState<string | null>(null)
const [settingsConnection, setSettingsConnection] = useState<BankConnection | null>(null)
+ const [disconnectingConnection, setDisconnectingConnection] = useState<BankConnection | null>(null)
const [closingAccountId, setClosingAccountId] = useState<string | null>(null)
const [reconnectConnId, setReconnectConnId] = useState<string | null>(null)
const [reconnectItemId, setReconnectItemId] = useState<string | null>(null)
@@ -117,6 +118,10 @@ export default function AccountsPage() {
onSuccess: () => {
invalidateFinancialQueries(queryClient)
queryClient.invalidateQueries({ queryKey: ['connections'] })
+ queryClient.invalidateQueries({ queryKey: ['assets'] })
+ queryClient.invalidateQueries({ queryKey: ['asset-groups'] })
+ queryClient.invalidateQueries({ queryKey: ['portfolio-trend'] })
+ setDisconnectingConnection(null)
toast.success(t('accounts.disconnected'))
},
})
@@ -337,7 +342,7 @@ export default function AccountsPage() {
variant="ghost"
size="sm"
className="h-8 w-8 p-0 text-muted-foreground hover:text-rose-500"
- onClick={() => disconnectMutation.mutate(conn.id)}
+ onClick={() => setDisconnectingConnection(conn)}
disabled={disconnectMutation.isPending}
>
<Unlink size={14} />
@@ -505,6 +510,30 @@ export default function AccountsPage() {
</DialogContent>
</Dialog>
+ {/* Confirm disconnect dialog */}
+ <Dialog open={!!disconnectingConnection} onOpenChange={() => setDisconnectingConnection(null)}>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>{t('accounts.confirmDisconnectTitle')}</DialogTitle>
+ </DialogHeader>
+ <p className="text-sm text-muted-foreground">
+ {t('accounts.confirmDisconnectDesc', { institution: disconnectingConnection?.institution_name ?? '' })}
+ </p>
+ <DialogFooter>
+ <Button variant="outline" onClick={() => setDisconnectingConnection(null)}>
+ {t('common.cancel')}
+ </Button>
+ <Button
+ variant="destructive"
+ onClick={() => disconnectingConnection && disconnectMutation.mutate(disconnectingConnection.id)}
+ disabled={disconnectMutation.isPending}
+ >
+ {disconnectMutation.isPending ? t('common.loading') : t('accounts.disconnect')}
+ </Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+
{/* Confirm close dialog */}
<Dialog open={!!closingAccountId} onOpenChange={() => setClosingAccountId(null)}>
<DialogContent>
diff --git a/frontend/src/pages/assets.tsx b/frontend/src/pages/assets.tsx
index 9a415e47..7a543386 100644
--- a/frontend/src/pages/assets.tsx
+++ b/frontend/src/pages/assets.tsx
@@ -221,7 +221,7 @@ export default function AssetsPage() {
const { data: assetsList, isLoading } = useQuery({
queryKey: ['assets'],
- queryFn: () => assets.list(true),
+ queryFn: () => assets.list(false),
})
const { data: portfolioData } = useQuery({