test commit

Author: RustamovAkrom

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 24.1.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/pre-commit/mirrors-isort
     rev: v5.10.1
     hooks:
       - id: isort
+      
+  - repo: https://github.com/psf/black
+    rev: 24.1.0
+    hooks:
+      - id: black
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     rev: v0.14.7

pyproject.toml

@@ -20,8 +20,26 @@ dependencies = [
     "psycopg-binary>=3.2.13",
     "pydantic-settings>=2.12.0",
     "pydantic[email]>=2.12.5",
+    "pytest>=9.0.1",
+    "pytest-asyncio>=1.3.0",
+    "pytest-cov>=7.0.0",
     "python-dotenv>=1.2.1",
     "python-jose[cryptography]>=3.5.0",
     "ruff>=0.14.7",
+    "types-python-jose>=3.5.0.20250531",
     "uvicorn[standard]>=0.38.0",
 ]
+
+[tool.isort]
+profile = "black"
+line_length = 88  # тот же, что в black
+multi_line_output = 3
+include_trailing_comma = true
+
+[tool.black]
+line-length = 88
+target-version = ['py312']
+skip-string-normalization = true
+
+[tool.mypy]
+ignore_missing_imports = true

src/core/config.py

@@ -18,7 +18,7 @@ class BaseAppSettings(BaseSettings):
     DEBUG: bool = True
     RELOAD: bool = True
 
-    SECRET_KEY: str
+    SECRET_KEY: str = "SECRET_KEY"
     LOG_LEVEL: str = "INFO"
 
     CORS_ORIGINS: list[str] = ["*"]

src/core/exceptions.py

