Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/opengeodeweb_back/routes/blueprint_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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["key"])
extensions = geode_functions.list_input_extensions(
flask.request.json["supported_feature"]
)
return {"status": 200, "extensions": extensions}


Expand Down Expand Up @@ -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["key"]
file_absolute_path, flask.request.json["supported_feature"]
)
return flask.make_response({"allowed_objects": allowed_objects}, 200)

Expand Down
4 changes: 2 additions & 2 deletions src/opengeodeweb_back/routes/schemas/allowed_files.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"methods": ["POST"],
"type": "object",
"properties": {
"key": {
"supported_feature": {
"type": ["string", "null"]
}
},
"required": ["key"],
"required": ["supported_feature"],
"additionalProperties": false
}
4 changes: 2 additions & 2 deletions src/opengeodeweb_back/routes/schemas/allowed_objects.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"filename": {
"type": "string"
},
"key": {
"supported_feature": {
"type": ["string", "null"]
}
},
"required": ["filename", "key"],
"required": ["filename", "supported_feature"],
"additionalProperties": false
}
4 changes: 2 additions & 2 deletions tests/test_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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={"supported_feature": None})
assert response.status_code == 200
extensions = response.json["extensions"]
assert type(extensions) is list
Expand All @@ -19,7 +19,7 @@ def test_allowed_objects(client):
def get_full_data():
return {
"filename": "corbi.og_brep",
"key": None,
"supported_feature": None,
}

# Normal test with filename 'corbi.og_brep'
Expand Down