Merge pull request #34 from PacktPublishing/secured-api

initialize chapter8 secured api

Author: giunio-prc

.github/workflows/ci.yaml

@@ -73,12 +73,13 @@ jobs:
         run: uv run ruff check . --select "I,E,F,Q,UP,FAST" --line-length 120
 
       - name: Run type checker
-        run: uv run ty check || true
+        run: uv run ty check
 
       - name: Run pytest
         run: |
           # Check if tests directory or test files exist
-          if [ -d "tests" ] || find . -name "test_*.py" -o -name "*_test.py" | grep -q .; then
+          if [ -d "tests" ] || \
+             find . -not -path "./.venv/*" \( -name "test_*.py" -o -name "*_test.py" \) | grep -q .; then
             uv run pytest -v
           else
             echo "No tests found in ${{ matrix.project }}"

Chapter07/sitters-catalog/config.py

@@ -1,7 +1,6 @@
 from enum import StrEnum
 
-from pydantic import ConfigDict
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class RepositoryType(StrEnum):
@@ -20,7 +19,7 @@ class Settings(BaseSettings):
     repository_type: RepositoryType = RepositoryType.TINYDB_FILE
     tinydb_path: str = "data/babysitters_db.json"
 
-    model_config = ConfigDict(env_file=".env")
+    model_config = SettingsConfigDict(env_file=".env")
 
 
 settings = Settings()

Chapter07/sitters-catalog/features/create_babysitter/route.py

@@ -1,11 +1,12 @@
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, status
 
 from shared.dependencies import (
     get_repository,
 )
 from shared.dto import BabysitterResponseDTO
+from shared.infrastructure import BaseRepository
 
 from .dto import CreateBabysitterDTO
 from .handler import create_babysitter
@@ -15,11 +16,11 @@
 )
 
 
-@router.post("/", status_code=status.HTTP_201_CREATED)
+@router.post("/", status_code=status.HTTP_201_CREATED, response_model=BabysitterResponseDTO)
 async def create_babysitter_endpoint(
     dto: CreateBabysitterDTO,
-    repo: Annotated[object, Depends(get_repository)],
-) -> BabysitterResponseDTO:
+    repo: Annotated[BaseRepository, Depends(get_repository)],
+) -> Any:
     """Register a new babysitter in the catalog."""
     babysitter = await create_babysitter(dto, repo)
     return babysitter

Chapter07/sitters-catalog/features/deactivate_babysitter/route.py

@@ -1,9 +1,10 @@
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Path
 
 from shared.dependencies import get_repository
 from shared.dto import BabysitterResponseDTO
+from shared.infrastructure import BaseRepository
 
 from .handler import deactivate_babysitter
 
@@ -17,10 +18,10 @@
 ]
 
 
-@router.post("/{id}/deactivate")
+@router.post("/{id}/deactivate", response_model=BabysitterResponseDTO)
 async def deactivate_babysitter_endpoint(
     id: BabysitterIdDep,
-    repo: Annotated[object, Depends(get_repository)],
-) -> BabysitterResponseDTO:
+    repo: Annotated[BaseRepository, Depends(get_repository)],
+) -> Any:
     """Soft-delete: set is_active=False, keep the record."""
     return await deactivate_babysitter(id, repo)

Chapter07/sitters-catalog/features/delete_babysitter/route.py

@@ -3,6 +3,7 @@
 from fastapi import APIRouter, Depends, Path, status
 
 from shared.dependencies import get_repository
+from shared.infrastructure import BaseRepository
 
 from .handler import delete_babysitter
 
@@ -19,7 +20,7 @@
 @router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT)
 async def delete_babysitter_endpoint(
     id: BabysitterIdDep,
-    repo: Annotated[object, Depends(get_repository)],
+    repo: Annotated[BaseRepository, Depends(get_repository)],
 ) -> None:
     """Permanently remove. Use /deactivate for soft-delete."""
     await delete_babysitter(id, repo)

Chapter07/sitters-catalog/features/get_babysitter/route.py

@@ -1,9 +1,10 @@
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Path
 
 from shared.dependencies import get_repository
 from shared.dto import BabysitterResponseDTO
