Add some more tests (#97)

* Bump deps

* Fix Dockerfile

* Update migrations

* Add factories, fixtures, create user tests

* Add set user password tests

* Add grant admin tests

* Add revoke admin tests

* Add activate user tests

* Add deactivate user tests

* Add list users tests

Author: ivan-borovets

Dockerfile

@@ -18,15 +18,15 @@ COPY pyproject.toml uv.lock README.md ./
 RUN if [ "${ENVIRONMENT}" = "prod" ]; then \
       uv sync --frozen --no-cache --no-dev --no-install-project; \
     else \
-      uv sync --frozen --dev --no-install-project; \
+      uv sync --frozen --no-cache --dev --no-install-project; \
     fi
 
 COPY . .
 
 RUN if [ "${ENVIRONMENT}" = "prod" ]; then \
       uv sync --frozen --no-cache --no-dev; \
     else \
-      uv sync --frozen --dev; \
+      uv sync --frozen --no-cache --dev; \
     fi
 
 RUN groupadd -r runner

README.md

@@ -29,7 +29,7 @@ uvicorn app.main.run:make_app --host 0.0.0.0 --port 8000 --reload
 ```
 Full API access:
 - create user via sign up
-- set its role to `SUPER_ADMIN` manually in DB
+- set its role to `super_admin` manually in DB
 - log in as super admin
 
 Stop

pyproject.toml

@@ -13,33 +13,33 @@ dependencies = [
   "alembic-postgresql-enum==1.10.0",
   "bcrypt==5.0.0",
   "dishka==1.9.1",
-  "fastapi==0.133.1",
+  "fastapi==0.135.3",
   "fastapi-error-map==0.9.10",
   "psycopg[binary]==3.3.3",
   "pydantic-settings==2.13.1",
-  "pyjwt[crypto]==2.11.0",
-  "sqlalchemy[mypy]==2.0.47",
+  "pyjwt[crypto]==2.12.1",
+  "sqlalchemy[mypy]==2.0.48",
   "uuid-utils==0.14.1",
-  "uvicorn==0.41.0",
+  "uvicorn==0.42.0",
 ]
 
 [dependency-groups]
 dev = [
   "asgi-lifespan==2.1.0",
-  "coverage==7.13.4",
-  "deptry==0.24.0",
+  "coverage==7.13.5",
+  "deptry==0.25.1",
   "httpx==0.28.1",
-  "import-linter==2.10",
+  "import-linter==2.11",
   "line-profiler==5.0.2",
-  "mypy==1.19.1",
+  "mypy==1.20.0",
   "pip-audit==2.10.0",
   "pre-commit==4.5.1",
   "pytest==9.0.2",
   "pytest-asyncio==1.3.0",
-  "pytest-cov==7.0.0",
-  "ruff==0.15.4",
+  "pytest-cov==7.1.0",
+  "ruff==0.15.8",
   "slotscheck==0.19.1",
-  "tombi==0.7.33",
+  "tombi==0.9.13",
 ]
 
 [build-system]

…mbic/versions/2026-03-02_221518_users.py …mbic/versions/2026-04-01_222815_users.pysrc/app/infrastructure/persistence_sqla/alembic/versions/2026-03-02_221518_users.py renamed to src/app/infrastructure/persistence_sqla/alembic/versions/2026-04-01_222815_users.py src/app/infrastructure/persistence_sqla/alembic/versions/2026-03-02_221518_users.py renamed to src/app/infrastructure/persistence_sqla/alembic/versions/2026-04-01_222815_users.py

@@ -1,8 +1,8 @@
 """users
 
-Revision ID: c64b121a3428
+Revision ID: 0e6c649ac887
 Revises:
-Create Date: 2026-03-02 22:15:18.425263
+Create Date: 2026-04-01 22:28:15.224058
 
 """
 
@@ -13,7 +13,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = "c64b121a3428"
+revision: str = "0e6c649ac887"
 down_revision: Union[str, Sequence[str], None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
@@ -26,7 +26,7 @@ def upgrade() -> None:
         sa.Column("id", sa.UUID(), nullable=False),
         sa.Column("username", sa.String(length=20), nullable=False),
         sa.Column("password_hash", sa.LargeBinary(), nullable=False),
-        sa.Column("role", sa.Enum("SUPER_ADMIN", "ADMIN", "USER", name="user_role", native_enum=False), nullable=False),
+        sa.Column("role", sa.Enum("super_admin", "admin", "user", name="user_role", native_enum=False), nullable=False),
         sa.Column("is_active", sa.Boolean(), nullable=False),
         sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
         sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False),

…sions/2026-03-02_230628_auth_sessions.py …sions/2026-04-01_223011_auth_sessions.pysrc/app/infrastructure/persistence_sqla/alembic/versions/2026-03-02_230628_auth_sessions.py renamed to src/app/infrastructure/persistence_sqla/alembic/versions/2026-04-01_223011_auth_sessions.py src/app/infrastructure/persistence_sqla/alembic/versions/2026-03-02_230628_auth_sessions.py renamed to src/app/infrastructure/persistence_sqla/alembic/versions/2026-04-01_223011_auth_sessions.py

@@ -1,8 +1,8 @@
 """auth_sessions
 
-Revision ID: 7b50faaefa7c
-Revises: c64b121a3428
-Create Date: 2026-03-02 23:06:28.995808
+Revision ID: c025baa8044e
+Revises: 0e6c649ac887
+Create Date: 2026-04-01 22:30:11.002095
 
 """
 
@@ -13,8 +13,8 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = "7b50faaefa7c"
-down_revision: Union[str, Sequence[str], None] = "c64b121a3428"
+revision: str = "c025baa8044e"
+down_revision: Union[str, Sequence[str], None] = "0e6c649ac887"
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 

src/app/infrastructure/persistence_sqla/mappings/user.py

@@ -1,3 +1,5 @@
+from enum import StrEnum
+
 from sqlalchemy import UUID, Boolean, Column, DateTime, Enum, LargeBinary, String, Table
 from sqlalchemy.orm import composite
 
@@ -7,6 +9,12 @@
 from app.core.common.value_objects.utc_datetime import UtcDatetime
 from app.infrastructure.persistence_sqla.registry import mapper_registry
 
+
+def get_strenum_values(enum_cls: type[StrEnum]) -> list[str]:
+    """Return member values instead of member names for SQLAlchemy Enum storage."""
+    return [e.value for e in enum_cls]
+
+
 users_table = Table(
     "users",
     mapper_registry.metadata,
@@ -20,6 +28,7 @@
             name="user_role",
             native_enum=False,
             validate_strings=True,
+            values_callable=get_strenum_values,
         ),
         nullable=False,
     ),

tests/integration/with_infra/factories.py

@@ -74,3 +74,25 @@ async def create_user_with_password(
         role=role,
         is_active=is_active,
     )
+
+
+async def create_super_admin_with_password(
+    user_service: UserService,
+    *,
+    raw_user_id: uuid.UUID | None = None,
+    raw_username: str | None = None,
+    raw_password: str | None = None,
+    is_active: bool = True,
+    raw_now: datetime | None = None,
+) -> User:
+    """System role is not assignable via UserService; create as USER, then promote."""
+    user = await create_user_with_password(
+        user_service,
+        raw_user_id=raw_user_id,
+        raw_username=raw_username,
+        raw_password=raw_password,
+        is_active=is_active,
+        raw_now=raw_now,
+    )
+    user.role = UserRole.SUPER_ADMIN
+    return user

tests/integration/with_infra/users/__init__.py

@@ -0,0 +1,41 @@
+import httpx
+import pytest
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.common.entities.types_ import UserRole
+from app.core.common.entities.user import User
+from app.core.common.services.user import UserService
+from tests.integration.with_infra.authentication import authenticate
+from tests.integration.with_infra.factories import (
+    create_raw_password,
+    create_super_admin_with_password,
+    create_user_with_password,
+)
+
+
+@pytest.fixture
+async def it_admin(
+    it_client: httpx.AsyncClient,
+    it_session: AsyncSession,
+    it_user_service: UserService,
+) -> User:
+    password = create_raw_password()
+    admin = await create_user_with_password(it_user_service, raw_password=password, role=UserRole.ADMIN)
+    it_session.add(admin)
+    await it_session.commit()
+    await authenticate(it_client, admin.username.value, password)
+    return admin
+
+
+@pytest.fixture
+async def it_super_admin(
+    it_client: httpx.AsyncClient,
+    it_session: AsyncSession,
+    it_user_service: UserService,
+) -> User:
+    password = create_raw_password()
+    super_admin = await create_super_admin_with_password(it_user_service, raw_password=password)
+    it_session.add(super_admin)
+    await it_session.commit()
+    await authenticate(it_client, super_admin.username.value, password)
+    return super_admin

tests/integration/with_infra/users/conftest.py

@@ -0,0 +1,3 @@
+from typing import Final
+
+USERS_ENDPOINT: Final[str] = "/api/v1/users/"