fix tests

Author: JulienChampagnol

opengeodeweb_back_schemas.json

@@ -1,46 +1,9 @@
 {
   "opengeodeweb_back": {
     "create": {
-      "create_voi": {
-        "$id": "opengeodeweb_back/create/create_voi",
-        "route": "/create_voi",
-        "methods": [
-          "POST"
-        ],
-        "type": "object",
-        "properties": {
-          "name": {
-            "type": "string",
-            "description": "Name of the VOI"
-          },
-          "aoi_id": {
-            "type": "string",
-            "description": "ID of the corresponding AOI"
-          },
-          "z_min": {
-            "type": "number",
-            "description": "Minimum Z coordinate"
-          },
-          "z_max": {
-            "type": "number",
-            "description": "Maximum Z coordinate"
-          },
-          "id": {
-            "type": "string",
-            "description": "Optional ID for updating existing VOI"
-          }
-        },
-        "required": [
-          "name",
-          "aoi_id",
-          "z_min",
-          "z_max"
-        ],
-        "additionalProperties": false
-      },
-      "create_point": {
-        "$id": "opengeodeweb_back/create/create_point",
-        "route": "/create_point",
+      "point": {
+        "$id": "opengeodeweb_back/create/point",
+        "route": "/point",
         "methods": [
           "POST"
         ],
@@ -67,52 +30,6 @@
           "z"
         ],
         "additionalProperties": false
-      },
-      "create_aoi": {
-        "$id": "opengeodeweb_back/create/create_aoi",
-        "route": "/create_aoi",
-        "methods": [
-          "POST"
-        ],
-        "type": "object",
-        "properties": {
-          "name": {
-            "type": "string",
-            "description": "Name of the AOI"
-          },
-          "points": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {
-                "x": {
-                  "type": "number"
-                },
-                "y": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "x",
-                "y"
-              ],
-              "additionalProperties": false
-            },
-            "minItems": 3
-          },
-          "z": {
-            "type": "number"
-          },
-          "id": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "name",
-          "points",
-          "z"
-        ],
-        "additionalProperties": false
       }
     },
     "models": {

src/opengeodeweb_back/routes/create/blueprint_create.py

@@ -8,7 +8,7 @@
 
 # Local application imports
 from opengeodeweb_back import geode_functions, utils_functions
-from opengeodeweb_back.routes.create.schemas import schemas
+import opengeodeweb_back.routes.create.schemas as schemas
 from opengeodeweb_back.geode_objects.geode_point_set3d import GeodePointSet3D
 from opengeodeweb_back.geode_objects.geode_edged_curve3d import GeodeEdgedCurve3D
 
@@ -23,7 +23,7 @@
 def point() -> flask.Response:
     """Endpoint to create a single point in 3D space."""
     json_data = utils_functions.validate_request(
-        flask.request, schemas_dict["create_point"]
+        flask.request, schemas_dict["point"]
     )
     params = schemas.Point.from_dict(json_data)
 

src/opengeodeweb_back/routes/create/schemas/__init__.py

@@ -1 +1 @@
-
+from .point import *

tests/conftest.py

@@ -41,14 +41,14 @@ def configure_test_environment() -> Generator[None, None, None]:
 
     init_database(db_path)
     os.environ["TEST_DB_PATH"] = str(db_path)
-
+    register_ogw_back_blueprints(app)
     yield
 
     tmp_data_path = app.config.get("DATA_FOLDER_PATH")
     if tmp_data_path and os.path.exists(tmp_data_path):
         shutil.rmtree(tmp_data_path, ignore_errors=True)
         print(f"Cleaned up test data folder: {tmp_data_path}", flush=True)
-    register_ogw_back_blueprints(app)
+    
 
 
 @pytest.fixture

tests/test_models_routes.py

@@ -206,24 +206,20 @@ def test_save_viewable_workflow_from_file(client: FlaskClient) -> None:
 
 
 def test_save_viewable_workflow_from_object(client: FlaskClient) -> None:
-    route = "/opengeodeweb_back/create/create_aoi"
-    aoi_data = {
-        "name": "workflow_aoi",
-        "points": [
-            {"x": 0.0, "y": 0.0},
-            {"x": 1.0, "y": 0.0},
-            {"x": 1.0, "y": 1.0},
-            {"x": 0.0, "y": 1.0},
-        ],
+    route = "/opengeodeweb_back/create/point"
+    point_data = {
+        "name": "workflow_point_3d",
+        "x": 0.0,
+        "y": 0.0,
         "z": 0.0,
     }
 
-    response = client.post(route, json=aoi_data)
+    response = client.post(route, json=point_data)
     assert response.status_code == 200
 
     data_id = response.get_json()["id"]
     assert isinstance(data_id, str) and len(data_id) > 0
-    assert response.get_json()["geode_object_type"] == "EdgedCurve3D"
+    assert response.get_json()["geode_object_type"] == "PointSet3D"
     assert response.get_json()["viewable_file"].endswith(".vtp")
 
 
@@ -239,11 +235,11 @@ def test_import_extension_route(client: FlaskClient, tmp_path: Path) -> None:
     vext_path = tmp_path / "test-extension-1.0.0.vext"
     with zipfile.ZipFile(vext_path, "w", compression=zipfile.ZIP_DEFLATED) as zipf:
         zipf.writestr(
-            "dist/test-extension-extension.es.js",
+            "test-extension-extension.es.js",
             "export const metadata = { id: 'test-extension', name: 'Test Extension' };",
         )
-        zipf.writestr("dist/test-extension-back", "#!/bin/bash\necho 'mock backend'")
-        zipf.writestr("dist/test-extension.css", ".test { color: red; }")
+        zipf.writestr("test-extension-back", "#!/bin/bash\necho 'mock backend'")
+        zipf.writestr("test-extension.css", ".test { color: red; }")
     with open(vext_path, "rb") as f:
         response = client.post(
             route,
@@ -261,8 +257,6 @@ def test_import_extension_route(client: FlaskClient, tmp_path: Path) -> None:
     )
     extension_path = os.path.join(extensions_folder, "test-extension")
     assert os.path.exists(extension_path)
-    dist_path = os.path.join(extension_path, "dist")
-    assert os.path.exists(dist_path)
 
     # Verify frontend content is returned
     frontend_content = json_data["frontend_content"]