Fixing build

Author: harishkannarao

app/config.py

@@ -8,6 +8,7 @@ class Settings(BaseSettings):
     # db settings start
     app_db_migration_enabled: bool = True
     app_db_migration_mode: str = "apply"
+    app_db_enabled: bool = True
     app_db_host: str = "localhost"
     app_db_port: str = "5432"
     app_db_database: str = "myuser"

app/db/database_config.py

@@ -1,7 +1,7 @@
 from databases import Database
 from app.config import settings
 
-DATABASE_URL = f"postgresql://{settings.app_db_user}:{settings.app_db_password}@{settings.app_db_host}/{settings.app_db_database}"
+DATABASE_URL = f"postgresql://{settings.app_db_user}:{settings.app_db_password}@{settings.app_db_host}:{settings.app_db_port}/{settings.app_db_database}"
 database = Database(
     DATABASE_URL, min_size=settings.app_db_min_con, max_size=settings.app_db_max_con
 )

app/main.py

@@ -26,9 +26,11 @@
 async def lifespan(_app: FastAPI):
     if settings.app_db_migration_enabled:
         apply_db_migrations()
-    await database.connect()
+    if settings.app_db_enabled:
+        await database.connect()
     yield
-    await database.disconnect()
+    if settings.app_db_enabled:
+        await database.disconnect()
 
 
 app = FastAPI(openapi_url=settings.app_open_api_url, lifespan=lifespan)

tests_integration/conftest.py

@@ -11,6 +11,7 @@
 
 import app.config as config
 import app.db_schema_migrations.yoyo_migration as yoyo_migration
+import app.db.database_config as database_config
 import app.main as main
 import time
 
@@ -46,6 +47,7 @@ def test_client(
     app = reload(main).app
     with TestClient(app) as client:
         yield client
+    reload(main)
 
 
 @pytest.fixture
@@ -58,9 +60,12 @@ def change_postgres_db_host(
     # set new value, reload module and yield setting
     new_settings = patch_env_var(monkeypatch, name, new_value)
     reload(yoyo_migration)
+    reload(database_config)
     yield new_settings
     # reset to original value and reload module
     patch_env_var(monkeypatch, name, original_value)
+    reload(yoyo_migration)
+    reload(database_config)
 
 
 @pytest.fixture
@@ -73,9 +78,12 @@ def change_postgres_db_port(
     # set new value, reload module and yield setting
     new_settings = patch_env_var(monkeypatch, name, new_value)
     reload(yoyo_migration)
+    reload(database_config)
     yield new_settings
     # reset to original value and reload module
     patch_env_var(monkeypatch, name, original_value)
+    reload(yoyo_migration)
+    reload(database_config)
 
 
 @pytest.fixture

tests_unit/conftest.py

@@ -13,10 +13,12 @@
 @pytest.fixture
 def test_client(
     disable_db_migrations: config.Settings,
+    disable_db_connection: config.Settings,
 ) -> Generator[TestClient, None, None]:
     app = reload(main).app
     with TestClient(app) as client:
         yield client
+    reload(main)
 
 
 @pytest.fixture
@@ -30,6 +32,17 @@ def disable_db_migrations(monkeypatch) -> Generator[config.Settings, None, None]
     patch_env_var(monkeypatch, name, original_value)
 
 
+@pytest.fixture
+def disable_db_connection(monkeypatch) -> Generator[config.Settings, None, None]:
+    name = "APP_DB_ENABLED"
+    original_value = os.getenv(name)
+    new_value = "False"
+    # set new value, reload module and yield setting
+    yield patch_env_var(monkeypatch, name, new_value)
+    # reset to original value and reload module
+    patch_env_var(monkeypatch, name, original_value)
+
+
 @pytest.fixture
 def disable_open_api(monkeypatch) -> Generator[config.Settings, None, None]:
     name = "APP_OPEN_API_URL"