add package updates list view with table, filters, and nav entry

- add PackageUpdateTable with installed/available package links and security badges
- add package_update_list view with security type and search filters
- add /packages/updates/ url route
- add packages submenu in navbar (packages + updates)
- add 6 view tests

Author: furlongm

hosts/tables.py

@@ -22,12 +22,14 @@
 HOSTNAME_TEMPLATE = '<a href="{{ record.get_absolute_url }}">{{ record.hostname }}</a>'
 SEC_UPDATES_TEMPLATE = (
     '{% with count=record.get_num_security_updates %}'
-    '{% if count != 0 %}<span style="color:red">{{ count }}</span>{% else %}{% endif %}'
+    '{% if count != 0 %}<a href="{% url \'packages:package_update_list\' %}?host_id={{ record.id }}&security=true">'
+    '<span style="color:red">{{ count }}</span></a>{% endif %}'
     '{% endwith %}'
 )
 BUG_UPDATES_TEMPLATE = (
     '{% with count=record.get_num_bugfix_updates %}'
-    '{% if count != 0 %}<span style="color:orange">{{ count }}</span>{% else %}{% endif %}'
+    '{% if count != 0 %}<a href="{% url \'packages:package_update_list\' %}?host_id={{ record.id }}&security=false">'
+    '<span style="color:orange">{{ count }}</span></a>{% endif %}'
     '{% endwith %}'
 )
 AFFECTED_ERRATA_TEMPLATE = (

hosts/views.py

@@ -90,6 +90,9 @@ def host_list(request):
     if 'package' in request.GET:
         hosts = hosts.filter(packages__name__name=request.GET['package'])
 
+    if 'update_id' in request.GET:
+        hosts = hosts.filter(updates=request.GET['update_id'])
+
     if 'repo_id' in request.GET:
         hosts = hosts.filter(repos=request.GET['repo_id'])
 

packages/tables.py

@@ -14,7 +14,7 @@
 
 import django_tables2 as tables
 
-from packages.models import Package, PackageName
+from packages.models import Package, PackageName, PackageUpdate
 from util.tables import BaseTable
 
 PACKAGE_NAME_TEMPLATE = '<a href="{{ record.get_absolute_url }}">{{ record }}</a>'
@@ -118,3 +118,74 @@ class PackageNameTable(BaseTable):
     class Meta(BaseTable.Meta):
         model = PackageName
         fields = ('packagename_name', 'versions')
+
+
+UPDATE_OLD_TEMPLATE = (
+    '<a href="{% url \'packages:package_detail\' record.oldpackage.id %}">'
+    '{{ record.oldpackage }}</a>'
+)
+UPDATE_NEW_TEMPLATE = (
+    '<a href="{% url \'packages:package_detail\' record.newpackage.id %}">'
+    '{{ record.newpackage }}</a>'
+)
+UPDATE_HOSTS_TEMPLATE = (
+    '<a href="{% url \'hosts:host_list\' %}?update_id={{ record.id }}">'
+    '{{ record.host_count }}</a>'
+)
+UPDATE_AFFECTED_TEMPLATE = (
+    '<a href="{% url \'errata:erratum_list\' %}?package_id={{ record.oldpackage.id }}&type=affected">'
+    '{{ record.affected_count }}</a>'
+)
+UPDATE_FIXED_TEMPLATE = (
+    '<a href="{% url \'errata:erratum_list\' %}?package_id={{ record.newpackage.id }}&type=fixed">'
+    '{{ record.fixed_count }}</a>'
+)
+
+
+UPDATE_TYPE_TEMPLATE = (
+    '{% if record.security %}'
+    '<span class="label label-danger">Security</span>'
+    '{% else %}'
+    '<span class="label label-info">Bugfix</span>'
+    '{% endif %}'
+)
+
+
+class PackageUpdateTable(BaseTable):
+    oldpackage = tables.TemplateColumn(
+        UPDATE_OLD_TEMPLATE,
+        verbose_name='Installed',
+        attrs={'th': {'class': 'col-sm-3'}, 'td': {'class': 'col-sm-3'}},
+    )
+    newpackage = tables.TemplateColumn(
+        UPDATE_NEW_TEMPLATE,
+        verbose_name='Available',
+        attrs={'th': {'class': 'col-sm-3'}, 'td': {'class': 'col-sm-3'}},
+    )
+    security = tables.TemplateColumn(
+        UPDATE_TYPE_TEMPLATE,
+        verbose_name='Type',
+        attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}},
+    )
+    hosts = tables.TemplateColumn(
+        UPDATE_HOSTS_TEMPLATE,
+        verbose_name='Hosts',
+        order_by='host_count',
+        attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}},
+    )
+    affected = tables.TemplateColumn(
+        UPDATE_AFFECTED_TEMPLATE,
+        verbose_name='Affected by Errata',
+        order_by='affected_count',
+        attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}},
+    )
+    fixed = tables.TemplateColumn(
+        UPDATE_FIXED_TEMPLATE,
+        verbose_name='Fixed in Errata',
+        order_by='fixed_count',
+        attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}},
+    )
+
+    class Meta(BaseTable.Meta):
+        model = PackageUpdate
+        fields = ('oldpackage', 'newpackage', 'security', 'hosts', 'affected', 'fixed')

