native. instead of filename. for native file

Author: MaxNumerique

src/opengeodeweb_back/utils_functions.py

@@ -188,7 +188,6 @@ def save_all_viewables_and_return_info(
     geode_object: GeodeObject,
     data: Data,
     data_path: str,
-    native_filename: str | None = None,
 ) -> dict[str, str | list[str]]:
     with ThreadPoolExecutor() as executor:
         native_files, viewable_path, light_path = executor.map(
@@ -197,12 +196,7 @@ def save_all_viewables_and_return_info(
                 (
                     geode_object.save,
                     os.path.join(
-                        data_path,
-                        (
-                            native_filename
-                            if native_filename is not None
-                            else "native." + geode_object.native_extension()
-                        ),
+                        data_path, "native." + geode_object.native_extension()
                     ),
                 ),
                 (geode_object.save_viewable, os.path.join(data_path, "viewable")),
@@ -276,10 +270,9 @@ def generate_native_viewable_and_light_viewable_from_file(
         shutil.copy2(source_path, dest_path)
         additional_files_copied.append(additional_file.filename)
 
+    data.name = input_file
     geode_object = generic_geode_object.load(copied_full_path)
-    return save_all_viewables_and_return_info(
-        geode_object,
-        data,
-        data_path,
-        native_filename=secure_input_file,
-    )
+    result = save_all_viewables_and_return_info(geode_object, data, data_path)
+    if os.path.exists(copied_full_path):
+        os.remove(copied_full_path)
+    return result

tests/test_models_routes.py

@@ -62,27 +62,27 @@ def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:
             geode_object="BRep",
             viewer_object="BRep",
             viewer_elements_type="default",
-            native_file="test_native.txt",
+            native_file="native.txt",
         )
         data2 = Data(
             id="test_data_2",
             geode_object="Section",
             viewer_object="Section",
             viewer_elements_type="default",
-            native_file="test_native2.txt",
+            native_file="native.txt",
         )
         session.add(data1)
         session.add(data2)
         session.commit()
 
         data1_dir = os.path.join(project_folder, "test_data_1")
         os.makedirs(data1_dir, exist_ok=True)
-        with open(os.path.join(data1_dir, "test_native.txt"), "w") as f:
+        with open(os.path.join(data1_dir, "native.txt"), "w") as f:
             f.write("native file content")
 
         data2_dir = os.path.join(project_folder, "test_data_2")
         os.makedirs(data2_dir, exist_ok=True)
-        with open(os.path.join(data2_dir, "test_native2.txt"), "w") as f:
+        with open(os.path.join(data2_dir, "native.txt"), "w") as f:
             f.write("native file content")
 
     response = client.post(route, json={"snapshot": snapshot, "filename": filename})
@@ -100,8 +100,8 @@ def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:
         parsed = json.loads(zip_file.read("snapshot.json").decode("utf-8"))
         assert parsed == snapshot
         assert "project.db" in names
-        assert "test_data_1/test_native.txt" in names
-        assert "test_data_2/test_native2.txt" in names
+        assert "test_data_1/native.txt" in names
+        assert "test_data_2/native.txt" in names
 
     response.close()
 

tests/test_utils_functions.py

@@ -208,7 +208,7 @@ def test_generate_native_viewable_and_light_viewable_from_file(
 
     assert isinstance(result, dict)
     assert isinstance(result["native_file"], str)
-    assert result["native_file"] == "test.og_brep"
+    assert result["native_file"] == "native.og_brep"
     assert isinstance(result["viewable_file"], str)
     assert result["viewable_file"].endswith(".vtm")
     assert isinstance(result["id"], str)