Merge branch 'feat/create_voi' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/create_voi

Author: SpliiT

opengeodeweb_back_schemas.json

@@ -1,6 +1,43 @@
 {
   "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",
@@ -76,43 +113,6 @@
           "z"
         ],
         "additionalProperties": false
-      },
-      "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
       }
     },
     "models": {

requirements.txt

@@ -60,4 +60,3 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.6rc1

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

@@ -1,3 +1,3 @@
+from .create_voi import *
 from .create_point import *
 from .create_aoi import *
-from .create_voi import *

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

@@ -2,18 +2,32 @@
 from dataclasses import dataclass
 from typing import Optional
 
+
 @dataclass
 class CreateVoi(DataClassJsonMixin):
-    name: str
-    """Name of the VOI"""
-
     aoi_id: str
     """ID of the corresponding AOI"""
 
-    z_min: float
-    """Minimum Z coordinate for the VOI"""
+    max_x: float
+    """Maximum X coordinate from AOI"""
+
+    max_y: float
+    """Maximum Y coordinate from AOI"""
+
+    min_x: float
+    """Minimum X coordinate from AOI"""
+
+    min_y: float
+    """Minimum Y coordinate from AOI"""
+
+    name: str
+    """Name of the VOI"""
 
     z_max: float
-    """Maximum Z coordinate for the VOI"""
+    """Maximum Z coordinate"""
+
+    z_min: float
+    """Minimum Z coordinate"""
 
     id: Optional[str] = None
+    """Optional ID for updating existing VOI"""

tests/test_create_routes.py

@@ -29,15 +29,16 @@ def aoi_data() -> Dict[str, Any]:
         "z": 0.0,
     }
 
+
 @pytest.fixture
 def voi_data() -> Dict[str, Any]:
     """Fixture for Volume of Interest (VOI) test data."""
     return {
         "name": "test_voi",
-        "aoi_id": str(uuid.uuid4()), 
+        "aoi_id": str(uuid.uuid4()),
         "z_min": -50.0,
         "z_max": 100.0,
-        "id": str(uuid.uuid4()), 
+        "id": str(uuid.uuid4()),
     }
 
 
@@ -113,9 +114,8 @@ def test_create_voi(client: FlaskClient, voi_data: Dict[str, Any]) -> None:
 
     voi_data_required_only = voi_data.copy()
     del voi_data_required_only["id"]
-    
-    test_utils.test_route_wrong_params(client, route, lambda: voi_data_required_only.copy()) # type: ignore
 
+    test_utils.test_route_wrong_params(client, route, lambda: voi_data_required_only.copy())  # type: ignore
 
 
 def test_create_point_with_invalid_data(client: FlaskClient) -> None:
@@ -183,7 +183,7 @@ def test_create_voi_with_invalid_data(
     invalid_data = {**voi_data, "z_max": "not_a_number"}
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
-    
+
     # Test with invalid aoi_id format (e.g., not a string/uuid)
     invalid_data = {**voi_data, "aoi_id": 12345}
     response = client.post(route, json=invalid_data)