Open-source personal finance manager. Self-hosted, privacy-first.
fix(sync): scope Pluggy category match to the connection's workspace (#268)
Tássio Noronha5c4637cebd95
diff --git a/backend/app/services/connection_service.py b/backend/app/services/connection_service.pyindex b1297b48..c3e13d0a 100644--- a/backend/app/services/connection_service.py+++ b/backend/app/services/connection_service.py@@ -315,7 +315,7 @@ async def _upsert_asset_value_for_today(async def _match_pluggy_category(session: AsyncSession,- user_id: uuid.UUID,+ workspace_id: uuid.UUID,pluggy_category: Optional[str],enabled: bool = True,) -> Optional[uuid.UUID]:@@ -331,10 +331,16 @@ async def _match_pluggy_category(app_name = PLUGGY_CATEGORY_MAP.get(pluggy_category.split(" - ")[0])if not app_name:return None+ # Scope to the connection's workspace: a user in multiple workspaces owns+ # the same default category names in each, so a user_id-only lookup returns+ # several rows. `.first()` is belt-and-suspenders — a category match must+ # never crash the whole sync even if a workspace somehow has name dupes.result = await session.execute(- select(Category.id).where(Category.user_id == user_id, Category.name == app_name)+ select(Category.id)+ .where(Category.workspace_id == workspace_id, Category.name == app_name)+ .limit(1))- return result.scalar_one_or_none()+ return result.scalars().first()async def get_connections(session: AsyncSession, workspace_id: uuid.UUID) -> list[BankConnection]:@@ -579,7 +585,7 @@ async def handle_oauth_callback(continuecategory_id = await _match_pluggy_category(- session, user_id, txn_data.pluggy_category, enabled=use_provider_cats+ session, workspace_id, txn_data.pluggy_category, enabled=use_provider_cats)# Resolve payee entity from raw payee textpayee_id = None@@ -1279,7 +1285,7 @@ async def sync_connection(continuecategory_id = await _match_pluggy_category(- session, user_id, txn_data.pluggy_category, enabled=use_provider_cats+ session, workspace_id, txn_data.pluggy_category, enabled=use_provider_cats)# Resolve payee entity from raw payee textdiff --git a/backend/tests/test_connection_service.py b/backend/tests/test_connection_service.pyindex e10fe46c..5b646ca3 100644--- a/backend/tests/test_connection_service.py+++ b/backend/tests/test_connection_service.py@@ -100,37 +100,41 @@ def test_description_similarity_case_insensitive():@pytest.mark.asyncio-async def test_match_pluggy_exact(session: AsyncSession, test_user):- """Exact Pluggy category match maps to user's category."""+async def test_match_pluggy_exact(session: AsyncSession, test_user, test_workspace):+ """Exact Pluggy category match maps to the workspace's category."""await _make_category(session, test_user.id, "Alimentação")- cat_id = await _match_pluggy_category(session, test_user.id, "Eating out")+ cat_id = await _match_pluggy_category(session, test_workspace.id, "Eating out")assert cat_id is not None@pytest.mark.asyncio-async def test_match_pluggy_prefix(session: AsyncSession, test_user):+async def test_match_pluggy_prefix(session: AsyncSession, test_user, test_workspace):"""Pluggy category with ' - ' prefix matches via split."""await _make_category(session, test_user.id, "Transferências")- cat_id = await _match_pluggy_category(session, test_user.id, "Transfer - PIX")+ cat_id = await _match_pluggy_category(session, test_workspace.id, "Transfer - PIX")assert cat_id is not None@pytest.mark.asyncio-async def test_match_pluggy_no_match(session: AsyncSession, test_user):+async def test_match_pluggy_no_match(session: AsyncSession, test_workspace):"""Unknown Pluggy category returns None."""- cat_id = await _match_pluggy_category(session, test_user.id, "Unknown Category XYZ")+ cat_id = await _match_pluggy_category(+ session, test_workspace.id, "Unknown Category XYZ"+ )assert cat_id is None@pytest.mark.asyncio-async def test_match_pluggy_none(session: AsyncSession, test_user):+async def test_match_pluggy_none(session: AsyncSession, test_workspace):"""None category returns None."""- cat_id = await _match_pluggy_category(session, test_user.id, None)+ cat_id = await _match_pluggy_category(session, test_workspace.id, None)assert cat_id is None@pytest.mark.asyncio-async def test_match_pluggy_disabled_short_circuits(session: AsyncSession, test_user):+async def test_match_pluggy_disabled_short_circuits(+ session: AsyncSession, test_user, test_workspace+):"""When the global use_provider_categories flag is off, the matcher returnsNone even on inputs that would otherwise resolve. This is the contractsync_connection / handle_oauth_callback rely on to leave transactions@@ -138,22 +142,22 @@ async def test_match_pluggy_disabled_short_circuits(session: AsyncSession, test_await _make_category(session, test_user.id, "Alimentação")# Sanity: enabled=True still matches.enabled_match = await _match_pluggy_category(- session, test_user.id, "Eating out", enabled=True+ session, test_workspace.id, "Eating out", enabled=True)assert enabled_match is not None# enabled=False short-circuits before any DB lookup.disabled_match = await _match_pluggy_category(- session, test_user.id, "Eating out", enabled=False+ session, test_workspace.id, "Eating out", enabled=False)assert disabled_match is None@pytest.mark.asyncio-async def test_match_pluggy_user_has_no_category(session: AsyncSession, test_user):- """Pluggy category maps but user doesn't have the target category."""+async def test_match_pluggy_user_has_no_category(session: AsyncSession, test_workspace):+ """Pluggy category maps but the workspace doesn't have the target category."""# "Eating out" maps to "Alimentação" but we don't create it- cat_id = await _match_pluggy_category(session, test_user.id, "Eating out")+ cat_id = await _match_pluggy_category(session, test_workspace.id, "Eating out")assert cat_id is None