test

Author: MaxNumerique

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -249,9 +249,9 @@ def save_viewable_file():
     utils_functions.validate_request(flask.request, save_viewable_file_json)
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable_from_file(
-            flask.request.json["input_geode_object"],
-            "upload",
-            flask.request.json["filename"]
+            input_geode_object=flask.request.json["input_geode_object"],
+            data_id=flask.request.json["data_id"],
+            filename=flask.request.json["filename"]
         ),
         200,
     )

src/opengeodeweb_back/routes/schemas/save_viewable_file.json

@@ -12,6 +12,10 @@
         "filename": {
             "type": "string",
             "minLength": 1
+        },
+        "data_id": {
+            "type": "string",
+            "minLength": 1
         }
     },
     "required": [

src/opengeodeweb_back/utils_functions.py

@@ -148,11 +148,11 @@ def generate_native_viewable_and_light_viewable_from_object(geode_object, data):
     return generate_native_viewable_and_light_viewable(geode_object, data)
 
 
-def generate_native_viewable_and_light_viewable_from_file(geode_object, data_id, filename):
-    data = geode_functions.load_data(geode_object, data_id, filename)
-    input_filename = geode_functions.data_file_path(data_id, filename)
+def generate_native_viewable_and_light_viewable_from_file(geode_object, input_filename, data_id):
+    data = geode_functions.load_data(geode_object, data_id, input_filename)
+    full_input_filename = geode_functions.data_file_path(data_id, input_filename)
     return generate_native_viewable_and_light_viewable(
-        geode_object, data, input_filename
+        geode_object, data, full_input_filename
     )
 
 

tests/test_utils_functions.py

@@ -96,15 +96,14 @@ def test_generate_native_viewable_and_light_viewable_from_object(client):
     assert result["input_files"] == []
 
 
-def test_generate_native_viewable_and_light_viewable_from_file(client, test_id):
+def test_generate_native_viewable_and_light_viewable_from_file(client):
     app = client.application
     with app.app_context():
         geode_object = "BRep"
-        data_id = test_id
-        filename = "test.og_brep"
+        input_filename = "./tests/data/test.og_brep"
 
         result = utils_functions.generate_native_viewable_and_light_viewable_from_file(
-            geode_object, data_id, filename
+            geode_object, input_filename
         )
 
     assert isinstance(result, dict)