green lights

Author: SpliiT

pyproject.toml

@@ -33,4 +33,4 @@ where = ["src"]
 "opengeodeweb_back.routes.schemas" = ["*.json"]
 "opengeodeweb_back.routes.models.schemas" = ["*.json"]
 "opengeodeweb_back.routes.create.schemas" = ["*.json"]
-opengeodeweb_microservice = ["py.typed"]
+"opengeodeweb_back" = ["py.typed"]

src/opengeodeweb_back/routes/create/blueprint_create.py

@@ -13,7 +13,6 @@
 routes = flask.Blueprint("create", __name__, url_prefix="/create")
 schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
 
-
 @routes.route(
     schemas_dict["create_point"]["route"],
     methods=schemas_dict["create_point"]["methods"],
@@ -38,7 +37,8 @@ def create_point() -> flask.Response:
 
 
 @routes.route(
-    schemas_dict["create_aoi"]["route"], methods=schemas_dict["create_aoi"]["methods"]
+    schemas_dict["create_aoi"]["route"], 
+    methods=schemas_dict["create_aoi"]["methods"]
 )
 def create_aoi() -> flask.Response:
     """Endpoint to create an Area of Interest (AOI) as an EdgedCurve3D."""
@@ -70,7 +70,7 @@ def create_aoi() -> flask.Response:
 
 @routes.route(
     schemas_dict["create_voi"]["route"],
-    methods=schemas_dict["create_voi"]["methods"],
+    methods=schemas_dict["create_voi"]["methods"]
 )
 def create_voi() -> flask.Response:
     """Endpoint to create a Volume of Interest (VOI) as an EdgedCurve3D (a bounding box/prism)."""

tests/test_create_routes.py

@@ -91,33 +91,26 @@ def test_create_aoi(client: FlaskClient, aoi_data: Dict[str, Any]) -> None:
     # Test with missing parameters
     test_utils.test_route_wrong_params(client, route, lambda: aoi_data.copy())  # type: ignore
 
-
-def test_create_voi(client: FlaskClient, voi_data: Dict[str, Any]) -> None:
+def test_create_voi(client: FlaskClient, aoi_data: Dict[str, Any], voi_data: Dict[str, Any]) -> None:
     """Test the creation of a VOI with valid data (including optional id)."""
-    route: str = "/opengeodeweb_back/create/create_voi"
+    aoi_route = "/opengeodeweb_back/create/create_aoi" 
+    aoi_response = client.post(aoi_route, json=aoi_data)
+    assert aoi_response.status_code == 200
+    aoi_id = aoi_response.json["id"]
+
+    voi_data["aoi_id"] = aoi_id
 
-    response = client.post(route, json=voi_data)
+    voi_route = "/opengeodeweb_back/create/create_voi"
+    response = client.post(voi_route, json=voi_data)
     assert response.status_code == 200
 
-    response_data: Any = response.json
+    response_data = response.json
     assert "id" in response_data
     assert "name" in response_data
     assert response_data["name"] == voi_data["name"]
     assert response_data["object_type"] == "mesh"
     assert response_data["geode_object"] == "EdgedCurve3D"
 
-    voi_data_no_id = voi_data.copy()
-    del voi_data_no_id["id"]
-    response = client.post(route, json=voi_data_no_id)
-    assert response.status_code == 200
-    assert response.json["name"] == voi_data["name"]
-
-    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
-
-
 def test_create_point_with_invalid_data(client: FlaskClient) -> None:
     """Test the point creation endpoint with invalid data."""
     route: str = "/opengeodeweb_back/create/create_point"
@@ -144,7 +137,6 @@ def test_create_aoi_with_invalid_data(
     """Test the AOI creation endpoint with invalid data."""
     route: str = "/opengeodeweb_back/create/create_aoi"
 
-    # Test with invalid points
     invalid_data: Dict[str, Any] = {
         **aoi_data,
         "points": [
@@ -157,154 +149,34 @@ def test_create_aoi_with_invalid_data(
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
-    # Test with too few points
     invalid_data = {**aoi_data, "points": [{"x": 0.0, "y": 0.0}, {"x": 1.0, "y": 0.0}]}
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
-    # Test with invalid z value
     invalid_data = {**aoi_data, "z": "not_a_number"}
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
 
 def test_create_voi_with_invalid_data(
-    client: FlaskClient, voi_data: Dict[str, Any]
+    client: FlaskClient, aoi_data: Dict[str, Any], voi_data: Dict[str, Any]
 ) -> None:
     """Test the VOI creation endpoint with invalid data."""
-    route: str = "/opengeodeweb_back/create/create_voi"
+    aoi_route = "/opengeodeweb_back/create/create_aoi"
+    aoi_response = client.post(aoi_route, json=aoi_data)
+    assert aoi_response.status_code == 200
+    aoi_id = aoi_response.json["id"]
+
+    route = "/opengeodeweb_back/create/create_aoi"  
 
-    # Test with non-numeric z_min
-    invalid_data: Dict[str, Any] = {**voi_data, "z_min": "not_a_number"}
+    invalid_data = {**voi_data, "aoi_id": aoi_id, "z_min": "not_a_number"}
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
-    # Test with non-numeric z_max
-    invalid_data = {**voi_data, "z_max": "not_a_number"}
+    invalid_data = {**voi_data, "aoi_id": aoi_id, "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)
-    assert response.status_code == 400
-
-
-def test_create_point_file_generation(
-    client: FlaskClient, point_data: Dict[str, Any]
-) -> None:
-    """Test that the point creation generates the correct files."""
-    route: str = "/opengeodeweb_back/create/create_point"
-
-    # Make the request
-    response = client.post(route, json=point_data)
-    assert response.status_code == 200
-    response_data: Any = response.json
-
-    # Get the data folder path for this specific ID
-    DATA_FOLDER_PATH: str = client.application.config["DATA_FOLDER_PATH"]
-    data_id: str = response_data["id"]
-    data_folder: str = os.path.join(DATA_FOLDER_PATH, data_id)
-
-    # Check that the data folder exists
-    assert os.path.exists(data_folder)
-    assert os.path.isdir(data_folder)
-
-    # Check native file exists
-    native_file_path: str = os.path.join(data_folder, response_data["native_file_name"])
-    assert os.path.exists(native_file_path)
-
-    # Check viewable file exists
-    viewable_file_path: str = os.path.join(
-        data_folder, response_data["viewable_file_name"]
-    )
-    assert os.path.exists(viewable_file_path)
-
-    # Check light viewable file exists if present
-    if "binary_light_viewable" in response_data:
-        light_viewable_file_path: str = os.path.join(data_folder, "light_viewable.vtp")
-        assert os.path.exists(light_viewable_file_path)
-
-    # Verify file extensions
-    assert response_data["native_file_name"].endswith(".og_pts3d")
-    assert response_data["viewable_file_name"].endswith(".vtp")
-
-
-def test_create_aoi_file_generation(
-    client: FlaskClient, aoi_data: Dict[str, Any]
-) -> None:
-    """Test that the AOI creation generates the correct files."""
-    route: str = "/opengeodeweb_back/create/create_aoi"
-
-    # Make the request
-    response = client.post(route, json=aoi_data)
-    assert response.status_code == 200
-    response_data: Any = response.json
-
-    # Get the data folder path for this specific ID
-    DATA_FOLDER_PATH: str = client.application.config["DATA_FOLDER_PATH"]
-    data_id: str = response_data["id"]
-    data_folder: str = os.path.join(DATA_FOLDER_PATH, data_id)
-
-    # Check that the data folder exists
-    assert os.path.exists(data_folder)
-    assert os.path.isdir(data_folder)
-
-    # Check native file exists
-    native_file_path: str = os.path.join(data_folder, response_data["native_file_name"])
-    assert os.path.exists(native_file_path)
-
-    # Check viewable file exists
-    viewable_file_path: str = os.path.join(
-        data_folder, response_data["viewable_file_name"]
-    )
-    assert os.path.exists(viewable_file_path)
-
-    # Check light viewable file exists if present
-    if "binary_light_viewable" in response_data:
-        light_viewable_file_path: str = os.path.join(data_folder, "light_viewable.vtp")
-        assert os.path.exists(light_viewable_file_path)
-
-    # Verify file extensions
-    assert response_data["native_file_name"].endswith(".og_edc3d")
-    assert response_data["viewable_file_name"].endswith(".vtp")
-
-
-def test_create_voi_file_generation(
-    client: FlaskClient, voi_data: Dict[str, Any]
-) -> None:
-    """Test that the VOI creation generates the correct files."""
-    route: str = "/opengeodeweb_back/create/create_voi"
-
-    # Make the request
-    response = client.post(route, json=voi_data)
-    assert response.status_code == 200
-    response_data: Any = response.json
-
-    # Get the data folder path for this specific ID
-    DATA_FOLDER_PATH: str = client.application.config["DATA_FOLDER_PATH"]
-    data_id: str = response_data["id"]
-    data_folder: str = os.path.join(DATA_FOLDER_PATH, data_id)
-
-    # Check that the data folder exists
-    assert os.path.exists(data_folder)
-    assert os.path.isdir(data_folder)
-
-    # Check native file exists
-    native_file_path: str = os.path.join(data_folder, response_data["native_file_name"])
-    assert os.path.exists(native_file_path)
-
-    # Check viewable file exists
-    viewable_file_path: str = os.path.join(
-        data_folder, response_data["viewable_file_name"]
-    )
-    assert os.path.exists(viewable_file_path)
-
-    # Check light viewable file exists if present
-    if "binary_light_viewable" in response_data:
-        light_viewable_file_path: str = os.path.join(data_folder, "light_viewable.vtp")
-        assert os.path.exists(light_viewable_file_path)
-
-    # Verify file extensions (VOI uses EdgedCurve3D like AOI)
-    assert response_data["native_file_name"].endswith(".og_edc3d")
-    assert response_data["viewable_file_name"].endswith(".vtp")
+    assert response.status_code == 400