Merge pull request #1101 from TG1999/fix_package_detail_view

Use for_purl instead of for_package_url in package detail view

Author: pombredanne

vulnerabilities/tests/test_view.py

@@ -14,6 +14,7 @@
 from vulnerabilities.models import Alias
 from vulnerabilities.models import Package
 from vulnerabilities.models import Vulnerability
+from vulnerabilities.views import PackageDetails
 from vulnerabilities.views import PackageSearch
 
 
@@ -34,6 +35,7 @@ def setUp(self):
             "pkg:nginx/[email protected]",
             "pkg:nginx/[email protected]",
             "pkg:nginx/[email protected]",
+            "pkg:nginx/[email protected]?foo=bar",
             "pkg:pypi/foo@1",
         ]
         self.packages = packages
@@ -55,9 +57,13 @@ def test_packages_search_view_paginator(self):
     def test_package_view(self):
         qs = PackageSearch().get_queryset(query="pkg:nginx/[email protected]?foo=bar")
         pkgs = list(qs)
-        self.assertEqual(len(pkgs), 1)
+        self.assertEqual(len(pkgs), 2)
         self.assertEqual(pkgs[0].purl, "pkg:nginx/[email protected]")
 
+    def test_package_detail_view(self):
+        package = PackageDetails(kwargs={"purl": "pkg:nginx/[email protected]"}).get_object()
+        assert package.purl == "pkg:nginx/[email protected]"
+
     def test_package_view_with_purl_fragment(self):
         qs = PackageSearch().get_queryset(query="[email protected]")
         pkgs = list(qs)
@@ -82,6 +88,7 @@ def test_package_view_with_purl_fragment(self):
             "pkg:nginx/[email protected]",
             "pkg:nginx/[email protected]",
             "pkg:nginx/[email protected]",
+            "pkg:nginx/[email protected]?foo=bar",
         ]
 
     def test_package_view_with_valid_purl_without_version(self):
@@ -102,6 +109,7 @@ def test_package_view_with_valid_purl_without_version(self):
             "pkg:nginx/[email protected]",
             "pkg:nginx/[email protected]",
             "pkg:nginx/[email protected]",
+            "pkg:nginx/[email protected]?foo=bar",
         ]
 
     def test_package_view_with_valid_purl_and_incomplete_version(self):
@@ -121,6 +129,7 @@ def test_package_view_with_valid_purl_and_incomplete_version(self):
             "pkg:nginx/[email protected]",
             "pkg:nginx/[email protected]",
             "pkg:nginx/[email protected]",
+            "pkg:nginx/[email protected]?foo=bar",
         ]
 
     def test_package_view_with_purl_type(self):

vulnerabilities/views.py

@@ -91,7 +91,7 @@ def get_object(self, queryset=None):
 
         purl = self.kwargs.get(self.slug_url_kwarg)
         if purl:
-            queryset = queryset.for_package_url(purl_str=purl, encode=False)
+            queryset = queryset.for_purl(purl)
         else:
             cls = self.__class__.__name__
             raise AttributeError(