refacto

Author: MaxNumerique

src/opengeodeweb_microservice/database/connection.py

@@ -6,7 +6,6 @@
 from ..microservice.base import Base
 
 DATABASE_FILENAME = "project.db"
-
 db: Optional[SQLAlchemy] = None
 
 def init_database(app: Flask, db_filename: str = DATABASE_FILENAME) -> SQLAlchemy:
@@ -22,9 +21,6 @@ def get_database() -> Optional[SQLAlchemy]:
     return db
 
 def get_session():
-    if db is None:
-        return None
-    return db.session
+    return db.session if db else None
 
-def get_database_connection():
-    return get_database()
+get_database_connection = get_database

tests/conftest.py

@@ -7,26 +7,24 @@
 @pytest.fixture(scope="session")
 def app():
     app = Flask(__name__)
-    app.config["TESTING"] = True
-    BASE_DIR = os.path.abspath(os.path.dirname(__file__))
-    db_path = os.path.join(BASE_DIR, "test_project.db")
-    app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
-    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+    app.config.update({
+        "TESTING": True,
+        "SQLALCHEMY_DATABASE_URI": f"sqlite:///{os.path.join(os.path.dirname(__file__), 'test_project.db')}",
+        "SQLALCHEMY_TRACK_MODIFICATIONS": False
+    })
     with app.app_context():
         init_database(app, "test_project.db")
         yield app
-        _cleanup_database_connections()
-    _remove_test_database(db_path)
+        _cleanup_database()
 
-def _cleanup_database_connections():
+def _cleanup_database():
     try:
         session = get_session()
         if session:
             session.close()
     except Exception:
         pass
-
-def _remove_test_database(db_path: str):
+    db_path = os.path.join(os.path.dirname(__file__), "test_project.db")
     if os.path.exists(db_path):
         try:
             os.remove(db_path)