# Which issue(s) this PR fixes Closes https://github.com/grafana/support-escalations/issues/8143 Fix a few minor issues introduced in #3128: - Fix slow `GET /users` internal API endpoint related to [this change](https://github.com/grafana/oncall/blob/dev/engine/apps/api/views/user.py#L239) - Fix slow `GET /teams` internal API endpoint. Introduced a `short` query parameter that only invokes `apps.schedules.ical_utils.get_oncall_users_for_multiple_schedules` when `short=false`. - Order results from `GET /teams` internal API endpoint by name (ascending) - Fix search issue when searching for teams in the add responders popup window (this was strictly a frontend issue) - CSS changes to add responders dropdown to fix lonnnggg results list: **Before** <img width="377" alt="Screenshot 2023-10-31 at 10 06 20" src="https://github.com/grafana/oncall/assets/9406895/246c7c3b-7bea-44a1-afec-a38144c2c2d1"> **After** <img width="444" alt="Screenshot 2023-10-31 at 10 48 12" src="https://github.com/grafana/oncall/assets/9406895/b5602a22-c691-4dc7-bd3d-e4d6b76d04a0"> ## Still todo The `apps.schedules.ical_utils.get_oncall_users_for_multiple_schedules` method is still very slow when an instance has a lot of users (ex. `ops`). Ideally we should refactor this method to be more efficient because we still need to call this method under some circumstances. Ex. to populate this dropdown when Direct Paging a user (note that it didn't finish loading here on `ops`): <img width="1037" alt="Screenshot 2023-10-30 at 18 14 59" src="https://github.com/grafana/oncall/assets/9406895/9d91a57c-5db8-4ff9-862a-cd3755f52690"> ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)
83 lines
3.7 KiB
Python
83 lines
3.7 KiB
Python
from django.utils.functional import cached_property
|
|
from rest_framework import mixins, viewsets
|
|
from rest_framework.filters import SearchFilter
|
|
from rest_framework.permissions import IsAuthenticated
|
|
from rest_framework.response import Response
|
|
|
|
from apps.alerts.paging import integration_is_notifiable
|
|
from apps.api.permissions import RBACPermission
|
|
from apps.api.serializers.team import TeamLongSerializer, TeamSerializer
|
|
from apps.auth_token.auth import PluginAuthentication
|
|
from apps.mobile_app.auth import MobileAppAuthTokenAuthentication
|
|
from apps.schedules.ical_utils import get_oncall_users_for_multiple_schedules
|
|
from apps.user_management.models import Team
|
|
from common.api_helpers.mixins import PublicPrimaryKeyMixin
|
|
|
|
|
|
class TeamViewSet(PublicPrimaryKeyMixin, mixins.ListModelMixin, mixins.UpdateModelMixin, viewsets.GenericViewSet):
|
|
authentication_classes = (
|
|
MobileAppAuthTokenAuthentication,
|
|
PluginAuthentication,
|
|
)
|
|
permission_classes = (IsAuthenticated, RBACPermission)
|
|
rbac_permissions = {
|
|
"list": [RBACPermission.Permissions.OTHER_SETTINGS_READ],
|
|
"retrieve": [RBACPermission.Permissions.OTHER_SETTINGS_READ],
|
|
"update": [RBACPermission.Permissions.OTHER_SETTINGS_WRITE],
|
|
}
|
|
|
|
serializer_class = TeamSerializer
|
|
filter_backends = [SearchFilter]
|
|
search_fields = ["name"]
|
|
|
|
def get_queryset(self):
|
|
return self.request.user.available_teams
|
|
|
|
def _is_long_request(self) -> bool:
|
|
return self.request.query_params.get("short", "true").lower() == "false"
|
|
|
|
@cached_property
|
|
def schedules_with_oncall_users(self):
|
|
"""
|
|
The result of this method is cached and is reused for the whole lifetime of a request,
|
|
since self.get_serializer_context() is called multiple times for every instance in the queryset.
|
|
"""
|
|
team_ids = [t.id for t in self.filter_queryset(self.get_queryset())]
|
|
team_schedules = self.request.user.organization.oncall_schedules.filter(team__id__in=team_ids)
|
|
return get_oncall_users_for_multiple_schedules(team_schedules)
|
|
|
|
def get_serializer_context(self):
|
|
context = super().get_serializer_context()
|
|
context.update(
|
|
{"schedules_with_oncall_users": self.schedules_with_oncall_users if self._is_long_request() else {}}
|
|
)
|
|
return context
|
|
|
|
def get_serializer_class(self):
|
|
return TeamLongSerializer if self._is_long_request() else TeamSerializer
|
|
|
|
def list(self, request, *args, **kwargs):
|
|
general_team = [Team(public_primary_key="null", name="No team", email=None, avatar_url=None)]
|
|
queryset = self.filter_queryset(self.get_queryset())
|
|
|
|
if self.request.query_params.get("only_include_notifiable_teams", "false") == "true":
|
|
# filters down to only teams that have a direct paging integration that is "notifiable"
|
|
orgs_direct_paging_integrations = self.request.user.organization.get_direct_paging_integrations()
|
|
notifiable_direct_paging_integrations = [
|
|
i for i in orgs_direct_paging_integrations if integration_is_notifiable(i)
|
|
]
|
|
team_ids = [i.team.pk for i in notifiable_direct_paging_integrations if i.team is not None]
|
|
|
|
queryset = queryset.filter(pk__in=team_ids)
|
|
|
|
queryset = queryset.order_by("name")
|
|
|
|
teams = list(queryset)
|
|
if self.request.query_params.get("include_no_team", "true") != "false":
|
|
# Adds general team to the queryset in a way that it always shows up first (even when not searched for).
|
|
queryset = general_team + teams
|
|
else:
|
|
queryset = teams
|
|
|
|
serializer = self.get_serializer(queryset, many=True)
|
|
return Response(serializer.data)
|