+from shared.infrastructure import BaseRepository
 
 from .handler import get_babysitter_by_id
 
@@ -17,10 +18,10 @@
 ]
 
 
-@router.get("/{id}")
+@router.get("/{id}", response_model=BabysitterResponseDTO)
 async def get_babysitter_endpoint(
     id: BabysitterIdDep,
-    repo: Annotated[object, Depends(get_repository)],
-) -> BabysitterResponseDTO:
+    repo: Annotated[BaseRepository, Depends(get_repository)],
+) -> Any:
     """Fetch a single babysitter by ID."""
     return await get_babysitter_by_id(id, repo)

Chapter07/sitters-catalog/features/get_featured/route.py

@@ -1,9 +1,10 @@
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends
 
 from shared.dependencies import get_repository
 from shared.dto import BabysitterResponseDTO
+from shared.infrastructure import BaseRepository
 
 from .handler import get_featured_babysitters
 
@@ -12,9 +13,9 @@
 )
 
 
-@router.get("/featured")
+@router.get("/featured", response_model=list[BabysitterResponseDTO])
 async def get_featured_endpoint(
-    repo: Annotated[object, Depends(get_repository)],
-) -> list[BabysitterResponseDTO]:
+    repo: Annotated[BaseRepository, Depends(get_repository)],
+) -> Any:
     """Return the top 5 most experienced active babysitters."""
     return await get_featured_babysitters(repo)

Chapter07/sitters-catalog/features/list_babysitters/handler.py

@@ -1,4 +1,4 @@
-from shared.dto import BabysitterResponseDTO
+from shared.domain.entities import Babysitter
 from shared.infrastructure.base_repository import BaseRepository
 
 from .dto import BabysitterSearchFilters
@@ -9,7 +9,7 @@ async def list_babysitters(
     skip: int,
     limit: int,
     repo: BaseRepository,
-) -> list[BabysitterResponseDTO]:
+) -> list[Babysitter]:
     """Search and list babysitters with optional filters."""
     raw: dict = {}
     if filters.city is not None:

Chapter07/sitters-catalog/features/list_babysitters/route.py

@@ -1,9 +1,10 @@
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Query
 
 from shared.dependencies import get_repository
 from shared.dto import BabysitterResponseDTO
+from shared.infrastructure.base_repository import BaseRepository
 
 from .dto import BabysitterSearchFilters
 from .handler import list_babysitters
@@ -13,9 +14,9 @@
 )
 
 
-@router.get("/")
+@router.get("/", response_model=list[BabysitterResponseDTO])
 async def list_babysitters_endpoint(
-    repo: Annotated[object, Depends(get_repository)],
+    repo: Annotated[BaseRepository, Depends(get_repository)],
     city: Annotated[
         str | None, Query(description="Filter by city")
     ] = None,
@@ -44,7 +45,7 @@ async def list_babysitters_endpoint(
         int,
         Query(ge=1, le=100, description="Page size (max 100)"),
     ] = 20,
-) -> list[BabysitterResponseDTO]:
+) -> Any:
     """Search and list babysitters with optional filters."""
     filters = BabysitterSearchFilters(
         city=city,

Chapter07/sitters-catalog/features/update_babysitter/route.py

@@ -1,4 +1,4 @@
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Path
 
@@ -19,21 +19,21 @@
 ]
 
 
-@router.put("/{id}")
+@router.put("/{id}", response_model=BabysitterResponseDTO)
 async def update_babysitter_endpoint(
     id: BabysitterIdDep,
     dto: UpdateBabysitterDTO,
     repo: Annotated[BaseRepository, Depends(get_repository)],
-) -> BabysitterResponseDTO:
+) -> Any:
     """Full update — replace all provided fields."""
     return await update_babysitter(id, dto, repo)
 
 
-@router.patch("/{id}")
+@router.patch("/{id}", response_model=BabysitterResponseDTO)
 async def partial_update_babysitter_endpoint(
     id: BabysitterIdDep,
     dto: UpdateBabysitterDTO,
     repo: Annotated[BaseRepository, Depends(get_repository)],
-) -> BabysitterResponseDTO:
+) -> Any:
     """Partial update — only sent fields are changed."""
     return await update_babysitter(id, dto, repo)