fix(api): improve Station router - review feedback
- Rinomina _RecipeSummary -> RecipeSummary: il leading underscore
segnalava "privato" ma la classe e usata come response_model pubblico
ed esposta nell'OpenAPI schema.
- Aggiunge commento esplicativo sopra /by-code/{code}/recipes sul perche
l'ordine di dichiarazione conta (protezione gia data dal tipo int di
station_id, ma esplicito per prevenire regressioni durante refactor).
- Detail message del 404 by-code uniformato a "Station not found"
(senza distinguere not-found vs inactive, evita leak di esistenza).
- Aggiunge 3 test mancanti sul router:
* test_admin_can_list_stations (copertura happy path + active_only)
* test_assign_recipe_not_found_returns_404
* test_duplicate_assignment_returns_409
Feedback da code-reviewer su Task 5. Full suite: 11/11 passed.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -11,7 +11,7 @@ from schemas.station import (
|
|||||||
StationResponse,
|
StationResponse,
|
||||||
StationRecipeAssignmentCreate,
|
StationRecipeAssignmentCreate,
|
||||||
StationRecipeAssignmentResponse,
|
StationRecipeAssignmentResponse,
|
||||||
_RecipeSummary,
|
RecipeSummary,
|
||||||
)
|
)
|
||||||
from services import station_service
|
from services import station_service
|
||||||
|
|
||||||
@@ -40,7 +40,11 @@ async def create_new_station(
|
|||||||
return StationResponse.model_validate(station)
|
return StationResponse.model_validate(station)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/by-code/{code}/recipes", response_model=list[_RecipeSummary])
|
# NOTE: this literal-prefix route must stay above the /{station_id} routes.
|
||||||
|
# The int-typed station_id param already guards against "by-code" being
|
||||||
|
# matched as a station id, but keeping the explicit order avoids surprises
|
||||||
|
# during refactors (e.g. if someone regroups handlers by HTTP method).
|
||||||
|
@router.get("/by-code/{code}/recipes", response_model=list[RecipeSummary])
|
||||||
async def list_recipes_by_station_code(
|
async def list_recipes_by_station_code(
|
||||||
code: str,
|
code: str,
|
||||||
user: User = Depends(get_current_user),
|
user: User = Depends(get_current_user),
|
||||||
@@ -56,10 +60,10 @@ async def list_recipes_by_station_code(
|
|||||||
if station is None or not station.active:
|
if station is None or not station.active:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_404_NOT_FOUND,
|
status_code=status.HTTP_404_NOT_FOUND,
|
||||||
detail=f"Station '{code}' not found or inactive",
|
detail="Station not found",
|
||||||
)
|
)
|
||||||
recipes = await station_service.list_station_recipes(db, station.id)
|
recipes = await station_service.list_station_recipes(db, station.id)
|
||||||
return [_RecipeSummary.model_validate(r) for r in recipes]
|
return [RecipeSummary.model_validate(r) for r in recipes]
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{station_id}", response_model=StationResponse)
|
@router.get("/{station_id}", response_model=StationResponse)
|
||||||
@@ -95,7 +99,7 @@ async def remove_station(
|
|||||||
await station_service.delete_station(db, station_id)
|
await station_service.delete_station(db, station_id)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{station_id}/recipes", response_model=list[_RecipeSummary])
|
@router.get("/{station_id}/recipes", response_model=list[RecipeSummary])
|
||||||
async def list_assigned_recipes(
|
async def list_assigned_recipes(
|
||||||
station_id: int,
|
station_id: int,
|
||||||
admin: User = Depends(require_admin_user),
|
admin: User = Depends(require_admin_user),
|
||||||
@@ -103,7 +107,7 @@ async def list_assigned_recipes(
|
|||||||
):
|
):
|
||||||
"""Admin view: recipes assigned to this station (active only)."""
|
"""Admin view: recipes assigned to this station (active only)."""
|
||||||
recipes = await station_service.list_station_recipes(db, station_id)
|
recipes = await station_service.list_station_recipes(db, station_id)
|
||||||
return [_RecipeSummary.model_validate(r) for r in recipes]
|
return [RecipeSummary.model_validate(r) for r in recipes]
|
||||||
|
|
||||||
|
|
||||||
@router.post(
|
@router.post(
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ class StationRecipeAssignmentResponse(BaseModel):
|
|||||||
assigned_at: datetime
|
assigned_at: datetime
|
||||||
|
|
||||||
|
|
||||||
class _RecipeSummary(BaseModel):
|
class RecipeSummary(BaseModel):
|
||||||
model_config = ConfigDict(from_attributes=True)
|
model_config = ConfigDict(from_attributes=True)
|
||||||
id: int
|
id: int
|
||||||
code: str
|
code: str
|
||||||
@@ -54,4 +54,4 @@ class _RecipeSummary(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class StationWithRecipesResponse(StationResponse):
|
class StationWithRecipesResponse(StationResponse):
|
||||||
recipes: list[_RecipeSummary] = Field(default_factory=list)
|
recipes: list[RecipeSummary] = Field(default_factory=list)
|
||||||
|
|||||||
@@ -134,3 +134,70 @@ async def test_list_recipes_by_unknown_code_404(
|
|||||||
headers=auth_headers(measurement_tec_user),
|
headers=auth_headers(measurement_tec_user),
|
||||||
)
|
)
|
||||||
assert resp.status_code == 404
|
assert resp.status_code == 404
|
||||||
|
|
||||||
|
|
||||||
|
async def test_admin_can_list_stations(client: AsyncClient, admin_user):
|
||||||
|
await client.post(
|
||||||
|
"/api/stations",
|
||||||
|
headers=auth_headers(admin_user),
|
||||||
|
json={"code": "ST-L1", "name": "A"},
|
||||||
|
)
|
||||||
|
await client.post(
|
||||||
|
"/api/stations",
|
||||||
|
headers=auth_headers(admin_user),
|
||||||
|
json={"code": "ST-L2", "name": "B", "active": False},
|
||||||
|
)
|
||||||
|
resp = await client.get("/api/stations", headers=auth_headers(admin_user))
|
||||||
|
assert resp.status_code == 200
|
||||||
|
codes = {s["code"] for s in resp.json()}
|
||||||
|
assert {"ST-L1", "ST-L2"}.issubset(codes)
|
||||||
|
|
||||||
|
resp_active = await client.get(
|
||||||
|
"/api/stations?active_only=true", headers=auth_headers(admin_user),
|
||||||
|
)
|
||||||
|
assert resp_active.status_code == 200
|
||||||
|
active_codes = {s["code"] for s in resp_active.json()}
|
||||||
|
assert "ST-L1" in active_codes
|
||||||
|
assert "ST-L2" not in active_codes
|
||||||
|
|
||||||
|
|
||||||
|
async def test_assign_recipe_not_found_returns_404(
|
||||||
|
client: AsyncClient, admin_user,
|
||||||
|
):
|
||||||
|
created = await client.post(
|
||||||
|
"/api/stations",
|
||||||
|
headers=auth_headers(admin_user),
|
||||||
|
json={"code": "ST-NR", "name": "NR"},
|
||||||
|
)
|
||||||
|
sid = created.json()["id"]
|
||||||
|
resp = await client.post(
|
||||||
|
f"/api/stations/{sid}/recipes",
|
||||||
|
headers=auth_headers(admin_user),
|
||||||
|
json={"recipe_id": 99999},
|
||||||
|
)
|
||||||
|
assert resp.status_code == 404
|
||||||
|
|
||||||
|
|
||||||
|
async def test_duplicate_assignment_returns_409(
|
||||||
|
client: AsyncClient, admin_user, db_session,
|
||||||
|
):
|
||||||
|
recipe = await create_test_recipe(db_session, user_id=admin_user.id, code="REC-DUP")
|
||||||
|
await db_session.commit()
|
||||||
|
created = await client.post(
|
||||||
|
"/api/stations",
|
||||||
|
headers=auth_headers(admin_user),
|
||||||
|
json={"code": "ST-DUP-A", "name": "Dup"},
|
||||||
|
)
|
||||||
|
sid = created.json()["id"]
|
||||||
|
first = await client.post(
|
||||||
|
f"/api/stations/{sid}/recipes",
|
||||||
|
headers=auth_headers(admin_user),
|
||||||
|
json={"recipe_id": recipe.id},
|
||||||
|
)
|
||||||
|
assert first.status_code == 201
|
||||||
|
second = await client.post(
|
||||||
|
f"/api/stations/{sid}/recipes",
|
||||||
|
headers=auth_headers(admin_user),
|
||||||
|
json={"recipe_id": recipe.id},
|
||||||
|
)
|
||||||
|
assert second.status_code == 409
|
||||||
|
|||||||
Reference in New Issue
Block a user