Merge pull request #36 from Geode-solutions/json_back

feat(validate_request):
add json schema into function

BREAKING CHANGE: Arguments changement(array to json schema)

Author: SpliiT

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "."
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

requirements.in

@@ -4,3 +4,6 @@ OpenGeode-Inspector
 OpenGeode-Geosciences
 OpenGeode-GeosciencesIO
 Geode-Viewables
+jsonschema
+flask[async]
+werkzeug

requirements.txt

@@ -1,13 +1,37 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --resolver=backtracking requirements.in
+#    pip-compile
 #
+asgiref==3.7.2
+    # via flask
+attrs==23.1.0
+    # via
+    #   jsonschema
+    #   referencing
+blinker==1.7.0
+    # via flask
+click==8.1.7
+    # via flask
+flask[async]==3.0.0
+    # via -r requirements.in
 geode-common==29.0.1
     # via geode-viewables
 geode-viewables==2.1.3
     # via -r requirements.in
+itsdangerous==2.1.2
+    # via flask
+jinja2==3.1.2
+    # via flask
+jsonschema==4.19.2
+    # via -r requirements.in
+jsonschema-specifications==2023.7.1
+    # via jsonschema
+markupsafe==2.1.3
+    # via
+    #   jinja2
+    #   werkzeug
 opengeode-core==14.9.3
     # via
     #   -r requirements.in
@@ -34,3 +58,17 @@ opengeode-io==6.2.1
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-inspector
+referencing==0.30.2
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+rpds-py==0.12.0
+    # via
+    #   jsonschema
+    #   referencing
+typing-extensions==4.8.0
+    # via asgiref
+werkzeug==3.0.1
+    # via
+    #   -r requirements.in
+    #   flask

src/opengeodeweb_back/geode_functions.py

@@ -11,6 +11,8 @@
 import opengeode as og
 import pkg_resources
 import werkzeug
+from jsonschema import validate
+from jsonschema.exceptions import ValidationError
 
 # Local application imports
 from .geode_objects import geode_objects_dict
@@ -234,15 +236,16 @@ def extension_from_filename(filename):
     return os.path.splitext(filename)[1][1:]
 
 
-def validate_request(request, variables_array):
+def validate_request(request, schema):
     json_data = request.get_json(force=True, silent=True)
 
     if json_data is None:
-        flask.abort(400, f"No json sent")
+        json_data = {}
 
-    for variable in variables_array:
-        if variable not in json_data.keys():
-            flask.abort(400, f"No {variable} sent")
+    try:
+        validate(instance=json_data, schema=schema)
+    except ValidationError as e:
+        flask.abort(400, f"Validation error: {e.message}")
 
 
 def geographic_coordinate_systems(geode_object: str):