From 619cd6b6903fd50cbc8b5ad70470c76eece5699a Mon Sep 17 00:00:00 2001 From: Zerohertz Date: Thu, 30 Jan 2025 22:31:20 +0900 Subject: [PATCH] :recycle: refactor: fastapi.status (resolved: #23) --- app/api/v1/endpoints/admin/users.py | 3 +-- app/api/v1/endpoints/auth.py | 3 +-- app/api/v1/endpoints/users.py | 3 +-- app/exceptions/auth.py | 2 +- app/exceptions/database.py | 2 +- app/exceptions/handlers.py | 7 +++---- app/tests/api/v1/test_auth.py | 2 +- app/tests/api/v1/test_shields.py | 2 +- app/tests/api/v1/test_users.py | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/api/v1/endpoints/admin/users.py b/app/api/v1/endpoints/admin/users.py index 3c08a48..7a59ded 100644 --- a/app/api/v1/endpoints/admin/users.py +++ b/app/api/v1/endpoints/admin/users.py @@ -1,8 +1,7 @@ from typing import Sequence from dependency_injector.wiring import Provide, inject -from fastapi import Depends -from starlette import status +from fastapi import Depends, status from app.core.auth import AdminDeps from app.core.container import Container diff --git a/app/api/v1/endpoints/auth.py b/app/api/v1/endpoints/auth.py index d2245ef..5199958 100644 --- a/app/api/v1/endpoints/auth.py +++ b/app/api/v1/endpoints/auth.py @@ -1,7 +1,6 @@ from dependency_injector.wiring import Provide, inject -from fastapi import Depends, Response +from fastapi import Depends, Response, status from fastapi.responses import RedirectResponse -from starlette import status from app.core.auth import AuthDeps from app.core.configs import configs diff --git a/app/api/v1/endpoints/users.py b/app/api/v1/endpoints/users.py index 75576f9..5d31282 100644 --- a/app/api/v1/endpoints/users.py +++ b/app/api/v1/endpoints/users.py @@ -1,6 +1,5 @@ from dependency_injector.wiring import Provide, inject -from fastapi import Depends -from starlette import status +from fastapi import Depends, status from app.core.auth import AuthDeps from app.core.container import Container diff --git a/app/exceptions/auth.py b/app/exceptions/auth.py index ff7c206..a7fc527 100644 --- a/app/exceptions/auth.py +++ b/app/exceptions/auth.py @@ -1,4 +1,4 @@ -from starlette import status +from fastapi import status from app.exceptions.base import CoreException diff --git a/app/exceptions/database.py b/app/exceptions/database.py index fe233ff..e3e2ced 100644 --- a/app/exceptions/database.py +++ b/app/exceptions/database.py @@ -1,4 +1,4 @@ -from starlette import status +from fastapi import status from app.exceptions.base import CoreException diff --git a/app/exceptions/handlers.py b/app/exceptions/handlers.py index c0eeacb..42089ae 100644 --- a/app/exceptions/handlers.py +++ b/app/exceptions/handlers.py @@ -1,7 +1,6 @@ -from fastapi import Request +from fastapi import Request, status from fastapi.responses import JSONResponse from loguru import logger -from starlette.status import HTTP_500_INTERNAL_SERVER_ERROR from app.exceptions.base import CoreException from app.schemas.responses import APIResponse @@ -12,10 +11,10 @@ async def global_exception_handler(request: Request, exc: Exception) -> JSONResp name = exc.__class__.__name__ return JSONResponse( content=APIResponse.error( - status=HTTP_500_INTERNAL_SERVER_ERROR, + status=status.HTTP_500_INTERNAL_SERVER_ERROR, message=f"""[{name}] {" ".join(exc.args)}""", ).model_dump(mode="json"), - status_code=HTTP_500_INTERNAL_SERVER_ERROR, + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, ) diff --git a/app/tests/api/v1/test_auth.py b/app/tests/api/v1/test_auth.py index 5d3211d..9aac6dc 100644 --- a/app/tests/api/v1/test_auth.py +++ b/app/tests/api/v1/test_auth.py @@ -1,7 +1,7 @@ from faker import Faker +from fastapi import status from fastapi.testclient import TestClient from loguru import logger -from starlette import status from app.core.configs import configs from app.models.enums import OAuthProvider, Role diff --git a/app/tests/api/v1/test_shields.py b/app/tests/api/v1/test_shields.py index 5188a87..5917366 100644 --- a/app/tests/api/v1/test_shields.py +++ b/app/tests/api/v1/test_shields.py @@ -1,5 +1,5 @@ +from fastapi import status from fastapi.testclient import TestClient -from starlette import status from app.core.configs import configs diff --git a/app/tests/api/v1/test_users.py b/app/tests/api/v1/test_users.py index 06ba2e8..3acf5d5 100644 --- a/app/tests/api/v1/test_users.py +++ b/app/tests/api/v1/test_users.py @@ -1,8 +1,8 @@ import pytest from faker import Faker +from fastapi import status from fastapi.testclient import TestClient from loguru import logger -from starlette import status from app.core.configs import configs from app.schemas.users import UserPasswordRequest, UserPatchRequest, UserRequest