From 1aaeab299092dc7bf3c6a33d927045edcf8cbdc4 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Wed, 28 Feb 2024 15:38:21 +0100 Subject: [PATCH 1/3] refactor(key): switch to filter_key --- src/opengeodeweb_back/routes/blueprint_routes.py | 4 ++-- src/opengeodeweb_back/routes/schemas/allowed_files.json | 4 ++-- src/opengeodeweb_back/routes/schemas/allowed_objects.json | 4 ++-- tests/test_routes.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/opengeodeweb_back/routes/blueprint_routes.py b/src/opengeodeweb_back/routes/blueprint_routes.py index 9faca1b2..9cb3ef25 100644 --- a/src/opengeodeweb_back/routes/blueprint_routes.py +++ b/src/opengeodeweb_back/routes/blueprint_routes.py @@ -28,7 +28,7 @@ ) def allowed_files(): geode_functions.validate_request(flask.request, allowed_files_json) - extensions = geode_functions.list_input_extensions(flask.request.json["key"]) + extensions = geode_functions.list_input_extensions(flask.request.json["filter_key"]) return {"status": 200, "extensions": extensions} @@ -75,7 +75,7 @@ def allowed_objects(): geode_functions.validate_request(flask.request, allowed_objects_json) file_absolute_path = os.path.join(UPLOAD_FOLDER, flask.request.json["filename"]) allowed_objects = geode_functions.list_geode_objects( - file_absolute_path, flask.request.json["key"] + file_absolute_path, flask.request.json["filter_key"] ) return flask.make_response({"allowed_objects": allowed_objects}, 200) diff --git a/src/opengeodeweb_back/routes/schemas/allowed_files.json b/src/opengeodeweb_back/routes/schemas/allowed_files.json index e5fb7aa9..567b09b0 100644 --- a/src/opengeodeweb_back/routes/schemas/allowed_files.json +++ b/src/opengeodeweb_back/routes/schemas/allowed_files.json @@ -3,10 +3,10 @@ "methods": ["POST"], "type": "object", "properties": { - "key": { + "filter_key": { "type": ["string", "null"] } }, - "required": ["key"], + "required": ["filter_key"], "additionalProperties": false } diff --git a/src/opengeodeweb_back/routes/schemas/allowed_objects.json b/src/opengeodeweb_back/routes/schemas/allowed_objects.json index 78371130..2592422f 100644 --- a/src/opengeodeweb_back/routes/schemas/allowed_objects.json +++ b/src/opengeodeweb_back/routes/schemas/allowed_objects.json @@ -6,10 +6,10 @@ "filename": { "type": "string" }, - "key": { + "filter_key": { "type": ["string", "null"] } }, - "required": ["filename", "key"], + "required": ["filename", "filter_key"], "additionalProperties": false } diff --git a/tests/test_routes.py b/tests/test_routes.py index 5d4a0606..beb6d375 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -5,7 +5,7 @@ def test_allowed_files(client): route = f"/allowed_files" - response = client.post(route, json={"key": None}) + response = client.post(route, json={"filter_key": None}) assert response.status_code == 200 extensions = response.json["extensions"] assert type(extensions) is list @@ -19,7 +19,7 @@ def test_allowed_objects(client): def get_full_data(): return { "filename": "corbi.og_brep", - "key": None, + "filter_key": None, } # Normal test with filename 'corbi.og_brep' From 29898c373db23a5c9c18f0ef5f5ddec9b78b512d Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Wed, 28 Feb 2024 15:40:21 +0100 Subject: [PATCH 2/3] refactor(key): switch to filter_key BREAKING CHANGE: changes api From b78fc6c224cf86849649c9095e9acde5f6badaf9 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Wed, 28 Feb 2024 16:16:45 +0100 Subject: [PATCH 3/3] refactor(key): switch to supported_feature --- src/opengeodeweb_back/routes/blueprint_routes.py | 6 ++++-- src/opengeodeweb_back/routes/schemas/allowed_files.json | 4 ++-- src/opengeodeweb_back/routes/schemas/allowed_objects.json | 4 ++-- tests/test_routes.py | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/opengeodeweb_back/routes/blueprint_routes.py b/src/opengeodeweb_back/routes/blueprint_routes.py index 9cb3ef25..1bcef538 100644 --- a/src/opengeodeweb_back/routes/blueprint_routes.py +++ b/src/opengeodeweb_back/routes/blueprint_routes.py @@ -28,7 +28,9 @@ ) def allowed_files(): geode_functions.validate_request(flask.request, allowed_files_json) - extensions = geode_functions.list_input_extensions(flask.request.json["filter_key"]) + extensions = geode_functions.list_input_extensions( + flask.request.json["supported_feature"] + ) return {"status": 200, "extensions": extensions} @@ -75,7 +77,7 @@ def allowed_objects(): geode_functions.validate_request(flask.request, allowed_objects_json) file_absolute_path = os.path.join(UPLOAD_FOLDER, flask.request.json["filename"]) allowed_objects = geode_functions.list_geode_objects( - file_absolute_path, flask.request.json["filter_key"] + file_absolute_path, flask.request.json["supported_feature"] ) return flask.make_response({"allowed_objects": allowed_objects}, 200) diff --git a/src/opengeodeweb_back/routes/schemas/allowed_files.json b/src/opengeodeweb_back/routes/schemas/allowed_files.json index 567b09b0..32f5d394 100644 --- a/src/opengeodeweb_back/routes/schemas/allowed_files.json +++ b/src/opengeodeweb_back/routes/schemas/allowed_files.json @@ -3,10 +3,10 @@ "methods": ["POST"], "type": "object", "properties": { - "filter_key": { + "supported_feature": { "type": ["string", "null"] } }, - "required": ["filter_key"], + "required": ["supported_feature"], "additionalProperties": false } diff --git a/src/opengeodeweb_back/routes/schemas/allowed_objects.json b/src/opengeodeweb_back/routes/schemas/allowed_objects.json index 2592422f..3a97ae8d 100644 --- a/src/opengeodeweb_back/routes/schemas/allowed_objects.json +++ b/src/opengeodeweb_back/routes/schemas/allowed_objects.json @@ -6,10 +6,10 @@ "filename": { "type": "string" }, - "filter_key": { + "supported_feature": { "type": ["string", "null"] } }, - "required": ["filename", "filter_key"], + "required": ["filename", "supported_feature"], "additionalProperties": false } diff --git a/tests/test_routes.py b/tests/test_routes.py index beb6d375..f30fb6a1 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -5,7 +5,7 @@ def test_allowed_files(client): route = f"/allowed_files" - response = client.post(route, json={"filter_key": None}) + response = client.post(route, json={"supported_feature": None}) assert response.status_code == 200 extensions = response.json["extensions"] assert type(extensions) is list @@ -19,7 +19,7 @@ def test_allowed_objects(client): def get_full_data(): return { "filename": "corbi.og_brep", - "filter_key": None, + "supported_feature": None, } # Normal test with filename 'corbi.og_brep'