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

remove force get_json
datajoint · Dec 2, 2022 · c43e3fd · c43e3fd
2 parents 440a493 + 2f65ada
commit c43e3fd
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 46 deletions.
diff --git a/pharus/component_interface.py b/pharus/component_interface.py
@@ -129,12 +129,16 @@ 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,
         )
-        return NumpyEncoder.dumps(
-            dict(
-                recordHeader=record_header,
-                records=table_records,
-                totalCount=total_count,
-            )
+        return (
+            NumpyEncoder.dumps(
+                dict(
+                    recordHeader=record_header,
+                    records=table_records,
+                    totalCount=total_count,
+                )
+            ),
+            200,
+            {"Content-Type": "application/json"},
         )
 
 
@@ -299,23 +303,31 @@ def dj_query_route(self):
             order=request.args["order"].split(",") if "order" in request.args else None,
         )
 
-        return NumpyEncoder.dumps(
-            dict(
-                recordHeader=record_header,
-                records=table_records,
-                totalCount=total_count,
-            )
+        return (
+            NumpyEncoder.dumps(
+                dict(
+                    recordHeader=record_header,
+                    records=table_records,
+                    totalCount=total_count,
+                )
+            ),
+            200,
+            {"Content-Type": "application/json"},
         )
 
     def attributes_route(self):
         attributes_meta = _DJConnector._get_attributes(
             self.fetch_metadata["query"] & self.restriction, include_unique_values=True
         )
-        return NumpyEncoder.dumps(
-            dict(
-                attributeHeaders=attributes_meta["attribute_headers"],
-                attributes=attributes_meta["attributes"],
-            )
+        return (
+            NumpyEncoder.dumps(
+                dict(
+                    attributeHeaders=attributes_meta["attribute_headers"],
+                    attributes=attributes_meta["attributes"],
+                )
+            ),
+            200,
+            {"Content-Type": "application/json"},
         )
 
 
@@ -359,12 +371,16 @@ def dj_query_route(self):
             query=fetch_metadata["query"] & self.restriction,
             fetch_args=fetch_metadata["fetch_args"],
         )
-        return NumpyEncoder.dumps(
-            dict(
-                recordHeader=record_header,
-                records=table_records,
-                totalCount=total_count,
-            )
+        return (
+            NumpyEncoder.dumps(
+                dict(
+                    recordHeader=record_header,
+                    records=table_records,
+                    totalCount=total_count,
+                )
+            ),
+            200,
+            {"Content-Type": "application/json"},
         )
 
 
@@ -390,10 +406,14 @@ def __init__(self, *args, **kwargs):
 
     def dj_query_route(self):
         fetch_metadata = self.fetch_metadata
-        return NumpyEncoder.dumps(
-            (fetch_metadata["query"] & self.restriction).fetch1(
-                *fetch_metadata["fetch_args"]
-            )
+        return (
+            NumpyEncoder.dumps(
+                (fetch_metadata["query"] & self.restriction).fetch1(
+                    *fetch_metadata["fetch_args"]
+                )
+            ),
+            200,
+            {"Content-Type": "application/json"},
         )
 
 

diff --git a/tests/test_api_gen.py b/tests/test_api_gen.py
@@ -31,18 +31,10 @@ def test_auto_generated_route(token, client, schemas_simple):
         }
     )
 
-    assert expected_json == json.dumps(
-        REST_response1.get_json(force=True), sort_keys=True
-    )
-    assert expected_json == json.dumps(
-        REST_response2.get_json(force=True), sort_keys=True
-    )
-    assert expected_json == json.dumps(
-        REST_response3.get_json(force=True), sort_keys=True
-    )
-    assert expected_json == json.dumps(
-        REST_response4.get_json(force=True), sort_keys=True
-    )
+    assert expected_json == json.dumps(REST_response1.get_json(), sort_keys=True)
+    assert expected_json == json.dumps(REST_response2.get_json(), sort_keys=True)
+    assert expected_json == json.dumps(REST_response3.get_json(), sort_keys=True)
+    assert expected_json == json.dumps(REST_response4.get_json(), sort_keys=True)
 
 
 def test_get_full_plot(token, client, schemas_simple):
@@ -63,9 +55,7 @@ def test_get_full_plot(token, client, schemas_simple):
         ),
         sort_keys=True,
     )
-    assert expected_json == json.dumps(
-        REST_response1.get_json(force=True), sort_keys=True
-    )
+    assert expected_json == json.dumps(REST_response1.get_json(), sort_keys=True)
 
 
 def test_get_attributes(token, client, schemas_simple):
@@ -126,7 +116,7 @@ def test_get_attributes(token, client, schemas_simple):
         },
     }
 
-    assert expected_json == REST_response.get_json(force=True)
+    assert expected_json == REST_response.get_json()
 
 
 def test_dynamic_restriction(token, client, schemas_simple):
@@ -139,6 +129,4 @@ def test_dynamic_restriction(token, client, schemas_simple):
             "totalCount": 2,
         }
     )
-    assert expected_json == json.dumps(
-        REST_response.get_json(force=True), sort_keys=True
-    )
+    assert expected_json == json.dumps(REST_response.get_json(), sort_keys=True)