Skip to content
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
5 changes: 4 additions & 1 deletion src/sentry/api/serializers/models/groupsearchview.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from collections.abc import MutableMapping
from typing import Any, TypedDict

from django.db.models import prefetch_related_objects

from sentry.api.serializers import Serializer, register
from sentry.models.groupsearchview import GroupSearchView
from sentry.models.groupsearchviewlastvisited import GroupSearchViewLastVisited
Expand Down Expand Up @@ -33,6 +35,7 @@ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

def get_attrs(self, item_list, user, **kwargs) -> MutableMapping[Any, Any]:
prefetch_related_objects(item_list, "projects")
attrs: MutableMapping[Any, Any] = {}

last_visited_views = GroupSearchViewLastVisited.objects.filter(
Expand Down Expand Up @@ -68,7 +71,7 @@ def get_attrs(self, item_list, user, **kwargs) -> MutableMapping[Any, Any]:
return attrs

def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewSerializerResponse:
projects = [-1] if obj.is_all_projects else list(obj.projects.values_list("id", flat=True))
projects = [-1] if obj.is_all_projects else [p.id for p in obj.projects.all()]

return {
"id": str(obj.id),
Expand Down
16 changes: 8 additions & 8 deletions src/sentry/api/serializers/models/groupsearchviewstarred.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from sentry.api.serializers import Serializer, register, serialize
from sentry.api.serializers.models.groupsearchview import (
GroupSearchViewSerializer,
GroupSearchViewSerializerResponse,
)
from sentry.models.groupsearchviewstarred import GroupSearchViewStarred
from sentry.models.savedsearch import SORT_LITERALS
Expand All @@ -28,13 +27,14 @@ def __init__(self, *args, **kwargs):
self.organization = kwargs.pop("organization", None)
super().__init__(*args, **kwargs)

def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewStarredSerializerResponse:
serialized_view: GroupSearchViewSerializerResponse = serialize(
obj.group_search_view,
def get_attrs(self, item_list, user, **kwargs):
views = [item.group_search_view for item in item_list]
serialized_views = serialize(
views,
user,
serializer=GroupSearchViewSerializer(
organization=self.organization,
),
serializer=GroupSearchViewSerializer(organization=self.organization),
)
return dict(zip(item_list, serialized_views))

return serialized_view
def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewStarredSerializerResponse:
return attrs
Loading