Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion assets
Submodule assets updated 0 files
44 changes: 42 additions & 2 deletions per/drf_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,27 @@ class PerProcessStatusViewSet(viewsets.ReadOnlyModelViewSet):
get_filtered_queryset = RegionRestrictedAdmin.get_filtered_queryset

def get_queryset(self):
queryset = Overview.objects.order_by("country", "-assessment_number", "-date_of_assessment")
queryset = (
Overview.objects.order_by("country", "-assessment_number", "-date_of_assessment")
.select_related("country", "country__region", "type_of_assessment")
.prefetch_related(
Prefetch(
"perassessment_set",
queryset=PerAssessment.objects.order_by("-id").only("id", "overview_id"),
to_attr="latest_perassessments",
),
Prefetch(
"formprioritization_set",
queryset=FormPrioritization.objects.order_by("-id").only("id", "overview_id"),
to_attr="latest_prioritizations",
),
Prefetch(
"perworkplan_set",
queryset=PerWorkPlan.objects.order_by("-id").only("id", "overview_id"),
to_attr="latest_workplans",
),
)
)
return self.get_filtered_queryset(self.request, queryset, dispatch=0)


Expand All @@ -640,7 +660,27 @@ class PublicPerProcessStatusViewSet(viewsets.ReadOnlyModelViewSet):
ordering_fields = "__all__"

def get_queryset(self):
return Overview.objects.order_by("country", "-assessment_number", "-date_of_assessment")
return (
Overview.objects.order_by("country", "-assessment_number", "-date_of_assessment")
.select_related("country", "country__region", "type_of_assessment")
.prefetch_related(
Prefetch(
"perassessment_set",
queryset=PerAssessment.objects.order_by("-id").only("id", "overview_id"),
to_attr="latest_perassessments",
),
Prefetch(
"formprioritization_set",
queryset=FormPrioritization.objects.order_by("-id").only("id", "overview_id"),
to_attr="latest_prioritizations",
),
Prefetch(
"perworkplan_set",
queryset=PerWorkPlan.objects.order_by("-id").only("id", "overview_id"),
to_attr="latest_workplans",
),
)
)


class FormAssessmentViewSet(viewsets.ModelViewSet):
Expand Down
Loading