fix chapter 7 ty

Author: giunio-prc

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)

Chapter07/sitters-catalog/shared/infrastructure/mongo_repository.py

@@ -15,25 +15,25 @@ def __init__(self, mongo_url: str) -> None:
         db = self.client.sitter_calatog_app
         self._collection = db.babysitters
 
-    async def save_sitter(self, entity: Babysitter) -> Babysitter:
+    async def save_sitter(self, sitter: Babysitter) -> Babysitter:
         """Persist an entity. Creates new or updates existing."""
-        entity.refresh_updated_at()
-        data = entity.model_dump(exclude={"id"})
+        sitter.refresh_updated_at()
+        data = sitter.model_dump(exclude={"id"})
 
-        if entity.id:
+        if sitter.id:
             # Update existing document
             await self._collection.replace_one(
-                {"_id": ObjectId(entity.id)},
+                {"_id": ObjectId(sitter.id)},
                 data,
             )
         else:
             # Insert new document
-            entity.created_at = datetime.now(UTC)
-            data["created_at"] = entity.created_at
+            sitter.created_at = datetime.now(UTC)
+            data["created_at"] = sitter.created_at
             result = await self._collection.insert_one(data)
-            entity.id = str(result.inserted_id)
+            sitter.id = str(result.inserted_id)
 
-        return entity
+        return sitter
 
     async def find_sitter_by_id(
         self, id: str
@@ -44,7 +44,7 @@ async def find_sitter_by_id(
                 {"_id": ObjectId(id)}
             )
             if doc:
-                return self._to_entity(doc)
+                return Babysitter.model_validate(doc)
         except Exception:
             pass
         return None
@@ -80,7 +80,7 @@ async def find_featured_sitters(
             .sort("years_of_experience", -1)
             .limit(limit)
         )
-        return [self._to_entity(doc) async for doc in cursor]
+        return [Babysitter.model_validate(doc) async for doc in cursor]
 
     def _build_query(self, filters: dict) -> dict:
         """Build MongoDB query from filter parameters."""