pull from website-back

Author: SpliiT

.gitignore

@@ -4,3 +4,4 @@ venv
 output
 __pycache__
 .vscode
+uploads

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -13,8 +13,10 @@
 flask_cors.CORS(routes)
 
 
+schemas = os.path.join(os.path.dirname(__file__), "schemas")
+
 with open(
-    "src/opengeodeweb_back/routes/schemas/allowed_files.json",
+    os.path.join(schemas, "allowed_files.json"),
     "r",
 ) as file:
     allowed_files_json = json.load(file)
@@ -31,7 +33,7 @@ def allowed_files():
 
 
 with open(
-    "src/opengeodeweb_back/routes/schemas/upload_file.json",
+    os.path.join(schemas, "upload_file.json"),
     "r",
 ) as file:
     upload_file_json = json.load(file)
@@ -48,17 +50,14 @@ def upload_file():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     if not os.path.exists(UPLOAD_FOLDER):
         os.mkdir(UPLOAD_FOLDER)
-    files = flask.request.files.getlist("content")
-
-    for file in files:
-        filename = werkzeug.utils.secure_filename(os.path.basename(file.filename))
-        print(f"{filename=}")
-        file.save(os.path.join(UPLOAD_FOLDER, filename))
+    file = flask.request.files["file"]
+    filename = werkzeug.utils.secure_filename(os.path.basename(file.filename))
+    file.save(os.path.join(UPLOAD_FOLDER, filename))
     return flask.make_response({"message": "File uploaded"}, 201)
 
 
 with open(
-    "src/opengeodeweb_back/routes/schemas/allowed_objects.json",
+    os.path.join(schemas, "allowed_objects.json"),
     "r",
 ) as file:
     allowed_objects_json = json.load(file)
@@ -69,17 +68,20 @@ def upload_file():
     methods=allowed_objects_json["methods"],
 )
 def allowed_objects():
+    if flask.request.method == "OPTIONS":
+        return flask.make_response({}, 200)
+
+    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     geode_functions.validate_request(flask.request, allowed_objects_json)
-    file_extension = os.path.splitext(flask.request.json["filename"])[1][1:]
+    file_absolute_path = os.path.join(UPLOAD_FOLDER, flask.request.json["filename"])
     allowed_objects = geode_functions.list_geode_objects(
-        file_extension, flask.request.json["key"]
+        file_absolute_path, flask.request.json["key"]
     )
-
     return flask.make_response({"allowed_objects": allowed_objects}, 200)
 
 
 with open(
-    "src/opengeodeweb_back/routes/schemas/missing_files.json",
+    os.path.join(schemas, "missing_files.json"),
     "r",
 ) as file:
     missing_files_json = json.load(file)
@@ -98,29 +100,27 @@ def missing_files():
         os.path.join(UPLOAD_FOLDER, flask.request.json["filename"]),
     )
     has_missing_files = missing_files.has_missing_files()
-    mandatory_files = missing_files.mandatory_files
-    additional_files = missing_files.additional_files
 
-    mandatory_files_list = []
-    for mandatory_file in mandatory_files:
-        mandatory_files_list.append(os.path.basename(mandatory_file))
+    mandatory_files = []
+    for mandatory_file in missing_files.mandatory_files:
+        mandatory_files.append(os.path.basename(mandatory_file))
 
-    additional_files_list = []
-    for additional_file in additional_files:
-        additional_files_list.append(os.path.basename(additional_file))
+    additional_files = []
+    for additional_file in missing_files.additional_files:
+        additional_files.append(os.path.basename(additional_file))
 
     return flask.make_response(
         {
             "has_missing_files": has_missing_files,
-            "mandatory_files": mandatory_files_list,
-            "additional_files": additional_files_list,
+            "mandatory_files": mandatory_files,
+            "additional_files": additional_files,
         },
         200,
     )
 
 
 with open(
-    "src/opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json",
+    os.path.join(schemas, "geographic_coordinate_systems.json"),
     "r",
 ) as file:
     geographic_coordinate_systems_json = json.load(file)
@@ -148,7 +148,7 @@ def crs_converter_geographic_coordinate_systems():
 
 
 with open(
-    "src/opengeodeweb_back/routes/schemas/geode_objects_and_output_extensions.json",
+    os.path.join(schemas, "geode_objects_and_output_extensions.json"),
     "r",
 ) as file:
     geode_objects_and_output_extensions_json = json.load(file)
@@ -160,25 +160,18 @@ def crs_converter_geographic_coordinate_systems():
 )
 def geode_objects_and_output_extensions():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-
     geode_functions.validate_request(
         flask.request, geode_objects_and_output_extensions_json
     )
-
     data = geode_functions.load(
         flask.request.json["input_geode_object"],
-        os.path.join(
-            os.path.abspath(UPLOAD_FOLDER),
-            flask.request.json["filename"],
-        ),
+        os.path.join(UPLOAD_FOLDER, flask.request.json["filename"]),
     )
     geode_objects_and_output_extensions = (
         geode_functions.geode_objects_output_extensions(
             flask.request.json["input_geode_object"], data
         )
     )
-
-    print(geode_objects_and_output_extensions)
     return flask.make_response(
         {"geode_objects_and_output_extensions": geode_objects_and_output_extensions},
         200,

tests/test_functions.py

@@ -171,7 +171,7 @@ def test_geode_object_output_extensions():
                         output_extension,
                         output_extension_value,
                     ) in output_geode_object_value.items():
-                        # assert type(output_extension) is str
+                        assert type(output_extension) is str
                         assert type(output_extension_value["is_saveable"]) is bool
 
 

tests/test_routes.py

@@ -42,7 +42,7 @@ def get_full_data():
 def test_upload_file(client):
     response = client.put(
         f"/upload_file",
-        data={"content": FileStorage(open("./tests/corbi.og_brep", "rb"))},
+        data={"file": FileStorage(open("./tests/corbi.og_brep", "rb"))},
     )
 
     assert response.status_code == 201