From 460f6ea66de921967f58643ab0ec29ad873eadb5 Mon Sep 17 00:00:00 2001
From: Alfredos-Panagiotis Damkalis <fredy@fredy.gr>
Date: Thu, 28 Nov 2019 16:46:40 +0200
Subject: [PATCH] Reduce SQL queries in user page

Signed-off-by: Alfredos-Panagiotis Damkalis <fredy@fredy.gr>
---
 network/templates/users/user_detail.html | 4 ++--
 network/users/views.py                   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/network/templates/users/user_detail.html b/network/templates/users/user_detail.html
index 44338fe..1e27b3f 100644
--- a/network/templates/users/user_detail.html
+++ b/network/templates/users/user_detail.html
@@ -42,7 +42,7 @@
             <th>Antennas</th>
           </thead>
           <tbody>
-            {% for station in stations.all %}
+            {% for station in stations %}
               <tr class="clickable-row" data-href="{% url 'base:station_view' station_id=station.id %}">
                 <td>
                   <a href="{% url 'base:station_view' station_id=station.id %}">
@@ -145,7 +145,7 @@
             <th>Station</th>
           </thead>
           <tbody>
-            {% for observation in observations.all %}
+            {% for observation in observations %}
               <tr class="clickable-row" data-href="{% url 'base:observation_view' observation_id=observation.id %}">
                 <td>
                   <a href="{% url 'base:observation_view' observation_id=observation.id %}">
diff --git a/network/users/views.py b/network/users/views.py
index 9d9c833..c2a1546 100644
--- a/network/users/views.py
+++ b/network/users/views.py
@@ -37,7 +37,9 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
 def view_user(request, username):
     """View for user page."""
     user = get_object_or_404(User, username=username)
-    observations = Observation.objects.filter(author=user)[0:10]
+    observations = Observation.objects.filter(
+        author=user
+    )[0:10].prefetch_related('satellite', 'ground_station')
     stations = Station.objects.filter(owner=user).annotate(total_obs=Count('observations'))
     token = ''