test

Author: MaxNumerique

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -247,11 +247,11 @@ def geode_objects_and_output_extensions():
 )
 def save_viewable_file():
     utils_functions.validate_request(flask.request, save_viewable_file_json)
-    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable_from_file(
             flask.request.json["input_geode_object"],
-            file_path
+            "upload",
+            flask.request.json["filename"]
         ),
         200,
     )

src/opengeodeweb_back/utils_functions.py

@@ -148,8 +148,9 @@ 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, input_filename):
-    data = geode_functions.load(geode_object, input_filename)
+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)
     return generate_native_viewable_and_light_viewable(
         geode_object, data, input_filename
     )

tests/test_utils_functions.py

@@ -96,14 +96,15 @@ 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):
+def test_generate_native_viewable_and_light_viewable_from_file(client, test_id):
     app = client.application
     with app.app_context():
         geode_object = "BRep"
-        input_filename = "./tests/data/test.og_brep"
+        data_id = test_id
+        filename = "test.og_brep"
 
         result = utils_functions.generate_native_viewable_and_light_viewable_from_file(
-            geode_object, input_filename
+            geode_object, data_id, filename
         )
 
     assert isinstance(result, dict)