feat(folder_path): upload files ino upload folder into project folder added

Author: MaxNumerique

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -242,13 +242,12 @@ def geode_objects_and_output_extensions():
 def save_viewable_file():
     utils_functions.validate_request(flask.request, save_viewable_file_json)
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
     file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))
     data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable(
-            flask.request.json["input_geode_object"], data, DATA_FOLDER_PATH
+            flask.request.json["input_geode_object"], data
         ),
         200,
     )
@@ -261,7 +260,6 @@ def save_viewable_file():
 @routes.route(create_point_json["route"], methods=create_point_json["methods"])
 def create_point():
     utils_functions.validate_request(flask.request, create_point_json)
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     title = flask.request.json["title"]
     x = flask.request.json["x"]
     y = flask.request.json["y"]
@@ -273,7 +271,7 @@ def create_point():
     builder.set_name(title)
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable(
-            "PointSet3D", PointSet3D, DATA_FOLDER_PATH
+            "PointSet3D", PointSet3D
         ),
         200,
     )

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -59,7 +59,7 @@ def extract_model_uuids(geode_object, file_path):
 def extract_uuids_endpoint():
     utils_functions.validate_request(flask.request, mesh_components_json)
     file_path = os.path.join(
-        flask.current_app.config["DATA_FOLDER_PATH"], flask.request.json["filename"]
+        flask.current_app.config["DATA_FOLDER_PATH"], flask.request.json["id"], flask.request.json["filename"]
     )
     if not os.path.exists(file_path):
         return flask.make_response({"error": "File not found"}, 404)

src/opengeodeweb_back/utils_functions.py

@@ -144,12 +144,11 @@ def handle_exception(e):
 
 
 def generate_native_viewable_and_light_viewable(
-    geode_object, data, folder_absolute_path
+    geode_object, data
 ):
     generated_id = str(uuid.uuid4()).replace("-", "")
-    data_path = os.path.join(folder_absolute_path, generated_id)
-    upload_folder = os.path.join(folder_absolute_path, "uploads")
-    os.makedirs(upload_folder, exist_ok=True)
+    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
+    data_path = os.path.join(DATA_FOLDER_PATH, generated_id)
     name = data.name()
     object_type = geode_functions.get_object_type(geode_object)
 
@@ -162,7 +161,7 @@ def generate_native_viewable_and_light_viewable(
     saved_viewable_file_path = geode_functions.save_viewable(
     geode_object, data, data_path, "viewable"
     )
-    viewable_file_name = os.path.basename(data_path) + "/" + os.path.basename(saved_viewable_file_path)
+    viewable_file_name = os.path.basename(saved_viewable_file_path)
     saved_light_viewable_file_path = geode_functions.save_light_viewable(
         geode_object, data, data_path, "light_viewable"
     )