From 22707304076689a92d3dba32128d1fad85f20ea6 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 23 Jan 2023 20:55:07 -0600 Subject: [PATCH] Optimize a query --- judge/views/organization.py | 2 +- judge/views/submission.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/judge/views/organization.py b/judge/views/organization.py index af06ee4..051fe7a 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -477,7 +477,7 @@ class OrganizationSubmissions( return ( super() ._get_entire_queryset() - .filter(user__organizations=self.organization, problem__in=problems) + .filter(user__in=self.organization.members.all(), problem__in=problems) ) def get_context_data(self, **kwargs): diff --git a/judge/views/submission.py b/judge/views/submission.py index 9f30fb2..e2a091b 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -420,7 +420,8 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): self.request, self.request.organization ) queryset = queryset.filter( - user__organizations=self.request.organization, problem__in=problems + user__in=self.request.organization.members.all(), + problem__in=problems, ) join_sql_subquery( queryset,