packages/templates/packages/package_update_list.html

@@ -0,0 +1,7 @@
+{% extends "objectlist.html" %}
+
+{% block page_title %}Package Updates{% endblock %}
+
+{% block breadcrumbs %} {{ block.super }} <li class="active"><a href="{% url 'packages:package_update_list' %}">Package Updates</a></li>{% endblock %}
+
+{% block content_title %} Package Updates {% endblock %}

packages/tests/test_views.py

@@ -0,0 +1,72 @@
+from django.contrib.auth.models import User
+from django.test import TestCase, override_settings
+from django.urls import reverse
+
+from arch.models import PackageArchitecture
+from packages.models import Package, PackageName, PackageUpdate
+
+
+@override_settings(
+    CELERY_TASK_ALWAYS_EAGER=True,
+    CACHES={'default': {'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'}}
+)
+class PackageUpdateViewTests(TestCase):
+
+    def setUp(self):
+        self.user = User.objects.create_user(
+            username='testuser', password='testpass'
+        )
+        self.client.login(username='testuser', password='testpass')
+        self.arch = PackageArchitecture.objects.create(name='x86_64')
+        self.name = PackageName.objects.create(name='openssl')
+        self.old = Package.objects.create(
+            name=self.name, arch=self.arch, epoch='',
+            version='1.1.1', release='1', packagetype='R',
+        )
+        self.new = Package.objects.create(
+            name=self.name, arch=self.arch, epoch='',
+            version='1.1.2', release='1', packagetype='R',
+        )
+        self.sec_update = PackageUpdate.objects.create(
+            oldpackage=self.old, newpackage=self.new, security=True,
+        )
+        self.bug_update = PackageUpdate.objects.create(
+            oldpackage=self.old, newpackage=self.new, security=False,
+        )
+
+    def test_update_list(self):
+        resp = self.client.get(reverse('packages:package_update_list'))
+        self.assertEqual(resp.status_code, 200)
+        self.assertContains(resp, 'openssl')
+
+    def test_update_list_filter_security(self):
+        resp = self.client.get(
+            reverse('packages:package_update_list'), {'security': 'true'}
+        )
+        self.assertEqual(resp.status_code, 200)
+        self.assertContains(resp, 'Security')
+
+    def test_update_list_filter_bugfix(self):
+        resp = self.client.get(
+            reverse('packages:package_update_list'), {'security': 'false'}
+        )
+        self.assertEqual(resp.status_code, 200)
+        self.assertContains(resp, 'Bugfix')
+
+    def test_update_list_search(self):
+        resp = self.client.get(
+            reverse('packages:package_update_list'), {'search': 'openssl'}
+        )
+        self.assertEqual(resp.status_code, 200)
+        self.assertContains(resp, 'openssl')
+
+    def test_update_list_search_no_results(self):
+        resp = self.client.get(
+            reverse('packages:package_update_list'), {'search': 'nonexistent'}
+        )
+        self.assertEqual(resp.status_code, 200)
+
+    def test_update_list_requires_login(self):
+        self.client.logout()
+        resp = self.client.get(reverse('packages:package_update_list'))
+        self.assertEqual(resp.status_code, 302)

