feat: enable core app functionality and exception handling

Author: getmarkus

app/core/factory.py

@@ -3,9 +3,9 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
-# from app.interface_adapters import api_router
-# from app.interface_adapters.exceptions import AppException
-# from app.interface_adapters.middleware.error_handler import app_exception_handler
+from app.interface_adapters import api_router
+from app.interface_adapters.exceptions import AppException
+from app.interface_adapters.middleware.error_handler import app_exception_handler
 from config import Settings
 from app.resource_adapters.persistence.sqlmodel.database import get_engine
 
@@ -31,10 +31,10 @@ async def default_lifespan(app: FastAPI):
     )
 
     # Register global exception handler
-    # app.add_exception_handler(AppException, app_exception_handler)
+    app.add_exception_handler(AppException, app_exception_handler)
 
     # Register routes
-    # app.include_router(api_router, prefix="/v1")
+    app.include_router(api_router, prefix="/v1")
 
     # Configure CORS
     app.add_middleware(

app/domain/aggregate_root.py

@@ -1,6 +1,7 @@
 import abc
 from datetime import datetime
 from typing import Protocol
+from config import get_settings
 
 from sqlmodel import SQLModel
 
@@ -10,7 +11,8 @@ class BaseCommand(Protocol):
     timestamp: datetime
 
     # might need specification pattern here
-    def validate(self) -> bool: ...
+    def validate(self) -> bool:
+        ...
 
 
 class BaseEvent(Protocol):
@@ -26,6 +28,7 @@ class AggregateRoot(SQLModel, abc.ABC, table=False):
     Before using this class for database operations, ensure that set_metadata has been called.
     """
 
+    __table_args__ = {"schema": get_settings().get_table_schema}
     version: int = 0
 
     def __init__(self, **data):

app/resource_adapters/persistence/sqlmodel/database.py

@@ -41,11 +41,11 @@ def get_session(
     settings: Annotated[Settings, Depends(get_settings)],
 ) -> Generator[Session, Settings, None]:
     with Session(_engine) as session:
-        session.connection(
+        """ session.connection(
             execution_options={
                 "schema_translate_map": {None: settings.get_table_schema}
             }
-        )
+        ) """
         yield session
 
 
@@ -85,9 +85,9 @@ def get_engine(_settings: Settings | None = None) -> Engine:
     if _settings.database_type == "sqlmodel":
         SQLModel.metadata.schema = _settings.get_table_schema
         with _engine.connect() as conn:
-            conn.execution_options = {
+            """ conn.execution_options = {
                 "schema_translate_map": {None: _settings.get_table_schema}
-            }
+            } """
             if not _settings.database_url.startswith(
                 "sqlite"
             ) and not conn.dialect.has_schema(conn, _settings.get_table_schema):

app/tests/conftest.py

@@ -10,15 +10,17 @@
 from loguru import logger
 from sqlmodel import Session, delete
 
-from app.core.factory import create_app
-from app.resource_adapters.persistence.sqlmodel.database import get_engine
-from app.resource_adapters.persistence.sqlmodel.issues import Issue
-from config import get_settings
 
 # Specify the custom .env file
+# don't change ordering here, settings must be called prior to initialization of app.core.factory
 dotenv_path = Path(".env.testing")
 load_dotenv(dotenv_path=dotenv_path, override=True)
 
+from app.core.factory import create_app  # noqa: E402
+from app.resource_adapters.persistence.sqlmodel.database import get_engine  # noqa: E402
+from app.resource_adapters.persistence.sqlmodel.issues import Issue  # noqa: E402
+from config import get_settings  # noqa: E402
+
 
 settings = get_settings()
 
@@ -51,7 +53,7 @@ async def test_lifespan(app: FastAPI):
 @pytest.fixture(name="app")
 def test_app():
     """Create test app instance only during test execution."""
-    return create_app(settings, lifespan_handler=test_lifespan)
+    return create_app(settings)
 
 
 @pytest.fixture(name="session")

config.py

@@ -2,6 +2,7 @@
 
 from pydantic import AnyHttpUrl
 from pydantic_settings import BaseSettings, SettingsConfigDict
+from functools import lru_cache
 
 
 class Settings(BaseSettings):
@@ -55,6 +56,6 @@ def backend_cors_origins_list(self) -> List[AnyHttpUrl]:
 
 
 # Singleton pattern to ensure only one settings instance
-# @lru_cache()
+@lru_cache()
 def get_settings() -> "Settings":
     return Settings()

main.py

@@ -7,9 +7,12 @@
 from loguru import logger
 from pydantic import BaseModel, Field
 
-from app.core.factory import create_app
 from config import Settings, get_settings
 
+# don't change ordering here, settings must be called prior to initialization of app.core.factory
+_settings = get_settings()
+
+from app.core.factory import create_app  # noqa: E402
 
 # https://brandur.org/logfmt
 # https://github.com/Delgan/loguru
@@ -84,7 +87,7 @@ def create_health_response(is_healthy: bool, check_name: str) -> JSONResponse:
     )
 
 
-app = create_app(get_settings())
+app = create_app(_settings)
 
 # middleware options
 # https://levelup.gitconnected.com/17-useful-middlewares-for-fastapi-that-you-should-know-about-951c2b0869c7