Refactor configs

src/amdb/infrastructure/auth/session/config.py

@@ -8,10 +8,10 @@
 class SessionConfig:
     lifetime: timedelta
 
-    @classmethod
-    def from_toml(cls, path: str) -> "SessionConfig":
-        toml_as_dict = toml.load(path)
-        session_section_as_dict = toml_as_dict["auth-session"]
-        return SessionConfig(
-            lifetime=timedelta(minutes=session_section_as_dict["lifetime"]),
-        )
+
+def load_session_config_from_toml(path: str) -> SessionConfig:
+    toml_as_dict = toml.load(path)
+    session_section_as_dict = toml_as_dict["auth-session"]
+    return SessionConfig(
+        lifetime=timedelta(minutes=session_section_as_dict["lifetime"]),
+    )

src/amdb/infrastructure/persistence/caching/permissions_mapper.py

@@ -12,6 +12,7 @@
 class CachingPermissionsMapper:
     def __init__(
         self,
+        *,
         permissions_mapper: PermissionsMapper,
         cache_provider: PermissionsMapperCacheProvider,
     ) -> None:

src/amdb/infrastructure/persistence/redis/config.py

@@ -7,8 +7,8 @@
 class RedisConfig:
     url: str
 
-    @classmethod
-    def from_toml(cls, path: str) -> "RedisConfig":
-        toml_as_dict = toml.load(path)
-        redis_section_as_dict = toml_as_dict["redis"]
-        return RedisConfig(url=redis_section_as_dict["url"])
+
+def load_redis_config_from_toml(path: str) -> RedisConfig:
+    toml_as_dict = toml.load(path)
+    redis_section_as_dict = toml_as_dict["redis"]
+    return RedisConfig(url=redis_section_as_dict["url"])

src/amdb/infrastructure/persistence/sqlalchemy/config.py

@@ -7,8 +7,8 @@
 class PostgresConfig:
     url: str
 
-    @classmethod
-    def from_toml(cls, path: str) -> "PostgresConfig":
-        toml_as_dict = toml.load(path)
-        postgres_section_as_dict = toml_as_dict["postgres"]
-        return PostgresConfig(url=postgres_section_as_dict["url"])
+
+def load_postgres_config_from_toml(path: str) -> PostgresConfig:
+    toml_as_dict = toml.load(path)
+    postgres_section_as_dict = toml_as_dict["postgres"]
+    return PostgresConfig(url=postgres_section_as_dict["url"])

src/amdb/main/cli/app.py

@@ -5,8 +5,12 @@
 from dishka import make_container
 from alembic import config
 
-from amdb.infrastructure.persistence.sqlalchemy.config import PostgresConfig
-from amdb.infrastructure.persistence.redis.config import RedisConfig
+from amdb.infrastructure.persistence.sqlalchemy.config import (
+    load_postgres_config_from_toml,
+)
+from amdb.infrastructure.persistence.redis.config import (
+    load_redis_config_from_toml,
+)
 from amdb.infrastructure.persistence.alembic.config import ALEMBIC_CONFIG
 from amdb.presentation.cli.movie import movie_commands
 from amdb.main.providers import (
@@ -37,8 +41,8 @@ def run_cli() -> None:
         message = "Path to config env var is not set"
         raise ValueError(message)
 
-    postgres_config = PostgresConfig.from_toml(path_to_config)
-    redis_config = RedisConfig.from_toml(path_to_config)
+    postgres_config = load_postgres_config_from_toml(path_to_config)
+    redis_config = load_redis_config_from_toml(path_to_config)
 
     container = make_container(
         ConfigsProvider(

src/amdb/main/web_api/app.py

@@ -5,9 +5,15 @@
 from dishka import make_async_container
 from dishka.integrations.fastapi import setup_dishka
 
-from amdb.infrastructure.persistence.sqlalchemy.config import PostgresConfig
-from amdb.infrastructure.persistence.redis.config import RedisConfig
-from amdb.infrastructure.auth.session.config import SessionConfig
+from amdb.infrastructure.persistence.sqlalchemy.config import (
+    load_postgres_config_from_toml,
+)
+from amdb.infrastructure.persistence.redis.config import (
+    load_redis_config_from_toml,
+)
+from amdb.infrastructure.auth.session.config import (
+    load_session_config_from_toml,
+)
 from amdb.presentation.web_api.router import router
 from amdb.presentation.web_api.exception_handlers import (
     setup_exception_handlers,
@@ -39,9 +45,9 @@ def run_web_api() -> None:
         message = "Path to config env var is not set"
         raise ValueError(message)
 
-    postgres_config = PostgresConfig.from_toml(path_to_config)
-    redis_config = RedisConfig.from_toml(path_to_config)
-    session_config = SessionConfig.from_toml(path_to_config)
+    postgres_config = load_postgres_config_from_toml(path_to_config)
+    redis_config = load_redis_config_from_toml(path_to_config)
+    session_config = load_session_config_from_toml(path_to_config)
 
     app = FastAPI(
         title="Awesome Movie Database",

src/amdb/main/worker/app.py

@@ -6,8 +6,12 @@
 from dishka import make_async_container
 from dishka.integrations.faststream import setup_dishka
 
-from amdb.infrastructure.persistence.sqlalchemy.config import PostgresConfig
-from amdb.infrastructure.persistence.redis.config import RedisConfig
+from amdb.infrastructure.persistence.sqlalchemy.config import (
+    load_postgres_config_from_toml,
+)
+from amdb.infrastructure.persistence.redis.config import (
+    load_redis_config_from_toml,
+)
 from amdb.presentation.worker.router import router
 from amdb.main.providers import (
     ConfigsProvider,
@@ -35,8 +39,8 @@ def run_worker() -> None:
         message = "Path to config env var is not set"
         raise ValueError(message)
 
-    postgres_config = PostgresConfig.from_toml(path_to_config)
-    redis_config = RedisConfig.from_toml(path_to_config)
+    postgres_config = load_postgres_config_from_toml(path_to_config)
+    redis_config = load_redis_config_from_toml(path_to_config)
 
     broker = RedisBroker(url=redis_config.url)
     broker.include_router(router)

tests/unit/conftest.py

@@ -4,21 +4,25 @@
 import pytest
 from redis.client import Redis
 
-from amdb.infrastructure.persistence.sqlalchemy.config import PostgresConfig
-from amdb.infrastructure.persistence.redis.config import RedisConfig
+from amdb.infrastructure.persistence.sqlalchemy.config import (
+    load_postgres_config_from_toml,
+)
+from amdb.infrastructure.persistence.redis.config import (
+    load_redis_config_from_toml,
+)
 
 
 CONFIG_PATH = os.getenv("TEST_CONFIG_PATH")
 
 
 @pytest.fixture(scope="session")
 def postgres_url() -> str:
-    postgres_config = PostgresConfig.from_toml(CONFIG_PATH)
+    postgres_config = load_postgres_config_from_toml(CONFIG_PATH)
     return postgres_config.url
 
 
 @pytest.fixture(scope="session")
 def redis() -> Redis:
-    redis_config = RedisConfig.from_toml(CONFIG_PATH)
+    redis_config = load_redis_config_from_toml(CONFIG_PATH)
     redis = Redis.from_url(redis_config.url, decode_responses=True)
     return cast(Redis, redis)