Merge branch 'feat/folder_path' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/folder_path

Author: MaxNumerique

src/opengeodeweb_back/app_config.py

@@ -32,4 +32,5 @@ class DevConfig(Config):
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     DATA_FOLDER_PATH = "./data/"
 
-TEST_ID = "1"
+
+TEST_ID = "1"

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -126,6 +126,9 @@ def missing_files():
         flask.request.json["input_geode_object"],
         geode_functions.upload_file_path(
     UPLOAD_FOLDER, flask.request.json["filename"]),
+        geode_functions.build_upload_file_path(
+            UPLOAD_FOLDER, flask.request.json["filename"]
+        ),
     )
     has_missing_files = missing_files.has_missing_files()
 
@@ -219,6 +222,9 @@ def geode_objects_and_output_extensions():
         flask.request.json["input_geode_object"],
         geode_functions.upload_file_path(
     UPLOAD_FOLDER, flask.request.json["filename"]),
+        geode_functions.build_upload_file_path(
+            UPLOAD_FOLDER, flask.request.json["filename"]
+        ),
     )
     geode_objects_and_output_extensions = (
         geode_functions.geode_objects_output_extensions(

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -35,6 +35,7 @@ def uuid_to_flat_index():
         current_index += 1
     return flask.make_response({"uuid_to_flat_index": uuid_to_flat_index}, 200)
 
+
 def extract_model_uuids(model):
     mesh_components = model.mesh_components()
     uuid_dict = {}

tests/test_models_routes.py

@@ -1,12 +1,11 @@
 import os
 import shutil
+
+
 def test_model_mesh_components(client, test_id):
     route = "/models/vtm_component_indices"
 
-    data_path = geode_functions.data_file_path(
-        {"id": test_id},
-        "viewable.vtm"
-    )
+    data_path = geode_functions.data_file_path({"id": test_id}, "viewable.vtm")
     os.makedirs(os.path.dirname(data_path), exist_ok=True)
     shutil.copy("./tests/data/cube.vtm", data_path)
 
@@ -28,10 +27,7 @@ def test_extract_brep_uuids(client, test_id):
     brep_filename = "cube.og_brep"
     json_data = {"id": test_id, "geode_object": "BRep", "filename": brep_filename}
 
-    data_path = geode_functions.data_file_path(
-        json_data,
-        brep_filename
-    )
+    data_path = geode_functions.data_file_path(json_data, brep_filename)
     os.makedirs(os.path.dirname(data_path), exist_ok=True)
     shutil.copy(f"./tests/data/{brep_filename}", data_path)