Skip to content

Commit ed5a470

Browse files
author
Inessa Druzhkova
committed
replaced status code using rest_framework, improved code
1 parent 4f2acfc commit ed5a470

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

src/django/api/exceptions.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
from rest_framework.exceptions import APIException
2+
from rest_framework import status
23

34

45
class BadRequestException(APIException):
5-
status_code = 400
6+
status_code = status.HTTP_400_BAD_REQUEST
67
default_detail = 'Bad request'
78
default_code = 'bad_request'
89

910

1011
class ServiceUnavailableException(APIException):
11-
status_code = 503
12+
status_code = status.HTTP_503_SERVICE_UNAVAILABLE
1213
default_detail = 'Service is temporarily unavailable due to maintenance \
1314
work. Please try again later.'
1415
default_code = 'service_unavailable'

src/django/api/tests/test_facility_list_create.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,11 @@ def test_no_upload_when_disable_list_uploading_switch_active(self):
266266
self.assertEqual(response.status_code,
267267
status.HTTP_503_SERVICE_UNAVAILABLE)
268268

269-
result = ["".join(json.loads(response.content)['detail'])]
270-
# Collapse multiple spaces into one
271-
expected = [re.sub(r"\s+", " ", item) for item in expected]
272-
stringResult = [re.sub(r"\s+", " ", item) for item in result]
273-
269+
error_message = json.loads(response.content)['detail']
270+
expected_message = " ".join(expected[0].split())
274271
self.assertEqual(
275-
stringResult,
276-
expected,
272+
" ".join(error_message.split()),
273+
expected_message
277274
)
278275
self.assertEqual(
279276
FacilityList.objects.all().count(), previous_list_count

0 commit comments

Comments
 (0)