|
12 | 12 |
|
13 | 13 | from django.contrib.postgres.aggregates import ArrayAgg |
14 | 14 | from django.core.cache import cache |
| 15 | +from django.db.models import Count |
15 | 16 | from django.db.models import Exists |
16 | 17 | from django.db.models import F |
17 | 18 | from django.db.models import Max |
@@ -126,6 +127,7 @@ class AdvisoryV3Serializer(serializers.ModelSerializer): |
126 | 127 | severities = AdvisorySeveritySerializer(many=True) |
127 | 128 | advisory_uid = serializers.CharField(source="avid", read_only=True) |
128 | 129 | related_ssvc_trees = serializers.SerializerMethodField() |
| 130 | + todo_count = serializers.IntegerField(read_only=True) |
129 | 131 |
|
130 | 132 | def get_related_ssvc_trees(self, obj): |
131 | 133 | seen = set() |
@@ -165,6 +167,7 @@ class Meta: |
165 | 167 | "weighted_severity", |
166 | 168 | "risk_score", |
167 | 169 | "related_ssvc_trees", |
| 170 | + "todo_count", |
168 | 171 | ] |
169 | 172 |
|
170 | 173 |
|
@@ -396,51 +399,58 @@ def create(self, request, *args, **kwargs): |
396 | 399 |
|
397 | 400 | purls = serializer.validated_data["purls"] |
398 | 401 |
|
399 | | - latest_advisories = AdvisoryV2.objects.latest_advisories_for_purls( |
400 | | - purls=purls |
401 | | - ).prefetch_related( |
402 | | - Prefetch( |
403 | | - "references", |
404 | | - queryset=AdvisoryReference.objects.only( |
405 | | - "id", |
406 | | - "url", |
407 | | - "reference_type", |
408 | | - "reference_id", |
| 402 | + latest_advisories = ( |
| 403 | + AdvisoryV2.objects.latest_advisories_for_purls(purls=purls) |
| 404 | + .annotate( |
| 405 | + todo_count=Count( |
| 406 | + "advisory_todos", |
| 407 | + filter=Q(advisory_todos__is_todo_stale=False), |
| 408 | + ) |
| 409 | + ) |
| 410 | + .prefetch_related( |
| 411 | + Prefetch( |
| 412 | + "references", |
| 413 | + queryset=AdvisoryReference.objects.only( |
| 414 | + "id", |
| 415 | + "url", |
| 416 | + "reference_type", |
| 417 | + "reference_id", |
| 418 | + ), |
409 | 419 | ), |
410 | | - ), |
411 | | - Prefetch( |
412 | | - "severities", |
413 | | - queryset=AdvisorySeverity.objects.only( |
414 | | - "id", |
415 | | - "url", |
416 | | - "value", |
417 | | - "scoring_system", |
418 | | - "scoring_elements", |
419 | | - "published_at", |
| 420 | + Prefetch( |
| 421 | + "severities", |
| 422 | + queryset=AdvisorySeverity.objects.only( |
| 423 | + "id", |
| 424 | + "url", |
| 425 | + "value", |
| 426 | + "scoring_system", |
| 427 | + "scoring_elements", |
| 428 | + "published_at", |
| 429 | + ), |
420 | 430 | ), |
421 | | - ), |
422 | | - "weaknesses", |
423 | | - "aliases", |
424 | | - Prefetch( |
425 | | - "related_ssvcs", |
426 | | - queryset=SSVC.objects.only( |
427 | | - "id", |
428 | | - "vector", |
429 | | - "decision", |
430 | | - "options", |
431 | | - "source_advisory__url", |
| 431 | + "weaknesses", |
| 432 | + "aliases", |
| 433 | + Prefetch( |
| 434 | + "related_ssvcs", |
| 435 | + queryset=SSVC.objects.only( |
| 436 | + "id", |
| 437 | + "vector", |
| 438 | + "decision", |
| 439 | + "options", |
| 440 | + "source_advisory__url", |
| 441 | + ), |
432 | 442 | ), |
433 | | - ), |
434 | | - Prefetch( |
435 | | - "source_ssvcs", |
436 | | - queryset=SSVC.objects.only( |
437 | | - "id", |
438 | | - "vector", |
439 | | - "decision", |
440 | | - "options", |
441 | | - "source_advisory__url", |
| 443 | + Prefetch( |
| 444 | + "source_ssvcs", |
| 445 | + queryset=SSVC.objects.only( |
| 446 | + "id", |
| 447 | + "vector", |
| 448 | + "decision", |
| 449 | + "options", |
| 450 | + "source_advisory__url", |
| 451 | + ), |
442 | 452 | ), |
443 | | - ), |
| 453 | + ) |
444 | 454 | ) |
445 | 455 |
|
446 | 456 | page = self.paginate_queryset(latest_advisories) |
@@ -627,6 +637,10 @@ def get_affected_advisories_bulk(packages, max_advisories, base_url, reachabilit |
627 | 637 | max_exploitability=Max( |
628 | 638 | "members__advisory__exploitability", |
629 | 639 | ), |
| 640 | + todo_count=Count( |
| 641 | + "primary_advisory__advisory_todos", |
| 642 | + filter=Q(primary_advisory__advisory_todos__is_todo_stale=False), |
| 643 | + ), |
630 | 644 | ) |
631 | 645 | .only( |
632 | 646 | "id", |
@@ -772,6 +786,7 @@ def get_affected_advisories_bulk(packages, max_advisories, base_url, reachabilit |
772 | 786 | ), |
773 | 787 | "ssvc_trees": adv.ssvc_trees, |
774 | 788 | "resource_url": resource_url, |
| 789 | + "todo_count": adv.todo_count, |
775 | 790 | } |
776 | 791 | ) |
777 | 792 |
|
@@ -809,25 +824,34 @@ def get_affected_advisories_bulk(packages, max_advisories, base_url, reachabilit |
809 | 824 | if not allowed_package_ids: |
810 | 825 | return result |
811 | 826 |
|
812 | | - advisories = AdvisoryV2.objects.filter( |
813 | | - id__in=allowed_advisory_ids, |
814 | | - ).prefetch_related( |
815 | | - "aliases", |
816 | | - Prefetch( |
817 | | - "related_ssvcs", |
818 | | - queryset=( |
819 | | - SSVC.objects.select_related("source_advisory") |
820 | | - .only( |
821 | | - "id", |
822 | | - "decision", |
823 | | - "options", |
824 | | - "vector", |
825 | | - "source_advisory__url", |
826 | | - ) |
827 | | - .distinct("source_advisory__url") |
| 827 | + advisories = ( |
| 828 | + AdvisoryV2.objects.filter( |
| 829 | + id__in=allowed_advisory_ids, |
| 830 | + ) |
| 831 | + .annotate( |
| 832 | + todo_count=Count( |
| 833 | + "advisory_todos", |
| 834 | + filter=Q(advisory_todos__is_todo_stale=False), |
| 835 | + ) |
| 836 | + ) |
| 837 | + .prefetch_related( |
| 838 | + "aliases", |
| 839 | + Prefetch( |
| 840 | + "related_ssvcs", |
| 841 | + queryset=( |
| 842 | + SSVC.objects.select_related("source_advisory") |
| 843 | + .only( |
| 844 | + "id", |
| 845 | + "decision", |
| 846 | + "options", |
| 847 | + "vector", |
| 848 | + "source_advisory__url", |
| 849 | + ) |
| 850 | + .distinct("source_advisory__url") |
| 851 | + ), |
| 852 | + to_attr="prefetched_ssvc_trees", |
828 | 853 | ), |
829 | | - to_attr="prefetched_ssvc_trees", |
830 | | - ), |
| 854 | + ) |
831 | 855 | ) |
832 | 856 |
|
833 | 857 | advisory_by_id = {advisory.id: advisory for advisory in advisories} |
@@ -880,6 +904,7 @@ def get_affected_advisories_bulk(packages, max_advisories, base_url, reachabilit |
880 | 904 | for ssvc in advisory.prefetched_ssvc_trees |
881 | 905 | ], |
882 | 906 | "resource_url": resource_url, |
| 907 | + "todo_count": advisory.todo_count, |
883 | 908 | } |
884 | 909 | ) |
885 | 910 |
|
|
0 commit comments