Seprating accounts and categories routes

api/app/account/account_routes.py

@@ -17,7 +17,7 @@ def create_account(account: AccountCreate, session: SessionDep, current_user=Dep
 
 @router.get("")
 def read_accounts(session: SessionDep, current_user=Depends(get_current_user)) -> Page[AccountRead]:
-    return paginate(session, Account.list())
+    return paginate(session, Account.list_accounts())
 
 @router.get("/{account_id}")
 def read_account(account_id: UUID, session: SessionDep, current_user=Depends(get_current_user)) -> AccountRead:

api/app/account/category_routes.py

@@ -0,0 +1,46 @@
+from uuid import UUID
+
+from fastapi import APIRouter, HTTPException, Depends
+from fastapi_pagination import Page
+from fastapi_pagination.ext.sqlmodel import paginate
+
+from account.models import Account, AccountRead, CategoryCreate, CategoryUpdate
+from db import SessionDep
+from user.manager import get_current_user
+
+router = APIRouter()
+
+@router.post("")
+def create_category(category: CategoryCreate, session: SessionDep, current_user=Depends(get_current_user)) -> AccountRead:
+    result = Account.create(category, session)
+    return result
+
+@router.get("")
+def read_categorys(session: SessionDep, current_user=Depends(get_current_user)) -> Page[AccountRead]:
+    return paginate(session, Account.list_categories())
+
+@router.get("/{category_id}")
+def read_category(category_id: UUID, session: SessionDep, current_user=Depends(get_current_user)) -> AccountRead:
+    category = Account.get(session, category_id)
+    if not category:
+        raise HTTPException(status_code=404, detail="Category not found")
+    return category
+
+@router.put("/{category_id}")
+def update_category(category_id: UUID, category: CategoryUpdate, session: SessionDep, current_user=Depends(get_current_user)) -> AccountRead:
+    db_category = Account.get(session, category_id)
+    if not db_category:
+        raise HTTPException(status_code=404, detail="Category not found")
+
+    category_data = category.model_dump(exclude_unset=True)
+    category = Account.update(session, db_category, category_data)
+    return category
+
+@router.delete("/{category_id}")
+def delete_category(category_id: UUID, session: SessionDep, current_user=Depends(get_current_user)):
+    category = Account.get(session, category_id)
+    if not category:
+        raise HTTPException(status_code=404, detail="Category not found")
+
+    Account.delete(session, category)
+    return {"ok": True}

api/app/account/models.py

@@ -3,6 +3,61 @@ from enum import Enum
 
 from sqlmodel import Field, SQLModel, select
 
+
+class AccountBase(SQLModel):
+    name: str = Field(index=True)
+    type: str = Field(index=True)
+
+class AccountBaseId(AccountBase):
+    id: UUID | None = Field(default_factory=uuid4, primary_key=True)
+
+class Account(AccountBaseId, table=True):
+
+    @classmethod
+    def create(cls, account, session):
+        account_db = cls.model_validate(account)
+        session.add(account_db)
+        session.commit()
+        session.refresh(account_db)
+
+        return account_db
+
+    @classmethod
+    def list(cls):
+        return select(Account)
+
+    @classmethod
+    def list_accounts(cls):
+        return cls.list().where(
+            Account.type.not_in_([v.value for v in CategoryType])
+        )
+
+    @classmethod
+    def list_categories(cls):
+        return cls.list().where(
+            Account.type.in_([v.value for v in CategoryType])
+        )
+
+    @classmethod
+    def get(cls, session, account_id):
+        return session.get(Account, account_id)
+
+    @classmethod
+    def update(cls, session, account_db, account_data):
+        account_db.sqlmodel_update(account_data)
+        session.add(account_db)
+        session.commit()
+        session.refresh(account_db)
+        return account_db
+
+    @classmethod
+    def delete(cls, session, account):
+        session.delete(account)
+        session.commit()
+
+class AccountRead(AccountBaseId):
+    pass
+
 class AccountType(Enum):
     Asset = "Asset"                # < Denotes a generic asset account.
     Checkings = "Checkings"            # < Standard checking account
@@ -24,53 +79,36 @@ class AccountType(Enum):
     Income = "Income"               # < Denotes an income account
     Expense = "Expense"              # < Denotes an expense account
 
-class AccountBase(SQLModel):
-    name: str = Field(index=True)
-    type: AccountType = Field(index=True)
+class Asset(Enum):
+    Asset = "Asset"
+    Checkings = "Checkings"
+    Savings = "Savings"
+    Cash = "Cash"
 
-class AccountBaseId(AccountBase):
-    id: UUID | None = Field(default_factory=uuid4, primary_key=True)
-
-class Account(AccountBaseId, table=True):
-
-    @classmethod
-    def create(cls, account, session):
-        account_db = cls.model_validate(account)
-        session.add(account_db)
-        session.commit()
-        session.refresh(account_db)
-
-        return account_db
-
-    @classmethod
-    def list(cls):
-        return select(Account)
-
-    @classmethod
-    def get(cls, session, account_id):
-        return session.get(Account, account_id)
-
-    @classmethod
-    def update(cls, session, account_db, account_data):
-        account_db.sqlmodel_update(account_data)
-        session.add(account_db)
-        session.commit()
-        session.refresh(account_db)
-        return account_db
-
-    @classmethod
-    def delete(cls, session, account):
-        session.delete(account)
-        session.commit()
-
-class AccountRead(AccountBaseId):
-    pass
+class Liability(Enum):
+    Liability = "Liability"
+    CreditCard = "CreditCard"
+    Loan = "Loan"
+    Investment = "Investment"
 
 class AccountWrite(AccountBase):
-    pass
+    type: Asset | Liability = Field()
 
 class AccountCreate(AccountWrite):
     pass
 
 class AccountUpdate(AccountWrite):
     pass
+
+class CategoryType(Enum):
+    Income = "Income"
+    Expense = "Expense"
+
+class CategoryWrite(AccountBase):
+    type: CategoryType = Field()
+
+class CategoryCreate(CategoryWrite):
+    pass
+
+class CategoryUpdate(CategoryWrite):
+    pass

api/app/main.py

@@ -8,7 +8,8 @@ from fastapi_pagination import add_pagination
 
 from db import create_db_and_tables
 from user import user_router, auth_router, create_admin_account
-from account.routes import router as account_router
+from account.account_routes import router as account_router
+from account.category_routes import router as category_router
 from payee.routes import router as payee_router
 from transaction.routes import router as transaction_router
 
@@ -39,6 +40,7 @@ app.add_middleware(
 app.include_router(auth_router, prefix="/auth", tags=["auth"], )
 app.include_router(user_router, prefix="/users", tags=["users"])
 app.include_router(account_router, prefix="/accounts", tags=["accounts"])
+app.include_router(category_router, prefix="/categories", tags=["categories"])
 app.include_router(payee_router, prefix="/payees", tags=["payees"])
 app.include_router(transaction_router, prefix="/transactions", tags=["transactions"])