Merge pull request #54 from LCOGT/feature/profile-queries

Prefetch for observations viewset

observation_portal/blocks/viewsets.py

@@ -38,7 +38,8 @@ def get_queryset(self):
             'request__configurations__acquisition_config',
             'request__configurations__guiding_config', 'request__configurations__constraints',
             'request__configurations__instrument_configs__rois', 'configuration_statuses',
-            'configuration_statuses__summary', 'request__request_group', 'request__request_group__proposal'
+            'configuration_statuses__summary', 'request__request_group', 'request__request_group__proposal',
+            'configuration_statuses__configuration', 'request__request_group__submitter'
         ).distinct()
 
     def perform_create(self, serializer):

observation_portal/observations/models.py

@@ -101,11 +101,7 @@ def as_dict(self, no_request=False):
 
     @property
     def instrument_types(self):
-        return set(
-            Configuration.objects.filter(
-                configuration_status__in=self.configuration_statuses.all()
-            ).values_list('instrument_type', flat=True)
-        )
+        return set(self.request.configurations.values_list('instrument_type', flat=True))
 
 
 class ConfigurationStatus(models.Model):

observation_portal/observations/templates/observations/observation_list.html

@@ -12,9 +12,10 @@
       {% bootstrap_pagination page_obj extra=request.GET.urlencode %}
     </span>
     {% endif %}
+    {% with last_update=filter.qs.first.modified %}
     <span class="float-right text-right">
-        {{ filter.qs.count }} observations<br/>
-        Last Update: <strong>{{ filter.qs.first.modified }}</strong>
+        {{ page_obj.paginator.count }} observations<br/>
+        Last Update: <strong>{{ last_update }}</strong>
     </span>
     <table class="table">
       <thead>
@@ -66,9 +67,10 @@
     </span>
     {% endif %}
     <span class="float-right text-right">
-      Last Update: <strong>{{ filter.qs.first.modified }}</strong><br/>
-      {{ filter.qs.count }} observations
+      Last Update: <strong>{{ last_update }}</strong><br/>
+      {{ page_obj.paginator.count }} observations
     </span>
+    {% endwith %}
   </div>
   <div class="col-md-2">
     <form class="form" method="GET" action="{% url 'observations:observation-list' %}">

observation_portal/observations/views.py

@@ -11,6 +11,7 @@
 from observation_portal.common.mixins import StaffRequiredMixin
 from observation_portal.common.configdb import configdb
 from observation_portal.observations.filters import ObservationFilter
+from observation_portal.observations.viewsets import observations_queryset
 
 
 class ObservationDetailView(StaffRequiredMixin, DetailView):
@@ -23,6 +24,7 @@ class ObservationListView(StaffRequiredMixin, FilterView):
     paginate_by = 50
     ordering = '-start'
     template_name = 'observations/observation_list.html'
+    queryset = observations_queryset()
 
     def get_filterset_kwargs(self, filterset_class):
         kwargs = super(ObservationListView, self).get_filterset_kwargs(filterset_class)

observation_portal/observations/viewsets.py

@@ -15,6 +15,18 @@
 from observation_portal.common.mixins import ListAsDictMixin, CreateListModelMixin
 
 
+def observations_queryset():
+    qs = Observation.objects.all()
+    return qs.prefetch_related('request', 'request__configurations', 'request__configurations__instrument_configs',
+                               'request__configurations__target', 'request__request_group__proposal',
+                               'request__configurations__acquisition_config', 'request__request_group',
+                               'request__configurations__guiding_config', 'request__configurations__constraints',
+                               'request__configurations__instrument_configs__rois',
+                               'configuration_statuses', 'configuration_statuses__summary',
+                               'configuration_statuses__configuration',
+                               'request__request_group__submitter').distinct()
+
+
 class ScheduleViewSet(ListAsDictMixin, CreateListModelMixin, viewsets.ModelViewSet):
     permission_classes = (IsAdminUser,)
     http_method_names = ['get', 'post', 'head', 'options']
@@ -30,16 +42,7 @@ def perform_create(self, serializer):
         serializer.save(submitter=self.request.user, submitter_id=self.request.user.id)
 
     def get_queryset(self):
-        qs = Observation.objects.all()
-        return qs.prefetch_related('request', 'request__configurations', 'request__configurations__instrument_configs',
-                                   'request__configurations__target', 'request__request_group__proposal',
-                                   'request__configurations__acquisition_config', 'request__request_group',
-                                   'request__configurations__guiding_config', 'request__configurations__constraints',
-                                   'request__configurations__instrument_configs__rois',
-                                   'configuration_statuses', 'configuration_statuses__summary',
-                                   'configuration_statuses__configuration',
-                                   'request__request_group__submitter').distinct()
-
+        return observations_queryset()
 
 class ObservationViewSet(CreateListModelMixin, ListAsDictMixin, viewsets.ModelViewSet):
     permission_classes = (IsAdminUser,)
@@ -53,8 +56,7 @@ class ObservationViewSet(CreateListModelMixin, ListAsDictMixin, viewsets.ModelVi
     ordering = ('-id',)
 
     def get_queryset(self):
-        qs = Observation.objects.all()
-        return qs.prefetch_related('request', 'request__request_group').distinct()
+        return observations_queryset()
 
     @action(detail=False, methods=['post'])
     def cancel(self, request):