@@ -24,14 +24,22 @@ def __init__(
         super().__init__(self.detail)
 
 
-def api_exception_handler(request: Request, exc: APIException) -> JSONResponse:
-    content = {
-        "code": exc.code,
-        "detail": exc.detail,
-        "values": exc.values,
-    }
-    return JSONResponse(status_code=exc.status_code, content=content)
+async def api_exception_handler(request: Request, exc: Exception) -> JSONResponse:
+    """
+    Обработчик для FastAPI, принимает Exception (требование Starlette),
+    проверяет на APIException и возвращает JSONResponse.
+    """
+    if isinstance(exc, APIException):
+        content = {
+            "code": exc.code,
+            "detail": exc.detail,
+            "values": exc.values,
+        }
+        return JSONResponse(status_code=exc.status_code, content=content)
+
+    # fallback для остальных исключений
+    return JSONResponse(status_code=500, content={"code": "error", "detail": str(exc)})
 
 
 def register_exception_handlers(app: FastAPI) -> None:
-    app.add_exception_handler(APIException, api_exception_handler)
+    app.add_exception_handler(Exception, api_exception_handler)

src/db/crud/category.py

@@ -1,3 +1,5 @@
+from typing import Sequence
+
 from fastapi import Depends
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -11,7 +13,7 @@ class CategoryCRUD:
     def __init__(self, session: AsyncSession = Depends(get_db_session)):
         self.session = session
 
-    async def get_all(self) -> list[Category]:
+    async def get_all(self) -> Sequence[Category]:
         stmt = select(Category)
         result = await self.session.execute(stmt)
         return result.scalars().all()

src/db/migrations/env.py

@@ -2,36 +2,25 @@
 from logging.config import fileConfig
 
 from alembic import context
-from sqlalchemy.ext.asyncio.engine import create_async_engine
+from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.future import Connection
 
 from core.config import settings
 from db.meta import meta
 from db.models import load_all_models
 
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
 config = context.config
 
 # Load models
 load_all_models()
 
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
+# Logging
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
+# Target metadata
 target_metadata = meta
 
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
 
 def run_migrations_offline() -> None:
     context.configure(
@@ -46,11 +35,7 @@ def run_migrations_offline() -> None:
 
 
 def do_run_migrations(connection: Connection) -> None:
-    """
-    Run actual sync migrations.
-
-    :param connection: connection to the database.
-    """
+    """Run sync migrations in the async context."""
     context.configure(connection=connection, target_metadata=target_metadata)
 
     with context.begin_transaction():
@@ -65,8 +50,6 @@ async def run_migrations_online() -> None:
 
 
 if context.is_offline_mode():
-    task = run_migrations_offline()
+    run_migrations_offline()
 else:
-    task = run_migrations_online()
-
-asyncio.run(task)
+    asyncio.run(run_migrations_online())

src/schemas/user.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import BaseModel, EmailStr, Field
+from pydantic import BaseModel, ConfigDict, EmailStr, Field
 
 from db.models.users import UserRole
 
@@ -31,8 +31,7 @@ class UserOut(UserBaseScheme):
     is_active: bool = Field(..., description="Indicates if the user is active")
     role: UserRole = Field(..., description="The role assigned to the user")
 
-    class Config:
-        from_attributes = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class UserResponse(BaseModel):
@@ -53,17 +52,15 @@ class UserUpdate(UserBaseScheme):
         None, description="Indicates if the user is active"
     )
 
-    class Config:
-        from_attributes = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class UserInDB(UserBaseScheme):
     id: int = Field(..., description="The unique identifier of the user")
     hashed_password: str = Field(..., description="The hashed password of the user")
     is_active: bool = Field(..., description="Indicates if the user is active")
 
-    class Config:
-        from_attributes = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 __all__ = (

tests/__init__.py

@@ -0,0 +1,112 @@
+from collections.abc import AsyncGenerator
+from typing import Any
+
+import pytest
+from fastapi import FastAPI
+from httpx import ASGITransport, AsyncClient
+from sqlalchemy.ext.asyncio import (
+    AsyncEngine,
+    AsyncSession,
+    async_sessionmaker,
+    create_async_engine,
+)
+
+from src.app import create_app
+from src.core.config import get_app_settings
+from src.db.dependencies import get_db_session
+from src.db.meta import meta
+from src.db.models import load_all_models
+
+
+@pytest.fixture(scope="session")
+async def _engine() -> AsyncGenerator[AsyncEngine, None]:
+    """
+    Create engine and databases.
+
+    :yield: new engine.
+    """
+    settings = get_app_settings()
+
+    load_all_models()
+
+    engine = create_async_engine(str(settings.DATABASE_URL))
+    async with engine.begin() as conn:
+        await conn.run_sync(meta.create_all)
+
+    try:
+        yield engine
+    finally:
+        await engine.dispose()
+
+
+@pytest.fixture
+async def dbsession(
+    _engine: AsyncEngine,
+) -> AsyncGenerator[AsyncSession, None]:
+    """
+    Get session to database.
+
+    Fixture that returns a SQLAlchemy session with a SAVEPOINT, and the rollback to it
+    after the test completes.
+
+    :param _engine: current engine.
+    :yields: async session.
+    """
+    connection = await _engine.connect()
+    trans = await connection.begin()
+
+    session_maker = async_sessionmaker(
+        connection,
+        expire_on_commit=False,
+    )
+    session = session_maker()
+
+    try:
+        yield session
+    finally:
+        await session.close()
+        await trans.rollback()
+        await connection.close()
+
+
+@pytest.fixture
+async def fastapi_app(
+    dbsession: AsyncSession,
+) -> FastAPI:
+    """
+    Fixture for creating FastAPI app.
+
+    :return: fastapi app with mocked dependencies.
+    """
+    application = create_app()
+    application.dependency_overrides[get_db_session] = lambda: dbsession
+    return application
+
+
+@pytest.fixture(scope="session")
+def anyio_backend() -> str:
+    """
+    Backend for anyio pytest plugin.
+
+    :return: backend name.
+    """
+    return "asyncio"
+
+
+@pytest.fixture
+async def client(
+    fastapi_app: FastAPI,
+    anyio_backend: Any,
+) -> AsyncGenerator[AsyncClient, None]:
+    """
+    Fixture that creates client for requesting server.
+
+    :param fastapi_app: the application.
+    :yield: client for the app.
+    """
+    transport = ASGITransport(fastapi_app)
+    async with AsyncClient(
+        transport=transport,
+        base_url="http://test",
+    ) as client:
+        yield client

tests/conftest.py

@@ -0,0 +1,10 @@
+import pytest
+from httpx import AsyncClient
+
+
+@pytest.mark.anyio
+async def test_default(
+    client: AsyncClient,
+) -> None:
+    """Tests users instance creation."""
+    assert 201 == 201