From fab0c9bf41d9751596c3920264e5f941dbe69c8f Mon Sep 17 00:00:00 2001 From: Sushil Tiwari Date: Mon, 13 Jan 2025 15:11:35 +0545 Subject: [PATCH] Fix status code and message --- local_units/test_views.py | 2 +- local_units/views.py | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/local_units/test_views.py b/local_units/test_views.py index bc3e2fb71..e1c2e809c 100644 --- a/local_units/test_views.py +++ b/local_units/test_views.py @@ -647,7 +647,7 @@ def test_latest_changes(self): self.assert_200(response) # Checking the latest changes - response = self.client.post(f"/api/v2/local-units/{local_unit_id}/latest-change-request/") + response = self.client.get(f"/api/v2/local-units/{local_unit_id}/latest-change-request/") self.assert_200(response) self.assertEqual(response.data["previous_data_details"]["local_branch_name"], previous_data["local_branch_name"]) self.assertEqual(response.data["previous_data_details"]["english_branch_name"], previous_data["english_branch_name"]) diff --git a/local_units/views.py b/local_units/views.py index 75a0f02d9..82c0e79bd 100644 --- a/local_units/views.py +++ b/local_units/views.py @@ -133,7 +133,10 @@ def get_validate(self, request, pk=None, version=None): ).last() if not change_request_instance: - return bad_request("No change request found to validate") + return response.Response( + {"message": "No change request found to validate"}, + status=status.HTTP_404_NOT_FOUND, + ) # Checking the validator type validator = Validator.LOCAL @@ -191,7 +194,10 @@ def get_revert(self, request, pk=None, version=None): ).last() if not change_request_instance: - return bad_request("No change request found to revert") + return response.Response( + {"message": "No change request found to revert"}, + status=status.HTTP_404_NOT_FOUND, + ) change_request_instance.status = LocalUnitChangeRequest.Status.REVERT change_request_instance.rejected_reason = reason @@ -237,7 +243,7 @@ def get_revert(self, request, pk=None, version=None): @action( detail=True, url_path="latest-change-request", - methods=["post"], + methods=["get"], serializer_class=LocalUnitChangeRequestSerializer, permission_classes=[permissions.IsAuthenticated, IsAuthenticatedForLocalUnit, DenyGuestUserPermission], ) @@ -249,7 +255,10 @@ def get_latest_changes(self, request, pk=None, version=None): ).last() if not change_request: - return bad_request("Last change request not found") + return response.Response( + {"message": "Last change request not found"}, + status=status.HTTP_404_NOT_FOUND, + ) serializer = LocalUnitChangeRequestSerializer(change_request, context={"request": request}) return response.Response(serializer.data)