27998_Remove_config_module

configs/test_settings.toml

@@ -6,3 +6,4 @@ dynaconf_merge = true
 echo = true
 url = "postgresql+asyncpg://test:test@localhost:5465/test"
 max_connection_count = 10
+database_url = "postgresql+asyncpg://test:test@localhost:5465/test"

src/business_logic/services/jwt_token.py

@@ -2,14 +2,16 @@
 
 import jwt
 from typing import Any, no_type_check, Optional
-from src.config.rsa_keys import RSAKeypair
+from src.scripts.rsa_keys.dto import RSAKeypair
+from src.dyna_config import settings
 from src.di import Container
 
 logger = logging.getLogger(__name__)
 
-
 class JWTService:
-    def __init__(self, keys: RSAKeypair = Container().config().keys) -> None:
+    # def __init__(self, keys: RSAKeypair = settings.KEYS) -> None:
+    def __init__(self, keys: RSAKeypair = Container().config().KEYS) -> None:
+    ##### def __init__(self, keys: RSAKeypair = Container().config().keys) -> None:
         self.algorithm = "RS256"
         self.algorithms = ["RS256"]
         self.keys = keys

src/data_access/postgresql/database.py

@@ -4,7 +4,6 @@
 from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy.pool import NullPool
 from sqlalchemy.ext.asyncio.engine import AsyncEngine
-from src.config.settings.app import AppSettings
 
 logger = logging.getLogger(__name__)
 

src/data_access/postgresql/events.py

@@ -1,25 +1,27 @@
 import logging
+
+
 from fastapi import FastAPI
 from sqlalchemy.ext.asyncio import create_async_engine
 
-from src.config.settings.app import AppSettings
+from dynaconf import Dynaconf
 
 
 logger = logging.getLogger(__name__)
 
 
-async def connect_to_db(app: FastAPI, settings: AppSettings) -> None:
+async def connect_to_db(app: FastAPI, settings: Dynaconf) -> None:
     logger.info('Creating PostgreSQL connection pool.')
 
     app.state.pool = create_async_engine(
-        str(settings.database_url),
+        str(settings.DATABASE_URL),
         pool_size=settings.max_connection_count
     )
 
     logger.info('Connection pool created.')
 
 
-async def close_db_connection(app: FastAPI, settings: AppSettings) -> None:
+async def close_db_connection(app: FastAPI) -> None:
     logger.info('Closing connection pool.')
 
     await app.state.pool.dispose()

src/default.toml

@@ -10,6 +10,7 @@ uri = ""
 port = 5432
 max_connection_count = 10
 echo = false
+database_url = "postgresql+asyncpg://postgres:postgres@localhost:5432/is_db"
 
 
 [default.redis]
@@ -28,4 +29,10 @@ important_logs_filename = "important_identity_server_provider.log"
 [default.server]
 base_url_host = "127.0.0.1"
 base_url_port = "8000"
-domain_name = "rnd-identityserver-dev.godeltech.com"
+domain_name = "rnd-identityserver-dev.godeltech.com"
+
+[default.info]
+userinfo = 30
+userinfo_default_token = 3600
+
+well_known_openid_config = 10

src/di/container.py

@@ -1,14 +1,17 @@
 from dependency_injector import containers, providers
 
-from src.config import get_app_settings
+# from src.config import get_app_settings
+from src.dyna_config import settings
+
 from src.data_access.postgresql import Database
 
 
 class Container(containers.DeclarativeContainer):
-    config = providers.Object(get_app_settings())
+    # config = providers.Object(get_app_settings())
+    config = providers.Object(settings)
 
     db = providers.Singleton(
         Database,
-        database_url=str(config().database_url),
-        max_connection_count=config().max_connection_count,
+        database_url=str(config().db.database_url),
+        max_connection_count=config().db.max_connection_count,
     )

src/di/providers/__init__.py

@@ -1,4 +1,4 @@
-from .config import provide_config
+# from .config import provide_config
 from .db import provide_db
 from .repositories import (
     provide_wellknown_repo,

src/di/providers/config.py

@@ -1,10 +1,10 @@
-from src.config import get_app_settings
-from src.config.settings.base import BaseAppSettings
+# from src.config import get_app_settings
+# from src.config.settings.base import BaseAppSettings
 
 
 def provide_config_stub() -> None:  # pragma: no cover
     ...
 
 
-def provide_config() -> BaseAppSettings:
-    return get_app_settings()
+# def provide_config() -> BaseAppSettings:
+#     return get_app_settings()