Refactor project structure

ivan-borovets · ivan-borovets · commit 8b926e0c13c4 · 2025-07-25T23:59:03.000+05:00
diff --git a/README.md b/README.md
@@ -433,7 +433,7 @@ natural.
         │   └── ...                              # ports, enums, exceptions, etc.
         │
         ├── application/...                      # application layer
-        │   ├── commands/                        # write operations, business-critical reads
+        │   ├── commands/                        # write ops, business-critical reads
         │   │   ├── create_user.py               # interactor
         │   │   └── ...                          # other interactors
         │   ├── queries/                         # optimized read operations
@@ -444,9 +444,9 @@ natural.
         │       └── ...                          # ports, exceptions, etc.
         │
         ├── infrastructure/...                   # infrastructure layer
-        │   ├── auth_session/...                 # auth context (session-based)
-        │   ├── handlers/...                     # account handlers (log in, log out, sign up)
-        │   └── ...                              # adapters, persistence, exceptions, etc.
+        │   ├── adapters/...                     # port adapters
+        │   ├── auth/...                         # auth context (session-based)
+        │   └── ...                              # persistence, exceptions, etc.
         │
         ├── presentation/...                     # presentation layer
         │   └── http/                            # http interface
diff --git a/pyproject.toml b/pyproject.toml
@@ -134,7 +134,7 @@ ignore = [
 #
 "src/app/domain/value_objects/base.py" = ["B024", ]                          # abstract-base-class-without-abstract-method
 "src/app/infrastructure/adapters/password_hasher_bcrypt.py" = ["E501"]       # line-too-long
-"src/app/infrastructure/constants.py" = ["S105"]                             # hardcoded-password-string
+"src/app/infrastructure/auth/session/constants.py" = ["S105"]                # hardcoded-password-string
 "src/app/presentation/http/auth/constants.py" = ["S105"]                     # hardcoded-password-string
 "src/app/presentation/http/exceptions/handlers.py" = ["RUF029", ]            # unused-async
 "scripts/dishka/plot_dependencies_data.py" = ["T201", ]                      # print
diff --git a/src/app/application/common/services/authorization/authorize.py b/src/app/application/common/services/authorization/authorize.py
@@ -1,9 +1,9 @@
-from app.application.common.constants import AUTHZ_NOT_AUTHORIZED
 from app.application.common.exceptions.authorization import AuthorizationError
 from app.application.common.services.authorization.base import (
     Permission,
     PermissionContext,
 )
+from app.application.common.services.constants import AUTHZ_NOT_AUTHORIZED
 
 
 def authorize[PC: PermissionContext](
diff --git a/src/app/application/common/services/constants.py b/src/app/application/common/services/constants.py
diff --git a/src/app/application/common/services/current_user.py b/src/app/application/common/services/current_user.py
@@ -1,10 +1,13 @@
 import logging
 
-from app.application.common.constants import AUTHZ_NO_CURRENT_USER, AUTHZ_NOT_AUTHORIZED
 from app.application.common.exceptions.authorization import AuthorizationError
 from app.application.common.ports.access_revoker import AccessRevoker
 from app.application.common.ports.identity_provider import IdentityProvider
 from app.application.common.ports.user_command_gateway import UserCommandGateway
+from app.application.common.services.constants import (
+    AUTHZ_NO_CURRENT_USER,
+    AUTHZ_NOT_AUTHORIZED,
+)
 from app.domain.entities.user import User
 
 log = logging.getLogger(__name__)
diff --git a/src/app/infrastructure/adapters/constants.py b/src/app/infrastructure/adapters/constants.py
@@ -0,0 +1,8 @@
+from typing import Final
+
+DB_CONSTRAINT_VIOLATION: Final[str] = "Database constraint violation."
+DB_COMMIT_DONE: Final[str] = "Commit was done."
+DB_COMMIT_FAILED: Final[str] = "Commit failed."
+DB_FLUSH_DONE: Final[str] = "Flush was done."
+DB_FLUSH_FAILED: Final[str] = "Flush failed."
+DB_QUERY_FAILED: Final[str] = "Database query failed."
diff --git a/src/app/infrastructure/adapters/main_transaction_manager_sqla.py b/src/app/infrastructure/adapters/main_transaction_manager_sqla.py
@@ -8,15 +8,15 @@
     TransactionManager,
 )
 from app.domain.exceptions.user import UsernameAlreadyExistsError
-from app.infrastructure.adapters.types import MainAsyncSession
-from app.infrastructure.constants import (
+from app.infrastructure.adapters.constants import (
     DB_COMMIT_DONE,
     DB_COMMIT_FAILED,
     DB_CONSTRAINT_VIOLATION,
     DB_FLUSH_DONE,
     DB_FLUSH_FAILED,
     DB_QUERY_FAILED,
 )
+from app.infrastructure.adapters.types import MainAsyncSession
 from app.infrastructure.exceptions.gateway import DataMapperError
 
 log = logging.getLogger(__name__)
diff --git a/src/app/infrastructure/adapters/user_data_mapper_sqla.py b/src/app/infrastructure/adapters/user_data_mapper_sqla.py
@@ -5,8 +5,8 @@
 from app.domain.entities.user import User
 from app.domain.value_objects.user_id import UserId
 from app.domain.value_objects.username.username import Username
+from app.infrastructure.adapters.constants import DB_QUERY_FAILED
 from app.infrastructure.adapters.types import MainAsyncSession
-from app.infrastructure.constants import DB_QUERY_FAILED
 from app.infrastructure.exceptions.gateway import DataMapperError
 
 
diff --git a/src/app/infrastructure/adapters/user_reader_sqla.py b/src/app/infrastructure/adapters/user_reader_sqla.py
@@ -10,8 +10,8 @@
 from app.application.common.query_params.sorting import SortingOrder
 from app.application.common.query_params.user import UserListParams
 from app.domain.enums.user_role import UserRole
+from app.infrastructure.adapters.constants import DB_QUERY_FAILED
 from app.infrastructure.adapters.types import MainAsyncSession
-from app.infrastructure.constants import DB_QUERY_FAILED
 from app.infrastructure.exceptions.gateway import ReaderError
 from app.infrastructure.persistence_sqla.mappings.user import users_table
 
diff --git a/src/app/infrastructure/auth/__init__.py b/src/app/infrastructure/auth/__init__.py
diff --git a/src/app/infrastructure/auth/adapters/__init__.py b/src/app/infrastructure/auth/adapters/__init__.py
diff --git a/src/app/infrastructure/auth/adapters/access_revoker.py b/src/app/infrastructure/auth/adapters/access_revoker.py
@@ -1,6 +1,6 @@
 from app.application.common.ports.access_revoker import AccessRevoker
 from app.domain.value_objects.user_id import UserId
-from app.infrastructure.auth_session.service import AuthSessionService
+from app.infrastructure.auth.session.service import AuthSessionService
 
 
 class AuthSessionAccessRevoker(AccessRevoker):
diff --git a/src/app/infrastructure/auth/adapters/data_mapper_sqla.py b/src/app/infrastructure/auth/adapters/data_mapper_sqla.py
@@ -2,12 +2,12 @@
 from sqlalchemy.exc import SQLAlchemyError
 
 from app.domain.value_objects.user_id import UserId
-from app.infrastructure.auth_session.adapters.types import AuthAsyncSession
-from app.infrastructure.auth_session.model import AuthSession
-from app.infrastructure.auth_session.ports.gateway import (
+from app.infrastructure.adapters.constants import DB_QUERY_FAILED
+from app.infrastructure.auth.adapters.types import AuthAsyncSession
+from app.infrastructure.auth.session.model import AuthSession
+from app.infrastructure.auth.session.ports.gateway import (
     AuthSessionGateway,
 )
-from app.infrastructure.constants import DB_QUERY_FAILED
 from app.infrastructure.exceptions.gateway import DataMapperError
 
 
diff --git a/src/app/infrastructure/auth/adapters/identity_provider.py b/src/app/infrastructure/auth/adapters/identity_provider.py
@@ -1,6 +1,6 @@
 from app.application.common.ports.identity_provider import IdentityProvider
 from app.domain.value_objects.user_id import UserId
-from app.infrastructure.auth_session.service import AuthSessionService
+from app.infrastructure.auth.session.service import AuthSessionService
 
 
 class AuthSessionIdentityProvider(IdentityProvider):
diff --git a/src/app/infrastructure/auth/adapters/transaction_manager_sqla.py b/src/app/infrastructure/auth/adapters/transaction_manager_sqla.py
@@ -2,15 +2,15 @@
 
 from sqlalchemy.exc import SQLAlchemyError
 
-from app.infrastructure.auth_session.adapters.types import AuthAsyncSession
-from app.infrastructure.auth_session.ports.transaction_manager import (
-    AuthSessionTransactionManager,
-)
-from app.infrastructure.constants import (
+from app.infrastructure.adapters.constants import (
     DB_COMMIT_DONE,
     DB_COMMIT_FAILED,
     DB_QUERY_FAILED,
 )
+from app.infrastructure.auth.adapters.types import AuthAsyncSession
+from app.infrastructure.auth.session.ports.transaction_manager import (
+    AuthSessionTransactionManager,
+)
 from app.infrastructure.exceptions.gateway import DataMapperError
 
 log = logging.getLogger(__name__)
diff --git a/src/app/infrastructure/auth/adapters/types.py b/src/app/infrastructure/auth/adapters/types.py
diff --git a/src/app/infrastructure/auth/exceptions.py b/src/app/infrastructure/auth/exceptions.py
diff --git a/src/app/infrastructure/auth/handlers/__init__.py b/src/app/infrastructure/auth/handlers/__init__.py
diff --git a/src/app/infrastructure/auth/handlers/constants.py b/src/app/infrastructure/auth/handlers/constants.py
@@ -0,0 +1,6 @@
+from typing import Final
+
+AUTH_ACCOUNT_INACTIVE: Final[str] = "Your account is inactive. Please contact support."
+AUTH_ALREADY_AUTHENTICATED: Final[str] = (
+    "You are already authenticated. Consider logging out."
+)
diff --git a/src/app/infrastructure/auth/handlers/log_in.py b/src/app/infrastructure/auth/handlers/log_in.py
@@ -8,16 +8,16 @@
 from app.domain.services.user import UserService
 from app.domain.value_objects.raw_password.raw_password import RawPassword
 from app.domain.value_objects.username.username import Username
-from app.infrastructure.auth_session.service import AuthSessionService
-from app.infrastructure.constants import (
-    AUTH_ACCOUNT_INACTIVE,
-    AUTH_ALREADY_AUTHENTICATED,
-    AUTH_INVALID_PASSWORD,
-)
-from app.infrastructure.exceptions.authentication import (
+from app.infrastructure.auth.exceptions import (
     AlreadyAuthenticatedError,
     AuthenticationError,
 )
+from app.infrastructure.auth.handlers.constants import (
+    AUTH_ACCOUNT_INACTIVE,
+    AUTH_ALREADY_AUTHENTICATED,
+)
+from app.infrastructure.auth.session.constants import AUTH_INVALID_PASSWORD
+from app.infrastructure.auth.session.service import AuthSessionService
 
 log = logging.getLogger(__name__)
 
diff --git a/src/app/infrastructure/auth/handlers/log_out.py b/src/app/infrastructure/auth/handlers/log_out.py
@@ -1,7 +1,7 @@
 import logging
 
 from app.application.common.services.current_user import CurrentUserService
-from app.infrastructure.auth_session.service import AuthSessionService
+from app.infrastructure.auth.session.service import AuthSessionService
 
 log = logging.getLogger(__name__)
 
diff --git a/src/app/infrastructure/auth/handlers/sign_up.py b/src/app/infrastructure/auth/handlers/sign_up.py
@@ -10,11 +10,13 @@
 from app.domain.services.user import UserService
 from app.domain.value_objects.raw_password.raw_password import RawPassword
 from app.domain.value_objects.username.username import Username
-from app.infrastructure.constants import AUTH_ALREADY_AUTHENTICATED
-from app.infrastructure.exceptions.authentication import (
+from app.infrastructure.auth.exceptions import (
     AlreadyAuthenticatedError,
     AuthenticationError,
 )
+from app.infrastructure.auth.handlers.constants import (
+    AUTH_ALREADY_AUTHENTICATED,
+)
 
 log = logging.getLogger(__name__)
 
diff --git a/src/app/infrastructure/auth/session/__init__.py b/src/app/infrastructure/auth/session/__init__.py
diff --git a/src/app/infrastructure/auth/session/constants.py b/src/app/infrastructure/auth/session/constants.py
@@ -1,22 +1,11 @@
 from typing import Final
 
-AUTH_ACCOUNT_INACTIVE: Final[str] = "Your account is inactive. Please contact support."
-AUTH_ALREADY_AUTHENTICATED: Final[str] = (
-    "You are already authenticated. Consider logging out."
-)
 AUTH_INVALID_PASSWORD: Final[str] = "Invalid password."
 AUTH_IS_UNAVAILABLE: Final[str] = (
     "Authentication is currently unavailable. Please try again later."
 )
 AUTH_NOT_AUTHENTICATED: Final[str] = "Not authenticated."
-AUTH_SESSION_NOT_FOUND: Final[str] = "Session not found."
 AUTH_SESSION_EXPIRED: Final[str] = "Session expired."
 AUTH_SESSION_EXTENSION_FAILED: Final[str] = "Auth session extension failed."
 AUTH_SESSION_EXTRACTION_FAILED: Final[str] = "Auth session extraction failed."
-
-DB_CONSTRAINT_VIOLATION: Final[str] = "Database constraint violation."
-DB_COMMIT_DONE: Final[str] = "Commit was done."
-DB_COMMIT_FAILED: Final[str] = "Commit failed."
-DB_FLUSH_DONE: Final[str] = "Flush was done."
-DB_FLUSH_FAILED: Final[str] = "Flush failed."
-DB_QUERY_FAILED: Final[str] = "Database query failed."
+AUTH_SESSION_NOT_FOUND: Final[str] = "Session not found."
diff --git a/src/app/infrastructure/auth/session/id_generator_str.py b/src/app/infrastructure/auth/session/id_generator_str.py
diff --git a/src/app/infrastructure/auth/session/model.py b/src/app/infrastructure/auth/session/model.py
diff --git a/src/app/infrastructure/auth/session/ports/__init__.py b/src/app/infrastructure/auth/session/ports/__init__.py
diff --git a/src/app/infrastructure/auth/session/ports/gateway.py b/src/app/infrastructure/auth/session/ports/gateway.py
@@ -2,7 +2,7 @@
 from typing import Protocol
 
 from app.domain.value_objects.user_id import UserId
-from app.infrastructure.auth_session.model import AuthSession
+from app.infrastructure.auth.session.model import AuthSession
 
 
 class AuthSessionGateway(Protocol):
diff --git a/src/app/infrastructure/auth/session/ports/transaction_manager.py b/src/app/infrastructure/auth/session/ports/transaction_manager.py
diff --git a/src/app/infrastructure/auth/session/ports/transport.py b/src/app/infrastructure/auth/session/ports/transport.py
@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from typing import Protocol
 
-from app.infrastructure.auth_session.model import AuthSession
+from app.infrastructure.auth.session.model import AuthSession
 
 
 class AuthSessionTransport(Protocol):
diff --git a/src/app/infrastructure/auth/session/service.py b/src/app/infrastructure/auth/session/service.py
@@ -2,25 +2,27 @@
 from datetime import datetime
 
 from app.domain.value_objects.user_id import UserId
-from app.infrastructure.auth_session.id_generator_str import StrAuthSessionIdGenerator
-from app.infrastructure.auth_session.model import AuthSession
-from app.infrastructure.auth_session.ports.gateway import (
-    AuthSessionGateway,
-)
-from app.infrastructure.auth_session.ports.transaction_manager import (
-    AuthSessionTransactionManager,
-)
-from app.infrastructure.auth_session.ports.transport import AuthSessionTransport
-from app.infrastructure.auth_session.timer_utc import UtcAuthSessionTimer
-from app.infrastructure.constants import (
+from app.infrastructure.auth.exceptions import AuthenticationError
+from app.infrastructure.auth.session.constants import (
     AUTH_IS_UNAVAILABLE,
     AUTH_NOT_AUTHENTICATED,
     AUTH_SESSION_EXPIRED,
     AUTH_SESSION_EXTENSION_FAILED,
     AUTH_SESSION_EXTRACTION_FAILED,
     AUTH_SESSION_NOT_FOUND,
 )
-from app.infrastructure.exceptions.authentication import AuthenticationError
+from app.infrastructure.auth.session.id_generator_str import (
+    StrAuthSessionIdGenerator,
+)
+from app.infrastructure.auth.session.model import AuthSession
+from app.infrastructure.auth.session.ports.gateway import (
+    AuthSessionGateway,
+)
+from app.infrastructure.auth.session.ports.transaction_manager import (
+    AuthSessionTransactionManager,
+)
+from app.infrastructure.auth.session.ports.transport import AuthSessionTransport
+from app.infrastructure.auth.session.timer_utc import UtcAuthSessionTimer
 from app.infrastructure.exceptions.gateway import DataMapperError
 
 log = logging.getLogger(__name__)
diff --git a/src/app/infrastructure/auth/session/timer_utc.py b/src/app/infrastructure/auth/session/timer_utc.py
diff --git a/src/app/infrastructure/persistence_sqla/mappings/auth_session.py b/src/app/infrastructure/persistence_sqla/mappings/auth_session.py
@@ -2,7 +2,7 @@
 from sqlalchemy.orm import composite
 
 from app.domain.value_objects.user_id import UserId
-from app.infrastructure.auth_session.model import AuthSession
+from app.infrastructure.auth.session.model import AuthSession
 from app.infrastructure.persistence_sqla.registry import mapping_registry
 
 auth_sessions_table = Table(
diff --git a/src/app/infrastructure/persistence_sqla/provider.py b/src/app/infrastructure/persistence_sqla/provider.py
@@ -12,7 +12,7 @@
 from app.infrastructure.adapters.types import (
     MainAsyncSession,
 )
-from app.infrastructure.auth_session.adapters.types import AuthAsyncSession
+from app.infrastructure.auth.adapters.types import AuthAsyncSession
 from app.infrastructure.persistence_sqla.config import PostgresDsn, SqlaEngineConfig
 
 log = logging.getLogger(__name__)
diff --git a/src/app/presentation/http/auth/access_token_processor_jwt.py b/src/app/presentation/http/auth/access_token_processor_jwt.py
@@ -3,7 +3,7 @@
 
 import jwt
 
-from app.infrastructure.auth_session.model import AuthSession
+from app.infrastructure.auth.session.model import AuthSession
 from app.presentation.http.auth.constants import (
     ACCESS_TOKEN_INVALID_OR_EXPIRED,
     ACCESS_TOKEN_PAYLOAD_MISSING,
diff --git a/src/app/presentation/http/auth/adapters/session_transport_jwt_cookie.py b/src/app/presentation/http/auth/adapters/session_transport_jwt_cookie.py
@@ -2,8 +2,8 @@
 
 from starlette.requests import Request
 
-from app.infrastructure.auth_session.model import AuthSession
-from app.infrastructure.auth_session.ports.transport import AuthSessionTransport
+from app.infrastructure.auth.session.model import AuthSession
+from app.infrastructure.auth.session.ports.transport import AuthSessionTransport
 from app.presentation.http.auth.access_token_processor_jwt import (
     JwtAccessTokenProcessor,
 )
diff --git a/src/app/presentation/http/controllers/account/log_in.py b/src/app/presentation/http/controllers/account/log_in.py
@@ -2,7 +2,7 @@
 from dishka.integrations.fastapi import inject
 from fastapi import APIRouter, status
 
-from app.infrastructure.handlers.log_in import LogInHandler, LogInRequest
+from app.infrastructure.auth.handlers.log_in import LogInHandler, LogInRequest
 from app.presentation.http.exceptions.schemas import (
     ExceptionSchema,
     ExceptionSchemaDetailed,
diff --git a/src/app/presentation/http/controllers/account/log_out.py b/src/app/presentation/http/controllers/account/log_out.py
@@ -2,7 +2,7 @@
 from dishka.integrations.fastapi import inject
 from fastapi import APIRouter, Security, status
 
-from app.infrastructure.handlers.log_out import LogOutHandler
+from app.infrastructure.auth.handlers.log_out import LogOutHandler
 from app.presentation.http.auth.fastapi_openapi_markers import cookie_scheme
 from app.presentation.http.exceptions.schemas import (
     ExceptionSchema,
diff --git a/src/app/presentation/http/controllers/account/sign_up.py b/src/app/presentation/http/controllers/account/sign_up.py
@@ -2,7 +2,7 @@
 from dishka.integrations.fastapi import inject
 from fastapi import APIRouter, status
 
-from app.infrastructure.handlers.sign_up import (
+from app.infrastructure.auth.handlers.sign_up import (
     SignUpHandler,
     SignUpRequest,
     SignUpResponse,
diff --git a/src/app/presentation/http/exceptions/constants.py b/src/app/presentation/http/exceptions/constants.py
@@ -16,7 +16,7 @@
     UsernameAlreadyExistsError,
     UserNotFoundByUsernameError,
 )
-from app.infrastructure.exceptions.authentication import (
+from app.infrastructure.auth.exceptions import (
     AlreadyAuthenticatedError,
     AuthenticationError,
 )
diff --git a/src/app/setup/ioc/di_providers/application.py b/src/app/setup/ioc/di_providers/application.py
@@ -22,10 +22,10 @@
     SqlaUserDataMapper,
 )
 from app.infrastructure.adapters.user_reader_sqla import SqlaUserReader
-from app.infrastructure.auth_session.adapters.access_revoker import (
+from app.infrastructure.auth.adapters.access_revoker import (
     AuthSessionAccessRevoker,
 )
-from app.infrastructure.auth_session.adapters.identity_provider import (
+from app.infrastructure.auth.adapters.identity_provider import (
     AuthSessionIdentityProvider,
 )
 
diff --git a/src/app/setup/ioc/di_providers/infrastructure.py b/src/app/setup/ioc/di_providers/infrastructure.py
diff --git a/src/app/setup/ioc/di_providers/settings.py b/src/app/setup/ioc/di_providers/settings.py

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ ignore = [`
`134`	`134`	`#`
`135`	`135`	`"src/app/domain/value_objects/base.py" = ["B024", ] # abstract-base-class-without-abstract-method`
`136`	`136`	`"src/app/infrastructure/adapters/password_hasher_bcrypt.py" = ["E501"] # line-too-long`
`137`		`-"src/app/infrastructure/constants.py" = ["S105"] # hardcoded-password-string`
	`137`	`+"src/app/infrastructure/auth/session/constants.py" = ["S105"] # hardcoded-password-string`
`138`	`138`	`"src/app/presentation/http/auth/constants.py" = ["S105"] # hardcoded-password-string`
`139`	`139`	`"src/app/presentation/http/exceptions/handlers.py" = ["RUF029", ] # unused-async`
`140`	`140`	`"scripts/dishka/plot_dependencies_data.py" = ["T201", ] # print`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-from app.application.common.constants import AUTHZ_NOT_AUTHORIZED`
`2`	`1`	`from app.application.common.exceptions.authorization import AuthorizationError`
`3`	`2`	`from app.application.common.services.authorization.base import (`
`4`	`3`	`Permission,`
`5`	`4`	`PermissionContext,`
`6`	`5`	`)`
	`6`	`+from app.application.common.services.constants import AUTHZ_NOT_AUTHORIZED`
`7`	`7`
`8`	`8`
`9`	`9`	`def authorize[PC: PermissionContext](`