Use new severity model in APIv2

Signed-off-by: Keshav Priyadarshi <[email protected]>

Author: keshav-space

vulnerabilities/api_v2.py

@@ -13,7 +13,6 @@
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 
-from vulnerabilities.api import VulnerabilitySeveritySerializer
 from vulnerabilities.models import Package
 from vulnerabilities.models import Vulnerability
 from vulnerabilities.models import VulnerabilityReference
@@ -41,11 +40,24 @@ class Meta:
         fields = ["url", "reference_type", "reference_id"]
 
 
+class VulnerabilitySeverityV2Serializer(serializers.ModelSerializer):
+    class Meta:
+        model = VulnerabilitySeverity
+        fields = ["url", "value", "scoring_system", "scoring_elements", "published_at"]
+
+    def to_representation(self, instance):
+        data = super().to_representation(instance)
+        published_at = data.get("published_at", None)
+        if not published_at:
+            data.pop("published_at")
+        return data
+
+
 class VulnerabilityV2Serializer(serializers.ModelSerializer):
     aliases = serializers.SerializerMethodField()
     weaknesses = WeaknessV2Serializer(many=True)
     references = VulnerabilityReferenceV2Serializer(many=True, source="vulnerabilityreference_set")
-    severities = VulnerabilitySeveritySerializer(many=True)
+    severities = VulnerabilitySeverityV2Serializer(many=True)
 
     class Meta:
         model = Vulnerability
@@ -61,9 +73,6 @@ class Meta:
     def get_aliases(self, obj):
         return [alias.alias for alias in obj.aliases.all()]
 
-    def get_severities(self, obj):
-        return obj.severities
-
 
 class VulnerabilityListSerializer(serializers.ModelSerializer):
     url = serializers.SerializerMethodField()

vulnerabilities/migrations/0077_alter_vulnerabilityseverity_options_and_more.py renamed to vulnerabilities/migrations/0078_alter_vulnerabilityseverity_options_and_more.py

@@ -153,7 +153,7 @@ def reverse_populate_vulnerability_model_with_severities(apps, schema_editor):
         pass
 
     dependencies = [
-        ("vulnerabilities", "0076_alter_packagechangelog_software_version_and_more"),
+        ("vulnerabilities", "0077_alter_packagechangelog_software_version_and_more"),
     ]
 
     operations = [