Refactor backend structure

Author: Pau Tena

backend/Makefile

@@ -10,4 +10,7 @@ test:
 lint:
 	uv run bash scripts/lint.sh
 
-.PHONY: test lint
+format:
+	uv run bash scripts/format.sh
+
+.PHONY: test lint format

backend/app/api/main.py

@@ -0,0 +1,17 @@
+from sqlmodel import Field, SQLModel
+
+
+# JSON payload containing access token
+class Token(SQLModel):
+    access_token: str
+    token_type: str = "bearer"
+
+
+# Contents of JWT token
+class TokenPayload(SQLModel):
+    sub: str | None = None
+
+
+class NewPassword(SQLModel):
+    token: str
+    new_password: str = Field(min_length=8, max_length=40)

backend/app/api/__init__.py renamed to backend/app/auth/__init__.py

@@ -6,12 +6,14 @@
 from fastapi.security import OAuth2PasswordRequestForm
 
 from app import crud
-from app.api.deps import CurrentUser, SessionDep, get_current_active_superuser
+from app.auth.models import NewPassword, Token
 from app.core import security
 from app.core.config import settings
 from app.core.security import get_password_hash
-from app.models import Message, NewPassword, Token, UserPublic
-from app.utils import (
+from app.models import Message
+from app.users.dependencies import CurrentUser, SessionDep, get_current_active_superuser
+from app.users.models import UserPublic
+from app.utils.utils import (
     generate_password_reset_token,
     generate_reset_password_email,
     send_email,

backend/app/auth/models.py

@@ -2,7 +2,7 @@
 
 from app import crud
 from app.core.config import settings
-from app.models import User, UserCreate
+from app.users.models import User, UserCreate
 
 engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))
 

backend/app/api/routes/login.py renamed to backend/app/auth/routes.py

@@ -4,7 +4,8 @@
 from sqlmodel import Session, select
 
 from app.core.security import get_password_hash, verify_password
-from app.models import Item, ItemCreate, User, UserCreate, UserUpdate
+from app.items.models import Item, ItemCreate
+from app.users.models import User, UserCreate, UserUpdate
 
 
 def create_user(*, session: Session, user_create: UserCreate) -> User:

backend/app/core/db.py

@@ -0,0 +1,42 @@
+import uuid
+
+from sqlmodel import Field, Relationship, SQLModel
+
+from app.users.models import User
+
+
+# Shared properties
+class ItemBase(SQLModel):
+    title: str = Field(min_length=1, max_length=255)
+    description: str | None = Field(default=None, max_length=255)
+
+
+# Properties to receive on item creation
+class ItemCreate(ItemBase):
+    pass
+
+
+# Properties to receive on item update
+class ItemUpdate(ItemBase):
+    title: str | None = Field(default=None, min_length=1, max_length=255)  # type: ignore
+
+
+# Database model, database table inferred from class name
+class Item(ItemBase, table=True):
+    id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True)
+    title: str = Field(max_length=255)
+    owner_id: uuid.UUID = Field(
+        foreign_key="user.id", nullable=False, ondelete="CASCADE"
+    )
+    owner: User | None = Relationship(back_populates="items")
+
+
+# Properties to return via API, id is always required
+class ItemPublic(ItemBase):
+    id: uuid.UUID
+    owner_id: uuid.UUID
+
+
+class ItemsPublic(SQLModel):
+    data: list[ItemPublic]
+    count: int

backend/app/crud.py

@@ -4,8 +4,9 @@
 from fastapi import APIRouter, HTTPException
 from sqlmodel import func, select
 
-from app.api.deps import CurrentUser, SessionDep
-from app.models import Item, ItemCreate, ItemPublic, ItemsPublic, ItemUpdate, Message
+from app.items.models import Item, ItemCreate, ItemPublic, ItemsPublic, ItemUpdate
+from app.models import Message
+from app.users.dependencies import CurrentUser, SessionDep
 
 router = APIRouter(prefix="/items", tags=["items"])