Merge pull request #25 from getmarkus/cm-branch-23

refactor: remove unused test settings and improve database checks

Author: getmarkus

.gitignore

@@ -203,4 +203,5 @@ Temporary Items
 *.sqlite
 *.sqlite3
 *.sqlite-journal
-*.sqlite3-journal
+*.sqlite3-journal
+*.db-journal

README.md

@@ -11,6 +11,8 @@ Simple python template I am experimenting with around a set of overlapping conce
 uv run fastapi dev main.py
 uv run pytest
 
+uvx dynaconf list
+
 atlas schema inspect -u "sqlite://issues.db" --format "{{ sql . }}" > migrate.sql
 ```
 

app/resource_adapters/persistence/sqlmodel/database.py

@@ -1,7 +1,7 @@
 from typing import Generator
 
 from loguru import logger
-from sqlalchemy import text
+from sqlalchemy import inspect, text
 from sqlalchemy.engine import Engine
 from sqlalchemy.pool import StaticPool
 from sqlmodel import Session, SQLModel, create_engine
@@ -51,12 +51,27 @@ def get_engine(database_url: str | None = None) -> Engine:
 
         if settings.database_schema:
             SQLModel.metadata.schema = settings.database_schema
+            # with self.engine.connect() as conn:
             # if not conn.dialect.has_schema(conn, db_schema):
             # logger.warning(f"Schema '{db_schema}' not found in database. Creating...")
             # conn.execute(sa.schema.CreateSchema(db_schema))
             # conn.commit()
 
-        SQLModel.metadata.create_all(_engine)
-        logger.info("Database tables created successfully")
+        # Check if tables exist before creating them
+        inspector = inspect(_engine)
+        existing_tables = inspector.get_table_names(
+            schema=settings.database_schema if settings.database_schema else None
+        )
+        if not existing_tables:
+            # if settings.database_schema:
+            #     # Create schema if it doesn't exist
+            #     if not inspector.has_schema(settings.database_schema):
+            #         logger.info(f"Creating schema '{settings.database_schema}'")
+            #         with _engine.begin() as conn:
+            #             conn.execute(text(f'CREATE SCHEMA IF NOT EXISTS {settings.database_schema}'))
+            SQLModel.metadata.create_all(_engine)
+            logger.info("Database tables created successfully")
+        else:
+            logger.info("Database tables already exist, skipping creation")
 
     return _engine

app/tests/conftest.py

@@ -3,32 +3,20 @@
 
 import pytest
 from _pytest.config import Config
-from _pytest.nodes import Item
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 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 settings
 
 
-def pytest_configure(config: Config) -> None:
-    """Register env marker."""
-    config.addinivalue_line(
-        "markers", "env(name): mark test to run only on named environment"
-    )
-
-
-def pytest_runtest_setup(item: Item) -> None:
-    """Set up environment for each test based on env marker."""
-    envnames = [mark.args[0] for mark in item.iter_markers(name="env")]
-    if envnames:
-        # Set environment to the first env marker found
-        os.environ["APP_ENV"] = envnames[0]
-    else:
-        # Default to testing environment if no env marker
-        os.environ["APP_ENV"] = "testing"
+@pytest.fixture(scope="session", autouse=True)
+def set_test_settings():
+    """Fixture to force the use of the 'testing' environment for all tests."""
+    settings.configure(FORCE_ENV_FOR_DYNACONF="testing")
 
 
 def pytest_unconfigure(config: Config) -> None:
@@ -46,7 +34,10 @@ async def test_lifespan(app: FastAPI):
 
 
 # Create test app using the factory with test lifespan
-app = create_app(lifespan_handler=test_lifespan)
+@pytest.fixture(name="app")
+def test_app():
+    """Create test app instance only during test execution."""
+    return create_app(lifespan_handler=test_lifespan)
 
 
 @pytest.fixture(name="session")
@@ -60,6 +51,6 @@ def test_session():
 
 
 @pytest.fixture(name="client")
-def client_fixture():
+def client_fixture(app: FastAPI):
     with TestClient(app) as client:
         yield client

app/tests/test_issues.py

@@ -8,7 +8,6 @@
 from app.resource_adapters.persistence.sqlmodel.issues import SQLModelIssueRepository
 
 
-@pytest.mark.env("testing")
 def test_analyze_issue_command(client: TestClient, session: Session):
     # Test case 1: Successful analysis
     issue_number = 1
@@ -26,7 +25,6 @@ def test_analyze_issue_command(client: TestClient, session: Session):
     assert response.issue_number == issue_number
 
 
-@pytest.mark.env("development")
 def test_analyze_issue_client(client: TestClient, session: Session):
     # Test case 1: Successful analysis
     issue_number = 1

config.py

@@ -16,7 +16,6 @@
     settings_files=[
         "settings.toml",  # Base settings
         ".secrets.toml",  # Secret settings
-        "settings.test.toml",  # Test-specific settings, loaded when APP_ENV=testing
     ],
     environments=True,
     load_dotenv=True,

main.py

@@ -52,6 +52,7 @@ class HealthCheck(BaseModel):
         ..., description="Required. Status of the service: pass, fail, or warn"
     )
     version: Optional[str] = Field(None, description="Version of the service")
+    env: Optional[str] = Field(None, description="Environment of the service")
     description: Optional[str] = Field(
         None, description="Human-friendly description of the service"
     )
@@ -66,6 +67,7 @@ def create_health_response(is_healthy: bool, check_name: str) -> JSONResponse:
     response = HealthCheck(
         status=status,
         version=settings.project_name,
+        env=settings.current_env,
         description=f"Service {status}",
         checks={
             check_name: {

settings.test.toml

@@ -7,7 +7,6 @@ migrate_database = false
 sqlite_wal_mode = false
 # in-memory, sqlmodel
 model_config = "sqlmodel"
-env_smoke_test = ""
 
 # CORS Settings
 backend_cors_origins = []
@@ -36,4 +35,11 @@ cors_allow_methods = [
 ] # Be more restrictive in production
 
 [testing]
-# Test-specific settings
+# sqlite:///./test.db sqlite://
+database_url = "sqlite://"
+database_schema = ""
+# in-memory, sqlmodel
+model_config = "sqlmodel"
+migrate_database = false
+sqlite_wal_mode = false
+backend_cors_origins = ["http://testserver"]