revert

Author: MaxNumerique

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -251,7 +251,7 @@ def save_viewable_file():
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable_from_file(
             flask.request.json["input_geode_object"],
-            "upload",
+            "upload",  # data_id pour le dossier upload
             flask.request.json["filename"]
         ),
         200,

src/opengeodeweb_back/utils_functions.py

@@ -148,11 +148,8 @@ 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, input_filename
-):
-    file_absolute_path = geode_functions.data_file_path(data_id, input_filename)
-    data = geode_functions.load(geode_object, file_absolute_path)
+def generate_native_viewable_and_light_viewable_from_file(geode_object, input_filename):
+    data = geode_functions.load(geode_object, input_filename)
     return generate_native_viewable_and_light_viewable(
         geode_object, data, input_filename
     )

tests/test_utils_functions.py

@@ -100,18 +100,10 @@ def test_generate_native_viewable_and_light_viewable_from_file(client):
     app = client.application
     with app.app_context():
         geode_object = "BRep"
-        data_id = "test_data"
-        input_filename = "test.og_brep"
-        
-        # Copier le fichier de test dans le dossier data_id
-        import shutil
-        import os
-        data_path = geode_functions.data_file_path(data_id, input_filename)
-        os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy("./tests/data/test.og_brep", data_path)
+        input_filename = "./tests/data/test.og_brep"
 
         result = utils_functions.generate_native_viewable_and_light_viewable_from_file(
-            geode_object, data_id, input_filename
+            geode_object, input_filename
         )
 
     assert isinstance(result, dict)