Merge pull request #7 from A-Baji/jeroen-pr-update

restriction query parameter handling and test

Author: jverswijver

pharus/component_interface.py

@@ -1,4 +1,5 @@
 """This module is a GUI component library of various common interfaces."""
+from base64 import b64decode
 import json
 import datajoint as dj
 import re
@@ -126,9 +127,8 @@ def dj_query_route(self):
         record_header, table_records, total_count = _DJConnector._fetch_records(
             query=fetch_metadata["query"] & self.restriction,
             fetch_args=fetch_metadata["fetch_args"],
-            limit=int(request.args["limit"]) if "limit" in request.args else 1000,
-            page=int(request.args["page"]) if "page" in request.args else 1,
         )
+
         return (
             NumpyEncoder.dumps(
                 dict(
@@ -301,6 +301,9 @@ def dj_query_route(self):
             limit=int(request.args["limit"]) if "limit" in request.args else 1000,
             page=int(request.args["page"]) if "page" in request.args else 1,
             order=request.args["order"].split(",") if "order" in request.args else None,
+            restriction=json.loads(b64decode(request.args["restriction"]))
+            if "restriction" in request.args
+            else [],
         )
 
         return (

tests/test_api_gen.py

@@ -1,4 +1,5 @@
 from . import SCHEMA_PREFIX, token, client, connection, schemas_simple
+from base64 import b64encode
 import json
 
 
@@ -130,3 +131,23 @@ def test_dynamic_restriction(token, client, schemas_simple):
         }
     )
     assert expected_json == json.dumps(REST_response.get_json(), sort_keys=True)
+
+
+def test_fetch_restriction(token, client, schemas_simple):
+    restriction = [{"attributeName": "a_id", "operation": "=", "value": 1}]
+    encoded = b64encode(json.dumps(restriction).encode("utf-8"))
+    REST_response = client.get(
+        f"/query1?restriction={encoded.decode()}",
+        headers=dict(Authorization=f"Bearer {token}"),
+    )
+    # should restrict in the query parameter by a_id=1
+    expected_json = json.dumps(
+        {
+            "recordHeader": ["a_id", "b_id", "a_name", "b_number"],
+            "records": [
+                [1, 21, "Bernie", 7.77],
+            ],
+            "totalCount": 1,
+        }
+    )
+    assert expected_json == json.dumps(REST_response.get_json(), sort_keys=True)