Minor clean up

Author: harishkannarao

app/db/database_config.py

@@ -23,10 +23,6 @@
 )
 
 
-def get_database() -> Database:
-    return database
-
-
 engine = create_engine(
     DATABASE_URL,
     pool_size=settings.app_db_min_con,

app/db/database_dependencies.py

@@ -6,14 +6,14 @@
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from app.db.database_config import (
-    get_database,
+    database,
     create_session,
     create_async_session,
 )
 
 
 def get_database_dep() -> Database:
-    return get_database()
+    return database
 
 
 DatabaseDep = Annotated[Database, Depends(get_database_dep)]

tests_integration/conftest.py

@@ -20,10 +20,12 @@
 import app.dao.sample_jsonb_sql_dao as sample_jsonb_sql_dao
 import app.dao.sample_sql_dao as sample_sql_dao
 import app.db.database_config as database_config
+import app.db.database_dependencies as database_dependencies
 import app.main as main
 
 DB_MODULES_TO_RELOAD = [
     database_config,
+    database_dependencies,
     sample_sql_dao,
     sample_jsonb_sql_dao,
 ]

tests_unit/conftest.py

@@ -38,11 +38,8 @@ def test_client(
 
 @pytest.fixture
 def mock_get_database(mocker: MockerFixture) -> MagicMock:
-    mock_get_database: MagicMock = mocker.patch(
-        "app.db.database_dependencies.get_database"
-    )
     mock_database = MagicMock(spec=Database)
-    mock_get_database.return_value = mock_database
+    mocker.patch("app.db.database_dependencies.database", mock_database)
     return mock_database