packages/urls.py

@@ -27,4 +27,5 @@
     path('name/<str:packagename>/', views.package_name_detail, name='package_name_detail'),
     path('id/', views.package_list, name='package_list'),
     path('id/<int:package_id>/', views.package_detail, name='package_detail'),
+    path('updates/', views.package_update_list, name='package_update_list'),
 ]

packages/views.py

@@ -16,7 +16,7 @@
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 from django.contrib.auth.decorators import login_required
-from django.db.models import Q
+from django.db.models import Count, Q
 from django.shortcuts import get_object_or_404, render
 from django_tables2 import RequestConfig
 from rest_framework import viewsets
@@ -26,7 +26,7 @@
 from packages.serializers import (
     PackageNameSerializer, PackageSerializer, PackageUpdateSerializer,
 )
-from packages.tables import PackageNameTable, PackageTable
+from packages.tables import PackageNameTable, PackageTable, PackageUpdateTable
 from util.filterspecs import Filter, FilterBar
 
 
@@ -172,6 +172,48 @@ def package_name_detail(request, packagename):
                    'allversions': allversions})
 
 
+@login_required
+def package_update_list(request):
+    updates = PackageUpdate.objects.select_related(
+        'oldpackage__name', 'oldpackage__arch',
+        'newpackage__name', 'newpackage__arch',
+    ).annotate(
+        host_count=Count('host', distinct=True),
+        affected_count=Count('oldpackage__affected_by_erratum', distinct=True),
+        fixed_count=Count('newpackage__provides_fix_in_erratum', distinct=True),
+    )
+
+    if 'security' in request.GET:
+        security = request.GET['security'] == 'true'
+        updates = updates.filter(security=security)
+    if 'host_id' in request.GET:
+        updates = updates.filter(host=request.GET['host_id'])
+    if 'search' in request.GET:
+        terms = request.GET['search'].lower()
+        query = Q()
+        for term in terms.split(' '):
+            q = (Q(oldpackage__name__name__icontains=term) |
+                 Q(newpackage__name__name__icontains=term))
+            query = query & q
+        updates = updates.filter(query)
+    else:
+        terms = ''
+
+    filter_list = []
+    filter_list.append(Filter(request, 'Type', 'security',
+                              {'true': 'Security', 'false': 'Bugfix'}))
+    filter_bar = FilterBar(request, filter_list)
+
+    table = PackageUpdateTable(updates.distinct())
+    RequestConfig(request, paginate={'per_page': 50}).configure(table)
+
+    return render(request,
+                  'packages/package_update_list.html',
+                  {'table': table,
+                   'filter_bar': filter_bar,
+                   'terms': terms})
+
+
 class PackageNameViewSet(viewsets.ModelViewSet):
     """
     API endpoint that allows package names to be viewed or edited.

util/templates/navbar.html

@@ -12,7 +12,13 @@
             <li><a href="{% url 'repos:mirror_list' %}">Mirrors</a></li>
           </ul>
         </li>
-        <li class="{% if '/packages' in request.path %}active{% endif %}"><a href="{% url 'packages:package_name_list' %}">Packages</a></li>
+        <li class="has-submenu open {% if '/packages' in request.path %}active{% endif %}">
+          <a href="#">Packages <span class="caret"></span></a>
+          <ul class="submenu">
+            <li><a href="{% url 'packages:package_name_list' %}">Packages</a></li>
+            <li><a href="{% url 'packages:package_update_list' %}">Updates</a></li>
+          </ul>
+        </li>
         <li class="{% if '/errata' in request.path %}active{% endif %}"><a href="{% url 'errata:erratum_list' %}">Errata</a></li>
         <li class="has-submenu open {% if '/cves' in request.path or '/cwes' in request.path or '/references' in request.path or '/security' in request.path %}active{% endif %}">
           <a href="#">Security <span class="caret"></span></a>