44963 fix(templates): fix N+1 error for GET /templates api

Author: pneumojoseph

backend/src/processes/querysets.py

@@ -315,16 +315,15 @@ def raw_list_query(
                                         Prefetch(
                                             lookup='selections',
                                             queryset=(
-                                                FieldTemplateSelection.
-                                                objects.only('value')
+                                                FieldTemplateSelection
+                                                .objects.order_by('id')
                                             ),
                                             to_attr='selections_values',
                                         ),
                                         Prefetch(
                                             'dataset__items',
                                             queryset=(
                                                 DatasetItem.objects
-                                                .only('value')
                                                 .order_by('order')
                                             ),
                                             to_attr='dataset_values',
@@ -388,15 +387,14 @@ def raw_list_by_owners_query(
                                             lookup='selections',
                                             queryset=(
                                                 FieldTemplateSelection
-                                                .objects.only('value')
+                                                .objects.order_by('id')
                                             ),
                                             to_attr='selections_values',
                                         ),
                                         Prefetch(
                                             'dataset__items',
                                             queryset=(
                                                 DatasetItem.objects
-                                                .only('value')
                                                 .order_by('order')
                                             ),
                                             to_attr='dataset_values',
@@ -693,21 +691,13 @@ def raw_list_query(
         if fields:
             from src.processes.models.workflows.fields import (
                 TaskField,
-                FieldSelection,
             )
             prefetch_args.append(
                 Prefetch(
                     lookup='fields',
                     to_attr='filtered_fields',
                     queryset=(
                         TaskField.objects
-                        .prefetch_related(
-                            Prefetch(
-                                'kickoff__output__selections',
-                                queryset=FieldSelection.objects.only('value'),
-                                to_attr='selections_values',
-                            ),
-                        )
                         .filter(api_name__in=fields)
                         .order_by('kickoff_id', 'task__number', '-order')
                     ),

backend/src/processes/serializers/workflows/workflow.py

@@ -408,16 +408,12 @@ def get_kickoff(self, instance: Workflow):
                     queryset=TaskField.objects.all().prefetch_related(
                         Prefetch(
                             lookup='selections',
-                            queryset=FieldSelection.objects.only('value'),
+                            queryset=FieldSelection.objects.order_by('id'),
                             to_attr='selections_values',
                         ),
                         Prefetch(
                             'dataset__items',
-                            queryset=(
-                                DatasetItem.objects
-                                .only('value')
-                                .order_by('order')
-                            ),
+                            queryset=DatasetItem.objects.order_by('order'),
                             to_attr='dataset_values',
                         ),
                     ),

backend/src/processes/views/task.py

@@ -272,16 +272,12 @@ def prefetch_queryset(
                 'output__attachments',
                 Prefetch(
                     'output__selections',
-                    queryset=FieldSelection.objects.only('value'),
+                    queryset=FieldSelection.objects.order_by('id'),
                     to_attr='selections_values',
                 ),
                 Prefetch(
                     'output__dataset__items',
-                    queryset=(
-                        DatasetItem.objects
-                        .only('value')
-                        .order_by('order')
-                    ),
+                    queryset=DatasetItem.objects.order_by('order'),
                     to_attr='dataset_values',
                 ),
             ).select_related(
@@ -523,16 +519,12 @@ def complete(self, request, *args, **kwargs):
                     queryset=TaskField.objects.all().prefetch_related(
                         Prefetch(
                             lookup='selections',
-                            queryset=FieldSelection.objects.only('value'),
+                            queryset=FieldSelection.objects.order_by('id'),
                             to_attr='selections_values',
                         ),
                         Prefetch(
                             'dataset__items',
-                            queryset=(
-                                DatasetItem.objects
-                                .only('value')
-                                .order_by('order')
-                            ),
+                            queryset=DatasetItem.objects.order_by('order'),
                             to_attr='dataset_values',
                         ),
                         'attachments',