Skip to content

Fix per-assessment n+1 query issue #2763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
szabozoltan69 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix per-assessment n+1 query issue #2763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 32 additions & 2 deletions per/drf_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,15 +690,45 @@ class FormAssessmentViewSet(viewsets.ModelViewSet):
ordering_fields = "__all__"

def get_queryset(self):
return PerAssessment.objects.select_related("overview")
return PerAssessment.objects.select_related("overview", "overview__country").prefetch_related(
Prefetch(
"area_responses",
queryset=AreaResponse.objects.select_related("area").prefetch_related(
Prefetch(
"component_response",
queryset=FormComponentResponse.objects.select_related("component", "rating").prefetch_related(
Prefetch(
"question_responses",
queryset=FormComponentQuestionAndAnswer.objects.select_related("question"),
)
),
)
),
)
)


class PublicFormAssessmentViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = PublicPerAssessmentSerializer
ordering_fields = "__all__"

def get_queryset(self):
return PerAssessment.objects.select_related("overview")
return PerAssessment.objects.select_related("overview", "overview__country").prefetch_related(
Prefetch(
"area_responses",
queryset=AreaResponse.objects.select_related("area").prefetch_related(
Prefetch(
"component_response",
queryset=FormComponentResponse.objects.select_related("component", "rating").prefetch_related(
Prefetch(
"question_responses",
queryset=FormComponentQuestionAndAnswer.objects.select_related("question"),
)
),
)
),
)
)


# Consolidated public endpoints (map-data, assessments-processed, dashboard-data)
Expand Down
7 changes: 7 additions & 0 deletions per/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,13 @@ class PerAssessmentSerializer(
):
area_responses = AreaResponseSerializer(many=True, required=False)

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
overview_field = self.fields.get("overview")
if overview_field is not None and hasattr(overview_field, "queryset"):
# Avoid N+1 in overview choice labels, since Overview.__str__ touches country.
overview_field.queryset = Overview.objects.select_related("country")

class Meta:
model = PerAssessment
fields = "__all__"
Expand Down
Loading