Skip to content

Commit 1139507

Browse files
authored
Merge pull request #123 from HorizonXP/fix-batch-response-format
Remove payload key from response and stick to original format.
2 parents 335339c + f720912 commit 1139507

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

graphene_django/tests/test_views.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def test_batch_allows_post_with_json_encoding(client):
178178
assert response.status_code == 200
179179
assert response_json(response) == [{
180180
'id': 1,
181-
'payload': { 'data': {'test': "Hello World"} },
181+
'data': {'test': "Hello World"},
182182
'status': 200,
183183
}]
184184

@@ -233,7 +233,7 @@ def test_batch_supports_post_json_query_with_string_variables(client):
233233
assert response.status_code == 200
234234
assert response_json(response) == [{
235235
'id': 1,
236-
'payload': { 'data': {'test': "Hello Dolly"} },
236+
'data': {'test': "Hello Dolly"},
237237
'status': 200,
238238
}]
239239

@@ -260,7 +260,7 @@ def test_batch_supports_post_json_query_with_json_variables(client):
260260
assert response.status_code == 200
261261
assert response_json(response) == [{
262262
'id': 1,
263-
'payload': { 'data': {'test': "Hello Dolly"} },
263+
'data': {'test': "Hello Dolly"},
264264
'status': 200,
265265
}]
266266

@@ -356,11 +356,9 @@ def test_batch_allows_post_with_operation_name(client):
356356
assert response.status_code == 200
357357
assert response_json(response) == [{
358358
'id': 1,
359-
'payload': {
360-
'data': {
361-
'test': 'Hello World',
362-
'shared': 'Hello Everyone'
363-
}
359+
'data': {
360+
'test': 'Hello World',
361+
'shared': 'Hello Everyone'
364362
},
365363
'status': 200,
366364
}]

graphene_django/views.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,8 @@ def get_response(self, request, data, show_graphiql=False):
160160
response['data'] = execution_result.data
161161

162162
if self.batch:
163-
response = {
164-
'id': id,
165-
'payload': response,
166-
'status': status_code,
167-
}
163+
response['id'] = id
164+
response['status'] = status_code
168165

169166
result = self.json_encode(request, response, pretty=show_graphiql)
170167
else:

0 commit comments

Comments
 (0)