id added to texture_coordinates, vertex_attribute_names, polygon_attribute_names, polyhedron_attribute_names

test folder changed to match project_uuid path

Author: MaxNumerique

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -290,7 +290,7 @@ def texture_coordinates():
     utils_functions.validate_request(flask.request, texture_coordinates_json)
     data = geode_functions.load(
         flask.request.json["input_geode_object"],
-        os.path.join(DATA_FOLDER_PATH, flask.request.json["filename"]),
+        os.path.join(DATA_FOLDER_PATH, flask.request.json["id"], flask.request.json["filename"]),
     )
     texture_coordinates = data.texture_manager().texture_names()
 
@@ -312,7 +312,7 @@ def vertex_attribute_names():
     DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
     file_absolute_path = os.path.join(
-        DATA_FOLDER_PATH, werkzeug.utils.secure_filename(flask.request.json["filename"])
+        DATA_FOLDER_PATH, flask.request.json["id"], werkzeug.utils.secure_filename(flask.request.json["filename"])
     )
     data = geode_functions.load(
         flask.request.json["input_geode_object"], file_absolute_path
@@ -342,7 +342,7 @@ def polygon_attribute_names():
     DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
     file_absolute_path = os.path.join(
-        DATA_FOLDER_PATH, werkzeug.utils.secure_filename(flask.request.json["filename"])
+        DATA_FOLDER_PATH, flask.request.json["id"], werkzeug.utils.secure_filename(flask.request.json["filename"])
     )
     data = geode_functions.load(
         flask.request.json["input_geode_object"], file_absolute_path
@@ -372,7 +372,7 @@ def polyhedron_attribute_names():
     DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
     file_absolute_path = os.path.join(
-        DATA_FOLDER_PATH, werkzeug.utils.secure_filename(flask.request.json["filename"])
+        DATA_FOLDER_PATH, flask.request.json["id"], werkzeug.utils.secure_filename(flask.request.json["filename"])
     )
     data = geode_functions.load(
         flask.request.json["input_geode_object"], file_absolute_path

src/opengeodeweb_back/routes/models/schemas/mesh_components.json

@@ -6,13 +6,16 @@
   "type": "object",
   "properties": {
     "id": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1      
     },
     "filename": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "geode_object": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [

src/opengeodeweb_back/routes/models/schemas/vtm_component_indices.json

@@ -6,7 +6,8 @@
   "type": "object",
   "properties": {
     "id": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [

src/opengeodeweb_back/routes/schemas/polygon_attribute_names.json

@@ -12,11 +12,16 @@
     "filename": {
       "type": "string",
       "minLength": 1
+    },
+    "id": {
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
     "input_geode_object",
-    "filename"
+    "filename",
+    "id"
   ],
   "additionalProperties": false
 }

src/opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json

@@ -12,11 +12,16 @@
     "filename": {
       "type": "string",
       "minLength": 1
+    },
+    "id": {
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
     "input_geode_object",
-    "filename"
+    "filename",
+    "id"
   ],
   "additionalProperties": false
 }

src/opengeodeweb_back/routes/schemas/texture_coordinates.json

@@ -12,10 +12,15 @@
     "filename": {
       "type": "string",
       "minLength": 1
+    },
+    "id": {
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
     "input_geode_object",
+    "id",
     "filename"
   ],
   "additionalProperties": false

src/opengeodeweb_back/routes/schemas/vertex_attribute_names.json

@@ -12,11 +12,16 @@
     "filename": {
       "type": "string",
       "minLength": 1
+    },
+    "id": {
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
     "input_geode_object",
-    "filename"
+    "filename",
+    "id"
   ],
   "additionalProperties": false
 }

tests/conftest.py

@@ -14,7 +14,7 @@
 @pytest.fixture(scope="session", autouse=True)
 def copy_data():
     shutil.rmtree("./data", ignore_errors=True)
-    shutil.copytree("./tests/data", "./data", dirs_exist_ok=True)
+    shutil.copytree("./tests/data/", "./data/1/", dirs_exist_ok=True)
 
 
 @pytest.fixture

tests/test_routes.py

@@ -175,6 +175,7 @@ def test_texture_coordinates(client):
         "/texture_coordinates",
         json={
             "input_geode_object": "PolygonalSurface3D",
+            "id": "1",
             "filename": "hat.vtp",
         },
     )
@@ -205,6 +206,7 @@ def test_vertex_attribute_names(client):
                             def get_full_data():
                                 return {
                                     "input_geode_object": geode_object,
+                                    "id": "1",
                                     "filename": f"test.{input_extension}",
                                 }
 
@@ -241,6 +243,7 @@ def test_polygon_attribute_names(client):
                             def get_full_data():
                                 return {
                                     "input_geode_object": geode_object,
+                                    "id": "1",
                                     "filename": f"test.{input_extension}",
                                 }
 
@@ -277,6 +280,7 @@ def test_polyhedron_attribute_names(client):
                             def get_full_data():
                                 return {
                                     "input_geode_object": geode_object,
+                                    "id": "1",
                                     "filename": f"test.{input_extension}",
                                 }