diff --git a/src/sentry/issues/endpoints/group_details.py b/src/sentry/issues/endpoints/group_details.py index 4c4af429607c..3f5d8241be76 100644 --- a/src/sentry/issues/endpoints/group_details.py +++ b/src/sentry/issues/endpoints/group_details.py @@ -451,7 +451,6 @@ def put( are modified. """ try: - discard = request.data.get("discard") project = group.project search_fn = functools.partial(prep_search, request, project) response = update_groups_with_search_fn( @@ -460,7 +459,7 @@ def put( # if action was discard, there isn't a group to serialize anymore # if response isn't 200, return the response update_groups gave us (i.e. helpful error) # instead of serializing the updated group - if discard or response.status_code != 200: + if response.status_code != 200 or request.data.get("discard"): return response # we need to fetch the object against as the bulk mutation endpoint diff --git a/tests/sentry/issues/endpoints/test_group_details.py b/tests/sentry/issues/endpoints/test_group_details.py index d5ba7a370386..716800fa4bc8 100644 --- a/tests/sentry/issues/endpoints/test_group_details.py +++ b/tests/sentry/issues/endpoints/test_group_details.py @@ -739,6 +739,37 @@ def test_read_path_checks_killswitch(self, mock_logger: mock.MagicMock) -> None: class GroupUpdateTest(APITestCase): + def test_invalid_request_body(self) -> None: + self.login_as(user=self.user) + group = self.create_group() + + for url in ( + f"/api/0/issues/{group.id}/", + f"/api/0/organizations/{group.organization.slug}/issues/{group.id}/", + ): + for data in ("null", "[]", '"invalid"', "0", "false"): + response = self.client.put(url, data=data, content_type="application/json") + + assert response.status_code == 400, response.content + assert "non_field_errors" in response.data + group.refresh_from_db() + assert group.status == GroupStatus.UNRESOLVED + + def test_empty_request_body(self) -> None: + self.login_as(user=self.user) + group = self.create_group() + + for url in ( + f"/api/0/issues/{group.id}/", + f"/api/0/organizations/{group.organization.slug}/issues/{group.id}/", + ): + for data in ("", "{}"): + response = self.client.put(url, data=data, content_type="application/json") + + assert response.status_code == 200, response.content + group.refresh_from_db() + assert group.status == GroupStatus.UNRESOLVED + def test_resolve(self) -> None: self.login_as(user=self.user)