diff --git a/src/projects/views.py b/src/projects/views.py index 773e295..14eee27 100644 --- a/src/projects/views.py +++ b/src/projects/views.py @@ -36,8 +36,12 @@ class ProjectDetailView(generics.RetrieveUpdateDestroyAPIView): def get_queryset(self): user = self.request.user if user.is_superuser: - return Project.objects.all() - return Project.objects.filter(members=user).distinct() + return Project.objects.prefetch_related("members", "ticket_statuses") + return ( + Project.objects.filter(members=user) + .prefetch_related("members", "ticket_statuses") + .distinct() + ) class ProjectMemberListCreateView(generics.ListCreateAPIView): @@ -45,7 +49,9 @@ class ProjectMemberListCreateView(generics.ListCreateAPIView): permission_classes = (permissions.IsAuthenticated,) def get_queryset(self): - return ProjectMember.objects.filter(project_id=self.kwargs["project_pk"]) + return ProjectMember.objects.filter( + project_id=self.kwargs["project_pk"] + ).select_related("user") def perform_create(self, serializer): serializer.save(project_id=self.kwargs["project_pk"]) @@ -55,7 +61,9 @@ class ProjectMemberDestroyView(generics.DestroyAPIView): permission_classes = (permissions.IsAuthenticated,) def get_queryset(self): - return ProjectMember.objects.filter(project_id=self.kwargs["project_pk"]) + return ProjectMember.objects.filter( + project_id=self.kwargs["project_pk"] + ).select_related("user") def get_object(self): return self.get_queryset().get(user_id=self.kwargs["user_id"]) @@ -78,11 +86,14 @@ def project_stats_view(request, project_pk): else Project.objects.all(), pk=project_pk, ) - tickets = project.tickets.all() stats = { - "total_tickets": tickets.count(), - "open_tickets": tickets.exclude(status__is_completed=True).count(), - "completed_tickets": tickets.filter(status__is_completed=True).count(), + "total_tickets": Ticket.objects.filter(project=project).count(), + "open_tickets": Ticket.objects.filter( + project=project, status__is_completed=False + ).count(), + "completed_tickets": Ticket.objects.filter( + project=project, status__is_completed=True + ).count(), "total_members": project.members.count(), "total_epics": project.epics.count(), }