Apply prepare changes

Author: MaxNumerique

opengeodeweb_back_schemas.json

@@ -296,6 +296,17 @@
       ],
       "additionalProperties": false
     },
+    "import_project": {
+      "$id": "opengeodeweb_back/import_project",
+      "route": "/import_project",
+      "methods": [
+        "POST"
+      ],
+      "type": "object",
+      "properties": {},
+      "required": [],
+      "additionalProperties": false
+    },
     "geographic_coordinate_systems": {
       "$id": "opengeodeweb_back/geographic_coordinate_systems",
       "route": "/geographic_coordinate_systems",
@@ -337,6 +348,27 @@
       ],
       "additionalProperties": false
     },
+    "export_project": {
+      "$id": "opengeodeweb_back/export_project",
+      "route": "/export_project",
+      "methods": [
+        "POST"
+      ],
+      "type": "object",
+      "properties": {
+        "snapshot": {
+          "type": "object"
+        },
+        "filename": {
+          "type": "string",
+          "minLength": 1
+        }
+      },
+      "required": [
+        "snapshot"
+      ],
+      "additionalProperties": false
+    },
     "allowed_objects": {
       "$id": "opengeodeweb_back/allowed_objects",
       "route": "/allowed_objects",

requirements.txt

@@ -60,4 +60,3 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.6rc1

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -331,9 +331,7 @@ def import_project() -> flask.Response:
     with zipfile.ZipFile(zip_file.stream) as zf:
         base = os.path.abspath(data_folder_path)
         for member in zf.namelist():
-            target = os.path.abspath(
-                os.path.normpath(os.path.join(base, member))
-            )
+            target = os.path.abspath(os.path.normpath(os.path.join(base, member)))
             if not (target == base or target.startswith(base + os.sep)):
                 flask.abort(400, "Zip contains unsafe paths")
         zf.extractall(data_folder_path)

src/opengeodeweb_back/routes/schemas/__init__.py

@@ -8,9 +8,9 @@
 from .missing_files import *
 from .kill import *
 from .inspect_file import *
+from .import_project import *
 from .geographic_coordinate_systems import *
 from .geode_objects_and_output_extensions import *
+from .export_project import *
 from .allowed_objects import *
 from .allowed_files import *
-from .export_project import *
-from .import_project import *

src/opengeodeweb_back/routes/schemas/export_project.py

@@ -6,4 +6,4 @@
 @dataclass
 class ExportProject(DataClassJsonMixin):
     snapshot: Dict[str, Any]
-    filename: Optional[str] = None
+    filename: Optional[str] = None

src/opengeodeweb_back/routes/schemas/import_project.py

@@ -4,4 +4,4 @@
 
 @dataclass
 class ImportProject(DataClassJsonMixin):
-    pass
+    pass

tests/test_models_routes.py

@@ -62,7 +62,9 @@ def test_extract_brep_uuids(client, test_id):
 
 def test_export_project_route(client, tmp_path):
     route = "/opengeodeweb_back/export_project"
-    snapshot = {"styles": {"1": {"visibility": True, "opacity": 1.0, "color": [0.2, 0.6, 0.9]}}}
+    snapshot = {
+        "styles": {"1": {"visibility": True, "opacity": 1.0, "color": [0.2, 0.6, 0.9]}}
+    }
     filename = "export_project_test.zip"
     response = client.post(route, json={"snapshot": snapshot, "filename": filename})
     assert response.status_code == 200
@@ -87,7 +89,9 @@ def test_export_project_route(client, tmp_path):
 
 def test_import_project_route(client, tmp_path):
     route = "/opengeodeweb_back/import_project"
-    snapshot = {"styles": {"1": {"visibility": True, "opacity": 1.0, "color": [0.2, 0.6, 0.9]}}}
+    snapshot = {
+        "styles": {"1": {"visibility": True, "opacity": 1.0, "color": [0.2, 0.6, 0.9]}}
+    }
 
     data_folder = client.application.config["DATA_FOLDER_PATH"]
     pre_existing_db_path = os.path.join(data_folder, "1", "project.db")

tests/test_utils_functions.py

@@ -221,7 +221,9 @@ def test_send_file_multiple_returns_zip(client, tmp_path):
             file_path.write_bytes(content)
             file_paths.append(str(file_path))
         with app.test_request_context():
-            response = utils_functions.send_file(app.config["UPLOAD_FOLDER"], file_paths, "bundle")
+            response = utils_functions.send_file(
+                app.config["UPLOAD_FOLDER"], file_paths, "bundle"
+            )
             assert response.status_code == 200
             assert response.mimetype == "application/zip"
             assert response.headers.get("new-file-name") == "bundle.zip"
@@ -242,7 +244,9 @@ def test_send_file_single_returns_octet_binary(client, tmp_path):
         file_path = tmp_path / "tmp_send_file_1.txt"
         file_path.write_bytes(b"hello 1")
         with app.test_request_context():
-            response = utils_functions.send_file(app.config["UPLOAD_FOLDER"], [str(file_path)], "tmp_send_file_1.txt")
+            response = utils_functions.send_file(
+                app.config["UPLOAD_FOLDER"], [str(file_path)], "tmp_send_file_1.txt"
+            )
             assert response.status_code == 200
             assert response.mimetype == "application/octet-binary"
             assert response.headers.get("new-file-name") == "tmp_send_file_1.txt"