diff options
| author |  Xithrius <[email protected]> | 2024-02-03 00:50:43 -0800 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2024-02-03 00:50:43 -0800 |
| commit | ad2410ef24e97742bc22f0d8775a0f37a5bf2db5 (patch) | |
| tree | cce3c380e6b695d11dcb65ee65411f6f654e2be3 /pydis_site/apps/api/viewsets | |
| parent | Migrate mailing lists to their own API endpoints (diff) | |
| parent | Merge pull request #1220 from python-discord/dependabot/pip/ruff-0.2.0 (diff) | |
Merge branch 'main' into mailing-list-model
Diffstat (limited to 'pydis_site/apps/api/viewsets')
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/infraction.py | 6 | ||||
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/nomination.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pydis_site/apps/api/viewsets/bot/infraction.py b/pydis_site/apps/api/viewsets/bot/infraction.py index 09c05a74..8da82822 100644 --- a/pydis_site/apps/api/viewsets/bot/infraction.py +++ b/pydis_site/apps/api/viewsets/bot/infraction.py @@ -230,7 +230,11 @@ class InfractionViewSet( }) additional_filters['type__in'] = [i.strip() for i in filter_types.split(",")] - return self.queryset.filter(**additional_filters) + qs = self.queryset.filter(**additional_filters) + if self.serializer_class is ExpandedInfractionSerializer: + return qs.prefetch_related('actor', 'user') + + return qs @action(url_path='expanded', detail=False) def list_expanded(self, *args, **kwargs) -> Response: diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py index 953513e0..d083464c 100644 --- a/pydis_site/apps/api/viewsets/bot/nomination.py +++ b/pydis_site/apps/api/viewsets/bot/nomination.py @@ -170,7 +170,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge """ serializer_class = NominationSerializer - queryset = Nomination.objects.all() + queryset = Nomination.objects.all().prefetch_related('entries') filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter) filterset_fields = ('user__id', 'active') frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at', 'reviewed') |