missing imports

Author: MaxNumerique

src/opengeodeweb_back/utils_functions.py

@@ -193,7 +193,9 @@ def save_all_viewables_and_return_info(
     data_entry.viewable_file_name = os.path.basename(saved_viewable_file_path)
     data_entry.light_viewable = os.path.basename(saved_light_viewable_file_path)
 
-    database.session.commit()
+    session = get_session()
+    if session:
+        session.commit()
 
     return {
         "native_file_name": data_entry.native_file_name,
@@ -247,18 +249,18 @@ def generate_native_viewable_and_light_viewable_from_file(
 
     data = geode_functions.load(geode_object, copied_full_path)
 
-    database.session.delete(temp_data_entry)
-    database.session.flush()
+    # Remplacer :
+    # database.session.delete(temp_data_entry)
+    # database.session.flush()
+    # Par :
+    session = get_session()
+    if session:
+        session.delete(temp_data_entry)
+        session.flush()
 
     return save_all_viewables_and_return_info(
         geode_object,
         data,
         input_file=input_filename,
         additional_files=additional_files_copied,
     )
-
-# Modifier toutes les utilisations de database.session par :
-# database.session.add() -> get_session().session.add()
-# database.session.commit() -> get_session().session.commit()
-# database.session.delete() -> get_session().session.delete()
-# database.session.flush() -> get_session().session.flush()

tests/conftest.py

@@ -8,7 +8,7 @@
 
 # Local application imports
 from app import app
-from src.opengeodeweb_back.database import initialize_database
+from opengeodeweb_microservice.database.connection import init_database
 
 TEST_ID = "1"
 
@@ -28,8 +28,7 @@ def copy_data():
     print("Current working directory:", os.getcwd())
     print("Directory contents:", os.listdir("."))
 
-    initialize_database(app)
-
+    init_database(app)
 
 @pytest.fixture
 def client():

tests/test_models_routes.py

@@ -3,9 +3,8 @@
 import flask
 
 from src.opengeodeweb_back import geode_functions
-from src.opengeodeweb_back.data import Data
-from src.opengeodeweb_back.database import database
-
+from opengeodeweb_microservice.microservice.data import Data
+from opengeodeweb_microservice.database.connection import get_session
 
 def test_model_mesh_components(client, test_id):
     route = f"/models/vtm_component_indices"
@@ -35,7 +34,6 @@ def test_extract_brep_uuids(client, test_id):
     with client.application.app_context():
         data_entry = Data.create(geode_object="BRep", input_file=brep_filename)
         data_entry.native_file_name = brep_filename
-        database.session.commit()
 
         data_path = geode_functions.data_file_path(data_entry.id, brep_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)

tests/test_routes.py

@@ -7,8 +7,6 @@
 
 # Local application imports
 from src.opengeodeweb_back import geode_functions, test_utils
-from src.opengeodeweb_back.data import Data
-from src.opengeodeweb_back.database import database
 
 
 def test_allowed_files(client):
@@ -173,7 +171,6 @@ def test_texture_coordinates(client, test_id):
     with client.application.app_context():
         data = Data.create(geode_object="PolygonalSurface3D", input_file="hat.vtp")
         data.native_file_name = "hat.vtp"
-        database.session.commit()
 
         data_path = geode_functions.data_file_path(data.id, "hat.vtp")
         print(data_path)
@@ -197,7 +194,6 @@ def test_vertex_attribute_names(client, test_id):
     with client.application.app_context():
         data = Data.create(geode_object="PolygonalSurface3D", input_file="test.vtp")
         data.native_file_name = "test.vtp"
-        database.session.commit()
 
         data_path = geode_functions.data_file_path(data.id, "test.vtp")
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
@@ -218,7 +214,6 @@ def test_polygon_attribute_names(client, test_id):
     with client.application.app_context():
         data = Data.create(geode_object="PolygonalSurface3D", input_file="test.vtp")
         data.native_file_name = "test.vtp"
-        database.session.commit()
 
         data_path = geode_functions.data_file_path(data.id, "test.vtp")
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
@@ -238,7 +233,6 @@ def test_polyhedron_attribute_names(client, test_id):
     with client.application.app_context():
         data = Data.create(geode_object="PolyhedralSolid3D", input_file="test.vtu")
         data.native_file_name = "test.vtu"
-        database.session.commit()
 
         data_path = geode_functions.data_file_path(data.id, "test.vtu")
         os.makedirs(os.path.dirname(data_path), exist_ok=True)

tests/test_utils_functions.py

@@ -8,8 +8,8 @@
 import uuid
 
 # Local application imports
-from src.opengeodeweb_back.database import database
-from src.opengeodeweb_back.data import Data
+from opengeodeweb_microservice.microservice.data import Data
+from opengeodeweb_microservice.database.connection import get_session
 from src.opengeodeweb_back import geode_functions, utils_functions
 
 
@@ -143,7 +143,8 @@ def test_save_all_viewables_commits_to_db(client):
         db_entry_before = Data.get(data_id)
         assert db_entry_before is not None
         assert db_entry_before.native_file_name == result["native_file_name"]
-        database.session.rollback()
+        session = get_session()
+        session.rollback()
         db_entry_after = Data.get(data_id)
         assert (
             db_entry_after is not None