Open-source personal finance manager. Self-hosted, privacy-first.
fix: move default data creation from list endpoints to registration (#31)
vitoob6290ef9aab8
diff --git a/backend/app/api/categories.py b/backend/app/api/categories.pyindex d098fe49..30190063 100644--- a/backend/app/api/categories.py+++ b/backend/app/api/categories.py@@ -17,12 +17,7 @@ async def list_categories(session: AsyncSession = Depends(get_async_session),user: User = Depends(current_active_user),):- categories = await category_service.get_categories(session, user.id)- if not categories:- # Create default categories for new users in the user's preferred language- lang = (user.preferences or {}).get("language", "pt-BR")- categories = await category_service.create_default_categories(session, user.id, lang)- return categories+ return await category_service.get_categories(session, user.id)@router.post("", response_model=CategoryRead, status_code=status.HTTP_201_CREATED)diff --git a/backend/app/api/category_groups.py b/backend/app/api/category_groups.pyindex 18a809dd..d476da3c 100644--- a/backend/app/api/category_groups.py+++ b/backend/app/api/category_groups.py@@ -7,7 +7,7 @@ from app.core.auth import current_active_userfrom app.core.database import get_async_sessionfrom app.models.user import Userfrom app.schemas.category_group import CategoryGroupCreate, CategoryGroupRead, CategoryGroupUpdate-from app.services import category_group_service, category_service+from app.services import category_group_servicerouter = APIRouter(prefix="/api/category-groups", tags=["category-groups"])@@ -17,13 +17,7 @@ async def list_groups(session: AsyncSession = Depends(get_async_session),user: User = Depends(current_active_user),):- groups = await category_group_service.get_groups(session, user.id)- if not groups:- # Create default categories + groups for new users in the user's preferred language- lang = (user.preferences or {}).get("language", "pt-BR")- await category_service.create_default_categories(session, user.id, lang)- groups = await category_group_service.get_groups(session, user.id)- return groups+ return await category_group_service.get_groups(session, user.id)@router.post("", response_model=CategoryGroupRead, status_code=status.HTTP_201_CREATED)diff --git a/backend/app/api/rules.py b/backend/app/api/rules.pyindex d09ad243..624b2a78 100644--- a/backend/app/api/rules.py+++ b/backend/app/api/rules.py@@ -18,12 +18,7 @@ async def list_rules(session: AsyncSession = Depends(get_async_session),user: User = Depends(current_active_user),):- rules = await rule_service.get_rules(session, user.id)- if not rules:- lang = (user.preferences or {}).get("language", "pt-BR")- rules = await rule_service.create_default_rules(session, user.id, lang)- rules = await rule_service.get_rules(session, user.id)- return rules+ return await rule_service.get_rules(session, user.id)@router.post("", response_model=RuleRead, status_code=status.HTTP_201_CREATED)diff --git a/backend/app/api/setup.py b/backend/app/api/setup.pyindex 5bbb69b2..0444c76f 100644--- a/backend/app/api/setup.py+++ b/backend/app/api/setup.py@@ -76,6 +76,13 @@ async def create_admin(db_session.add(wallet)await db_session.commit()+ # Create default categories and rules for the new user+ from app.services.category_service import create_default_categories+ from app.services.rule_service import create_default_rules++ await create_default_categories(db_session, user.id, body.language)+ await create_default_rules(db_session, user.id, body.language)+# Refresh user to get updated preferences for token generationawait db_session.refresh(user)diff --git a/backend/app/core/auth.py b/backend/app/core/auth.pyindex 8756e5f2..5848bb07 100644--- a/backend/app/core/auth.py+++ b/backend/app/core/auth.py@@ -30,11 +30,14 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):async def on_after_register(self, user: User, request: Optional[Request] = None):print(f"User {user.id} has registered.")# If request is None, this was called programmatically (e.g., from setup endpoint)- # which handles wallet creation and preferences itself.+ # which handles wallet creation, categories, and rules itself.if request is None:return# Create default wallet for users registered via /auth/register.from app.models.account import Account+ from app.services.category_service import create_default_categories+ from app.services.rule_service import create_default_rules+session = self.user_db.sessioncurrency = user.primary_currencylang = (user.preferences or {}).get("language", "en")@@ -49,6 +52,10 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):session.add(wallet)await session.commit()+ # Create default categories and rules for the new user+ await create_default_categories(session, user.id, lang)+ await create_default_rules(session, user.id, lang)+async def get_user_manager(user_db: SQLAlchemyUserDatabase = Depends(get_user_db)):yield UserManager(user_db)diff --git a/backend/tests/test_categories_api.py b/backend/tests/test_categories_api.pyindex b6d6f53c..d419b00e 100644--- a/backend/tests/test_categories_api.py+++ b/backend/tests/test_categories_api.py@@ -1,12 +1,27 @@import pytestfrom httpx import AsyncClient+from sqlalchemy.ext.asyncio import AsyncSessionfrom app.models.category import Category+from app.models.user import User+from app.services.category_service import create_default_categories@pytest.mark.asyncio-async def test_list_categories_creates_defaults(client: AsyncClient, auth_headers):- """First call should auto-create default categories."""+async def test_list_categories_empty(client: AsyncClient, auth_headers):+ """Listing categories with no data should return an empty list."""+ response = await client.get("/api/categories", headers=auth_headers)+ assert response.status_code == 200+ assert response.json() == []+++async def test_list_categories_with_defaults(+ client: AsyncClient, auth_headers, session: AsyncSession, test_user: User+):+ """After creating default categories (as registration does), listing returns them."""+ await create_default_categories(session, test_user.id, "pt-BR")+response = await client.get("/api/categories", headers=auth_headers)assert response.status_code == 200data = response.json()diff --git a/backend/tests/test_new_rules_api.py b/backend/tests/test_new_rules_api.pyindex e8139514..569c3c88 100644--- a/backend/tests/test_new_rules_api.py+++ b/backend/tests/test_new_rules_api.py@@ -6,15 +6,31 @@ from httpx import AsyncClientfrom sqlalchemy.ext.asyncio import AsyncSessionfrom app.models.user import User+from app.services.category_service import create_default_categories+from app.services.rule_service import create_default_rules@pytest.mark.asyncio-async def test_list_rules_creates_defaults(client: AsyncClient, auth_headers, test_categories):+async def test_list_rules_empty(client: AsyncClient, auth_headers, test_categories):+ """Listing rules with no data should return an empty list."""+ response = await client.get("/api/rules", headers=auth_headers)+ assert response.status_code == 200+ assert response.json() == []+++async def test_list_rules_with_defaults(+ client: AsyncClient, auth_headers, session: AsyncSession, test_user: User+):+ """After creating default categories and rules (as registration does), listing returns them."""+ await create_default_categories(session, test_user.id, "pt-BR")+ await create_default_rules(session, test_user.id, "pt-BR")+response = await client.get("/api/rules", headers=auth_headers)assert response.status_code == 200data = response.json()- assert len(data) > 0+ assert len(data) >= 3# Each rule has the expected structurerule = data[0]assert "conditions" in rulediff --git a/backend/tests/test_recurring_api.py b/backend/tests/test_recurring_api.pyindex e4814a51..1d055898 100644--- a/backend/tests/test_recurring_api.py+++ b/backend/tests/test_recurring_api.py@@ -1,4 +1,6 @@"""Tests for recurring transactions API."""+from datetime import date, timedelta+import pytest@@ -121,6 +123,11 @@ async def test_generate_pending_creates_transactions(client, auth_headers, test_@pytest.mark.asyncioasync def test_generate_no_duplicate_with_skip_first(client, auth_headers, test_categories, test_account):"""When created with skip_first, generate doesn't create duplicate for start_date."""+ # Use relative dates so the test doesn't go stale over time+ today = date.today()+ start_date = (today - timedelta(days=10)).isoformat()+ next_day = (today - timedelta(days=9)).isoformat()+# Simulate creating a transaction + recurring with skip_first (as the UI does)# First, create the transactiontx_resp = await client.post(@@ -130,7 +137,7 @@ async def test_generate_no_duplicate_with_skip_first(client, auth_headers, test_"amount": 99.90,"currency": "BRL","type": "debit",- "date": "2026-02-25",+ "date": start_date,"category_id": str(test_categories[1].id),"account_id": str(test_account.id),},@@ -147,7 +154,7 @@ async def test_generate_no_duplicate_with_skip_first(client, auth_headers, test_"currency": "BRL","type": "debit","frequency": "monthly",- "start_date": "2026-02-25",+ "start_date": start_date,"skip_first": True,"category_id": str(test_categories[1].id),"account_id": str(test_account.id),@@ -155,8 +162,8 @@ async def test_generate_no_duplicate_with_skip_first(client, auth_headers, test_headers=auth_headers,)assert rec_resp.status_code == 201- # next_occurrence should be March, not February- assert rec_resp.json()["next_occurrence"] == "2026-03-25"+ # next_occurrence should be one month after start_date (in the future)+ assert rec_resp.json()["next_occurrence"] > today.isoformat()# Generate pending — should NOT create anything (next_occurrence is in the future)gen_resp = await client.post(@@ -166,10 +173,10 @@ async def test_generate_no_duplicate_with_skip_first(client, auth_headers, test_assert gen_resp.status_code == 200assert gen_resp.json()["generated"] == 0- # Verify only one "Internet bill" transaction exists for Feb 25+ # Verify only one "Internet bill" transaction exists for start_datetx_list = await client.get("/api/transactions",- params={"from": "2026-02-25", "to": "2026-02-26"},+ params={"from": start_date, "to": next_day},headers=auth_headers,)assert tx_list.status_code == 200