Skip to content

Commit 4941d96

Browse files
committed
Add API tests
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent c3d2aab commit 4941d96

2 files changed

Lines changed: 46 additions & 10 deletions

File tree

‎vulnerabilities/api_v3.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -889,17 +889,17 @@ def get_affected_advisories_bulk(packages, max_advisories, base_url, reachabilit
889889

890890

891891
def get_fixing_advisories_bulk(packages, max_advisories, base_url):
892-
package_ids = [p.id for p in packages]
892+
package_ids = []
893+
package_ids_with_multiple_importers = []
894+
packages_without_multiple_importers = []
893895

894-
package_ids_with_multiple_importers = PackageV2.objects.filter(
895-
type__in=TYPES_WITH_MULTIPLE_IMPORTERS, id__in=package_ids
896-
).values_list("id", flat=True)
896+
for p in packages:
897+
package_ids.append(p.id)
897898

898-
packages_without_multiple_importers = (
899-
PackageV2.objects.filter(id__in=package_ids)
900-
.exclude(id__in=package_ids_with_multiple_importers)
901-
.only("id", "package_url")
902-
)
899+
if p.type in TYPES_WITH_MULTIPLE_IMPORTERS:
900+
package_ids_with_multiple_importers.append(p.id)
901+
else:
902+
packages_without_multiple_importers.append(p)
903903

904904
advisory_sets = list(
905905
AdvisorySet.objects.filter(

‎vulnerabilities/tests/test_api_v3.py‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
from unittest.mock import patch
1111

12+
from django.core.cache import cache
1213
from django.urls import reverse
1314
from django.utils import timezone
1415
from packageurl import PackageURL
@@ -77,7 +78,7 @@ def test_packages_post_without_details(self):
7778
def test_packages_post_with_details(self):
7879
url = reverse("package-v3-list")
7980

80-
with self.assertNumQueries(12):
81+
with self.assertNumQueries(11):
8182
response = self.client.post(
8283
url,
8384
data={
@@ -481,3 +482,38 @@ def test_advisory_set_member_patches_aggregation(self):
481482
fixed_hashes = [patch["commit_hash"] for patch in advisory_data["fixed_in_patches"]]
482483
assert "98e516011d6e096e25247b82fc5f196bbeecff10" in fixed_hashes
483484
assert "2fc5f196bbeecff1098e516011d6e096e25247b8" in fixed_hashes
485+
486+
487+
class TestPackageTypesView(APITestCase):
488+
def test_returns_distinct_types_and_caches_response(self):
489+
cache.delete("package_types")
490+
491+
PackageV2.objects.create(
492+
package_url="pkg:npm/test1@1.0.0",
493+
plain_package_url="pkg:npm/test1",
494+
type="npm",
495+
name="test1",
496+
)
497+
498+
PackageV2.objects.create(
499+
package_url="pkg:npm/test2@1.0.0",
500+
plain_package_url="pkg:npm/test2",
501+
type="npm",
502+
name="test2",
503+
)
504+
505+
PackageV2.objects.create(
506+
package_url="pkg:pypi/test@1.0.0",
507+
plain_package_url="pkg:pypi/test",
508+
type="pypi",
509+
name="test",
510+
)
511+
512+
client = APIClient(enforce_csrf_checks=True)
513+
514+
response = client.get(reverse("package-types-list"))
515+
516+
assert response.status_code == 200
517+
assert response.json() == ["npm", "pypi"]
518+
519+
assert cache.get("package_types") == ["npm", "pypi"]

0 commit comments

Comments
 (0)