Merge pull request #123 from HorizonXP/fix-batch-response-format

Remove payload key from response and stick to original format.
graphql-python · Mar 5, 2017 · 1139507 · 1139507
2 parents 335339c + f720912
commit 1139507
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/graphene_django/tests/test_views.py b/graphene_django/tests/test_views.py
@@ -178,7 +178,7 @@ def test_batch_allows_post_with_json_encoding(client):
     assert response.status_code == 200
     assert response_json(response) == [{
         'id': 1,
-        'payload': { 'data': {'test': "Hello World"} },
+        'data': {'test': "Hello World"},
         'status': 200,
     }]
 
@@ -233,7 +233,7 @@ def test_batch_supports_post_json_query_with_string_variables(client):
     assert response.status_code == 200
     assert response_json(response) == [{
         'id': 1,
-        'payload': { 'data': {'test': "Hello Dolly"} },
+        'data': {'test': "Hello Dolly"},
         'status': 200,
     }]
 
@@ -260,7 +260,7 @@ def test_batch_supports_post_json_query_with_json_variables(client):
     assert response.status_code == 200
     assert response_json(response) == [{
         'id': 1,
-        'payload': { 'data': {'test': "Hello Dolly"} },
+        'data': {'test': "Hello Dolly"},
         'status': 200,
     }]
 
@@ -356,11 +356,9 @@ def test_batch_allows_post_with_operation_name(client):
     assert response.status_code == 200
     assert response_json(response) == [{
         'id': 1,
-        'payload': {
-            'data': {
-                'test': 'Hello World',
-                'shared': 'Hello Everyone'
-            }
+        'data': {
+            'test': 'Hello World',
+            'shared': 'Hello Everyone'
         },
         'status': 200,
     }]

diff --git a/graphene_django/views.py b/graphene_django/views.py
@@ -160,11 +160,8 @@ def get_response(self, request, data, show_graphiql=False):
                 response['data'] = execution_result.data
 
             if self.batch:
-                response = {
-                    'id': id,
-                    'payload': response,
-                    'status': status_code,
-                }
+                response['id'] = id
+                response['status'] = status_code
 
             result = self.json_encode(request, response, pretty=show_graphiql)
         else: