Revert "Fix 204 responses for web API deletes"

This commit is contained in:
Egor
2025-09-28 02:25:01 +03:00
committed by GitHub
parent 9cc49e9f66
commit b5fa978023
2 changed files with 8 additions and 16 deletions

View File

@@ -2,7 +2,7 @@ from __future__ import annotations
from typing import Any
from fastapi import APIRouter, Depends, HTTPException, Response, status
from fastapi import APIRouter, Depends, HTTPException, status
from sqlalchemy.ext.asyncio import AsyncSession
from app.database.crud.promo_group import (
@@ -122,16 +122,12 @@ async def update_promo_group_endpoint(
return _serialize(group, members_count=members_count)
@router.delete(
"/{group_id}",
status_code=status.HTTP_204_NO_CONTENT,
response_class=Response,
)
@router.delete("/{group_id}", status_code=status.HTTP_204_NO_CONTENT)
async def delete_promo_group_endpoint(
group_id: int,
_: Any = Depends(require_api_token),
db: AsyncSession = Depends(get_db_session),
) -> Response:
) -> None:
group = await get_promo_group_by_id(db, group_id)
if not group:
raise HTTPException(status.HTTP_404_NOT_FOUND, "Promo group not found")
@@ -140,4 +136,4 @@ async def delete_promo_group_endpoint(
if not success:
raise HTTPException(status.HTTP_400_BAD_REQUEST, "Cannot delete default promo group")
return Response(status_code=status.HTTP_204_NO_CONTENT)
return None

View File

@@ -1,6 +1,6 @@
from __future__ import annotations
from fastapi import APIRouter, Depends, HTTPException, Response, status
from fastapi import APIRouter, Depends, HTTPException, status
from sqlalchemy.ext.asyncio import AsyncSession
from app.database.crud.web_api_token import (
@@ -92,20 +92,16 @@ async def activate_token(
return _serialize(token)
@router.delete(
"/{token_id}",
status_code=status.HTTP_204_NO_CONTENT,
response_class=Response,
)
@router.delete("/{token_id}", status_code=status.HTTP_204_NO_CONTENT)
async def delete_token_endpoint(
token_id: int,
_: WebApiToken = Depends(require_api_token),
db: AsyncSession = Depends(get_db_session),
) -> Response:
) -> None:
token = await get_token_by_id(db, token_id)
if not token:
raise HTTPException(status.HTTP_404_NOT_FOUND, "Token not found")
await delete_token(db, token)
await db.commit()
return Response(status_code=status.HTTP_204_NO_CONTENT)
return None