Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref(shared-views): Delete all usages of groupsearchview.position #87320

Merged
merged 1 commit into from
Mar 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/sentry/api/endpoints/organization_pinned_searches.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ def put(self, request: Request, organization) -> Response:
default_view, created = GroupSearchView.objects.create_or_update(
organization=organization,
user_id=request.user.id,
position=0,
values={
"name": "Default Search",
"query": result["query"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ def _update_existing_view(
gsv.name = view["name"]
gsv.query = view["query"]
gsv.query_sort = view["querySort"]
gsv.position = position
gsv.is_all_projects = view.get("isAllProjects", False)

if "projects" in view:
Expand Down Expand Up @@ -300,7 +299,6 @@ def _create_view(
name=view["name"],
query=view["query"],
query_sort=view["querySort"],
position=position,
is_all_projects=view.get("isAllProjects", False),
environments=view.get("environments", []),
time_filters=view.get("timeFilters", {"period": "14d"}),
Expand Down
4 changes: 0 additions & 4 deletions src/sentry/models/groupsearchview.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,3 @@ class Meta:
deferrable=models.Deferrable.DEFERRED,
)
]

@property
def is_default(self):
return self.position == 0
1 change: 0 additions & 1 deletion src/sentry/testutils/helpers/backups.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,6 @@ def create_exhaustive_organization(
organization=org,
query=f"some query for {slug}",
query_sort="date",
position=0,
)
GroupSearchViewProject.objects.create(
group_search_view=group_search_view,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def test(self):
user_id=self.member.id,
query=query,
query_sort=sort,
position=0,
)
assert GroupSearchViewStarred.objects.filter(
organization=self.organization,
Expand Down
3 changes: 0 additions & 3 deletions tests/sentry/deletions/test_organizationmember.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ def test_simple(self):
name="Custom View",
query="is:unresolved",
query_sort="date",
position=0,
)

self.ScheduledDeletion.schedule(instance=member, days=0)
Expand All @@ -41,7 +40,6 @@ def test_only_org_specific_views_deleted(self):
name="Custom View",
query="is:unresolved",
query_sort="date",
position=0,
)

custom_view_two = GroupSearchView.objects.create(
Expand All @@ -50,7 +48,6 @@ def test_only_org_specific_views_deleted(self):
name="Custom View",
query="is:unresolved",
query_sort="date",
position=0,
)

self.ScheduledDeletion.schedule(instance=member_one, days=0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2377,7 +2377,6 @@ def test_user_default_custom_view_query(self, _: MagicMock) -> None:
default_view = GroupSearchView.objects.create(
organization=self.organization,
user_id=self.user.id,
position=0,
name="Default View",
query="ZeroDivisionError",
query_sort="date",
Expand Down Expand Up @@ -2422,7 +2421,6 @@ def test_non_default_custom_view_query(self, _: MagicMock) -> None:
GroupSearchView.objects.create(
organization=self.organization,
user_id=self.user.id,
position=0,
name="Default View",
query="TypeError",
query_sort="date",
Expand All @@ -2431,7 +2429,6 @@ def test_non_default_custom_view_query(self, _: MagicMock) -> None:
view = GroupSearchView.objects.create(
organization=self.organization,
user_id=self.user.id,
position=1,
name="Custom View",
query="ZeroDivisionError",
query_sort="date",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def create_base_data(self) -> dict[str, list[GroupSearchView]]:
user_id=user_1.id,
query="is:unresolved",
query_sort="date",
position=0,
)
GroupSearchViewStarred.objects.create(
organization=self.organization,
Expand All @@ -59,7 +58,6 @@ def create_base_data(self) -> dict[str, list[GroupSearchView]]:
user_id=user_1.id,
query="is:ignored",
query_sort="freq",
position=2,
)
GroupSearchViewStarred.objects.create(
organization=self.organization,
Expand All @@ -74,7 +72,6 @@ def create_base_data(self) -> dict[str, list[GroupSearchView]]:
user_id=user_1.id,
query="is:resolved",
query_sort="new",
position=1,
)
GroupSearchViewStarred.objects.create(
organization=self.organization,
Expand All @@ -89,7 +86,6 @@ def create_base_data(self) -> dict[str, list[GroupSearchView]]:
user_id=self.user_2.id,
query="is:unresolved",
query_sort="date",
position=0,
)
GroupSearchViewStarred.objects.create(
organization=self.organization,
Expand All @@ -104,7 +100,6 @@ def create_base_data(self) -> dict[str, list[GroupSearchView]]:
user_id=self.user_2.id,
query="is:resolved",
query_sort="new",
position=1,
)
GroupSearchViewStarred.objects.create(
organization=self.organization,
Expand Down Expand Up @@ -500,7 +495,6 @@ def create_base_data_with_page_filters(self) -> list[GroupSearchView]:
user_id=user_1.id,
query="is:unresolved",
query_sort="date",
position=0,
time_filters={"period": "14d"},
environments=[],
)
Expand All @@ -518,7 +512,6 @@ def create_base_data_with_page_filters(self) -> list[GroupSearchView]:
user_id=user_1.id,
query="is:resolved",
query_sort="new",
position=1,
time_filters={"period": "7d"},
environments=["staging", "production"],
)
Expand All @@ -536,7 +529,6 @@ def create_base_data_with_page_filters(self) -> list[GroupSearchView]:
user_id=user_1.id,
query="is:ignored",
query_sort="freq",
position=2,
time_filters={"period": "30d"},
environments=["development"],
)
Expand Down Expand Up @@ -709,7 +701,6 @@ def test_invalid_project_ids(self) -> None:
user_id=self.user.id,
query="is:unresolved",
query_sort="date",
position=0,
time_filters={"period": "14d"},
environments=["production"],
)
Expand Down Expand Up @@ -777,7 +768,6 @@ def create_base_data_with_page_filters(self) -> None:
user_id=user_1.id,
query="is:unresolved",
query_sort="date",
position=0,
is_all_projects=False,
time_filters={"period": "14d"},
environments=[],
Expand All @@ -796,7 +786,6 @@ def create_base_data_with_page_filters(self) -> None:
user_id=user_1.id,
query="is:resolved",
query_sort="new",
position=1,
is_all_projects=False,
time_filters={"period": "7d"},
environments=["staging", "production"],
Expand All @@ -815,7 +804,6 @@ def create_base_data_with_page_filters(self) -> None:
user_id=user_1.id,
query="is:ignored",
query_sort="freq",
position=2,
is_all_projects=True,
time_filters={"period": "30d"},
environments=["development"],
Expand All @@ -834,7 +822,6 @@ def create_base_data_with_page_filters(self) -> None:
user_id=self.user_2.id,
query="is:unresolved",
query_sort="date",
position=0,
is_all_projects=False,
time_filters={"period": "14d"},
environments=[],
Expand All @@ -853,7 +840,6 @@ def create_base_data_with_page_filters(self) -> None:
user_id=self.user_4.id,
query="is:unresolved",
query_sort="date",
position=0,
is_all_projects=False,
time_filters={"period": "14d"},
environments=[],
Expand Down
4 changes: 0 additions & 4 deletions tests/sentry/models/test_groupsearchview.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ def test_create_views(self):
organization=org,
query="some query",
query_sort="date",
position=0,
)

GroupSearchView.objects.create(
Expand All @@ -22,9 +21,6 @@ def test_create_views(self):
organization=org,
query="some query #2",
query_sort="date",
position=1,
)

assert GroupSearchView.objects.filter(user_id=user.id).count() == 2
assert GroupSearchView.objects.filter(user_id=user.id, position=0).count() == 1
assert GroupSearchView.objects.filter(user_id=user.id, position=1).count() == 1
Loading