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

Author: MaxNumerique

src/opengeodeweb_back/geode_functions.py

@@ -39,25 +39,23 @@ def is_loadable(geode_object: str, file_absolute_path: str):
 def load(geode_object: str, file_absolute_path: str):
     return geode_object_value(geode_object)["load"](file_absolute_path)
 
-def load_data(geode_object: str, request_json: dict):
-    data_folder_path = flask.current_app.config["DATA_FOLDER_PATH"]
+def load_from_request(geode_object: str, data_folder_path: str, request_json: dict):
     file_absolute_path = os.path.join(
         data_folder_path,
         request_json["id"],
         werkzeug.utils.secure_filename(request_json["filename"]),
     )
     return load(geode_object, file_absolute_path)
 
-def data_file_path(request_json, filename):
-    data_folder_path = flask.current_app.config["DATA_FOLDER_PATH"] # Use the load_data function to get the data folder path
+def build_data_path(data_folder_path, request_json, filename):
     return os.path.join(
         data_folder_path,
         request_json["id"],
         werkzeug.utils.secure_filename(filename),
     )
 
-def upload_file_path(upload_folder, filename):
-    secure_filename = werkzeug.utils.secure_filename(filename) # filename must be grabbed from the data_file_path function
+def build_upload_file_path(upload_folder, filename):
+    secure_filename = werkzeug.utils.secure_filename(filename)
     return os.path.abspath(os.path.join(upload_folder, secure_filename)
     )
 

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -99,7 +99,7 @@ def allowed_objects():
 
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(flask.request, allowed_objects_json)
-    file_absolute_path = geode_functions.upload_file_path(
+    file_absolute_path = geode_functions.build_upload_file_path(
     UPLOAD_FOLDER, flask.request.json["filename"])
     allowed_objects = geode_functions.list_geode_objects(
         file_absolute_path, flask.request.json["supported_feature"]
@@ -124,7 +124,7 @@ def missing_files():
 
     missing_files = geode_functions.missing_files(
         flask.request.json["input_geode_object"],
-        geode_functions.upload_file_path(
+        geode_functions.build_upload_file_path(
     UPLOAD_FOLDER, flask.request.json["filename"]),
     )
     has_missing_files = missing_files.has_missing_files()
@@ -217,7 +217,7 @@ def geode_objects_and_output_extensions():
     )
     data = geode_functions.load(
         flask.request.json["input_geode_object"],
-        geode_functions.upload_file_path(
+        geode_functions.build_upload_file_path(
     UPLOAD_FOLDER, flask.request.json["filename"]),
     )
     geode_objects_and_output_extensions = (
@@ -290,8 +290,9 @@ def create_point():
 )
 def texture_coordinates():
     utils_functions.validate_request(flask.request, texture_coordinates_json)
-    data = geode_functions.load_data(
+    data = geode_functions.load_from_request(
     flask.request.json["input_geode_object"],
+    DATA_FOLDER_PATH,
     flask.request.json,
 )
 
@@ -313,8 +314,9 @@ def texture_coordinates():
 )
 def vertex_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    data = geode_functions.load_data(
+    data = geode_functions.load_from_request(
     flask.request.json["input_geode_object"],
+    DATA_FOLDER_PATH,
     flask.request.json,
     )
 
@@ -341,8 +343,9 @@ def vertex_attribute_names():
 )
 def polygon_attribute_names():
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
-    data = geode_functions.load_data(
+    data = geode_functions.load_from_request(
     flask.request.json["input_geode_object"],
+    DATA_FOLDER_PATH,
     flask.request.json,
     )
 
@@ -369,8 +372,9 @@ def polygon_attribute_names():
 )
 def polyhedron_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    data = geode_functions.load_data(
+    data = geode_functions.load_from_request(
     flask.request.json["input_geode_object"],
+    DATA_FOLDER_PATH,
     flask.request.json,
     )
 

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -21,7 +21,7 @@ def uuid_to_flat_index():
     try:
         vtm_file_path = geode_functions.data_file_path(
             flask.request.json,
-            "viewable.vtm"
+            "viewable.vtm",
         )
         tree = ET.parse(vtm_file_path)
     except FileNotFoundError:

tests/conftest.py

@@ -33,6 +33,7 @@ def app_context():
     with app.app_context():
         yield
 
+
 @pytest.fixture
 def test_id():
-    return "1"
+    return "1"

tests/test_models_routes.py

@@ -1,8 +1,5 @@
 import os
 import shutil
-
-from src.opengeodeweb_back import geode_functions
-
 def test_model_mesh_components(client, test_id):
     route = "/models/vtm_component_indices"
 

tests/test_routes.py

@@ -1,5 +1,6 @@
 # Standard library imports
 import os
+
 # Third party imports
 from werkzeug.datastructures import FileStorage