session.commit() added to tests

Author: MaxNumerique

src/opengeodeweb_back/geode_functions.py

@@ -61,6 +61,8 @@ def load_data(data_id: str) -> Any:
         flask.abort(404, f"Data with id {data_id} not found")
 
     file_absolute_path = data_file_path(data_id, data_entry.native_file_name)
+    print("Loading file: ", file_absolute_path)
+    print("File exists: ", os.path.exists(file_absolute_path))
     return load(data_entry.geode_object, file_absolute_path)
 
 

tests/conftest.py

@@ -29,6 +29,9 @@ def copy_data():
     print("Directory contents:", os.listdir("."))
 
     init_database(app)
+    # print(list(app.blueprints.keys()))
+    # for rule in app.url_map.iter_rules():
+    #     print(f"Route: {rule.rule} -> {rule.endpoint}")
 
 
 @pytest.fixture

tests/test_models_routes.py

@@ -33,21 +33,24 @@ def test_extract_brep_uuids(client, test_id):
     brep_filename = "cube.og_brep"
 
     with client.application.app_context():
-        data_entry = Data.create(geode_object="BRep", input_file=brep_filename)
+        data_entry = Data.create(
+            geode_object="BRep",
+            input_file=brep_filename,
+        )
         data_entry.native_file_name = brep_filename
-
-        data_path = geode_functions.data_file_path(data_entry.id, brep_filename)
-        os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy(f"./tests/data/{brep_filename}", data_path)
-
-    json_data = {"id": data_entry.id}
-    response = client.post(route, json=json_data)
-
-    assert response.status_code == 200
-    uuid_dict = response.json["uuid_dict"]
-    assert isinstance(uuid_dict, dict)
-    expected_keys = {"Block", "Line", "Surface", "Corner"}
-    assert any(key in uuid_dict for key in expected_keys)
-    for key, value in uuid_dict.items():
-        assert isinstance(value, list)
-        assert all(isinstance(v, str) for v in value)
+        session = get_session()
+        if session:
+            session.commit()
+
+        src_path = os.path.join("tests", "data", brep_filename)
+        dest_path = os.path.join(
+            flask.current_app.config["DATA_FOLDER_PATH"], data_entry.id, brep_filename
+        )
+        os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+        shutil.copy2(src_path, dest_path)
+
+        response = client.post(route, json={"id": data_entry.id})
+        assert response.status_code == 200
+        assert "uuid_dict" in response.json
+        uuid_dict = response.json["uuid_dict"]
+        assert isinstance(uuid_dict, dict)

tests/test_routes.py

@@ -6,6 +6,8 @@
 from werkzeug.datastructures import FileStorage
 
 # Local application imports
+from opengeodeweb_microservice.microservice.data import Data
+from opengeodeweb_microservice.database.connection import get_session
 from src.opengeodeweb_back import geode_functions, test_utils
 
 
@@ -171,16 +173,15 @@ 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"
+        session = get_session()
+        if session:
+            session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, "hat.vtp")
-        print(data_path)
+        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         shutil.copy("./tests/data/hat.vtp", data_path)
-
-    response = client.post(
-        "/texture_coordinates",
-        json={"id": data.id},
-    )
+        assert os.path.exists(data_path), f"File not found at {data_path}"
+    response = client.post("/texture_coordinates", json={"id": data.id})
     assert response.status_code == 200
     texture_coordinates = response.json["texture_coordinates"]
     assert type(texture_coordinates) is list
@@ -194,12 +195,14 @@ 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"
+        session = get_session()
+        if session:
+            session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, "test.vtp")
+        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        if os.path.exists("./tests/data/hat.vtp"):
-            shutil.copy("./tests/data/hat.vtp", data_path)
-
+        shutil.copy("./tests/data/test.vtp", data_path)
+        assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
     assert response.status_code == 200
     vertex_attribute_names = response.json["vertex_attribute_names"]
@@ -214,11 +217,14 @@ 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"
+        session = get_session()
+        if session:
+            session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, "test.vtp")
+        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-    shutil.copy("./tests/data/test.vtp", data_path)
-
+        shutil.copy("./tests/data/test.vtp", data_path)
+        assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
     assert response.status_code == 200
     polygon_attribute_names = response.json["polygon_attribute_names"]
@@ -233,12 +239,16 @@ 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"
+        session = get_session()
+        if session:
+            session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, "test.vtu")
+        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         shutil.copy("./tests/data/test.vtu", data_path)
-
+        assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
+    print(response.json)
     assert response.status_code == 200
     polyhedron_attribute_names = response.json["polyhedron_attribute_names"]
     assert type(polyhedron_attribute_names) is list