Skip to content

Commit

Permalink
Remove unecessary delete. Improve testing
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelSun48 committed Feb 28, 2025
1 parent 6b13239 commit f56027d
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,6 @@ def _delete_missing_views(org: Organization, user_id: int, view_ids_to_keep: lis
id__in=view_ids_to_keep
).delete()

GroupSearchViewStarred.objects.filter(organization=org, user_id=user_id).exclude(
group_search_view__in=view_ids_to_keep
).delete()


def _update_existing_view(
org: Organization, user_id: int, view: GroupSearchViewValidatorResponse, position: int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ def test_deletes_missing_views(self) -> None:
views = self.client.get(self.url).data

update_custom_view_three = views[2]
# Store the ID of the view we're going to delete
deleted_view_id = views[1]["id"]

views.pop(1)
response = self.get_success_response(self.organization.slug, views=views)
Expand All @@ -192,6 +194,13 @@ def test_deletes_missing_views(self) -> None:
assert starred_views[idx].position == view["position"]
assert str(starred_views[idx].group_search_view.id) == view["id"]

# Verify that the deleted view is no longer in the starred table
assert not GroupSearchViewStarred.objects.filter(
organization=self.organization,
user_id=self.user.id,
group_search_view_id=deleted_view_id,
).exists()

@with_feature({"organizations:issue-stream-custom-views": True})
@with_feature({"organizations:global-views": True})
def test_adds_view_with_no_id(self) -> None:
Expand Down Expand Up @@ -299,6 +308,15 @@ def test_change_everything(self) -> None:
assert response.data[0]["query"] == "is:resolved"
assert response.data[0]["querySort"] == "freq"

starred_views = GroupSearchViewStarred.objects.filter(
organization=self.organization, user_id=self.user.id
)
assert len(starred_views) == len(response.data)
for idx, view in enumerate(response.data):
assert starred_views[idx].position == idx
assert starred_views[idx].position == view["position"]
assert str(starred_views[idx].group_search_view.id) == view["id"]

@with_feature({"organizations:issue-stream-custom-views": True})
@with_feature({"organizations:global-views": True})
def test_invalid_no_views(self) -> None:
Expand Down Expand Up @@ -378,6 +396,15 @@ def test_updated_deleted_view(self) -> None:
assert response.data[1]["querySort"] == view_one["querySort"]
assert are_views_equal(response.data[2], views[2])

starred_views = GroupSearchViewStarred.objects.filter(
organization=self.organization, user_id=self.user.id
)
assert len(starred_views) == len(response.data)
for idx, view in enumerate(response.data):
assert starred_views[idx].position == idx
assert starred_views[idx].position == view["position"]
assert str(starred_views[idx].group_search_view.id) == view["id"]


class OrganizationGroupSearchViewsWithPageFiltersPutTest(BaseGSVTestCase):
endpoint = "sentry-api-0-organization-group-search-views"
Expand Down

0 comments on commit f56027d

Please sign in to comment.