Add more fields to dependency API summary #447

    * Update test expectations

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

scanpipe/api/serializers.py

@@ -173,6 +173,9 @@ def get_discovered_dependency_summary(self, project):
         base_qs = project.discovereddependencys
         return {
             "total": base_qs.count(),
+            "is_runtime": base_qs.filter(is_runtime=True).count(),
+            "is_optional": base_qs.filter(is_optional=True).count(),
+            "is_resolved": base_qs.filter(is_resolved=True).count(),
         }
 
     def create(self, validated_data):

scanpipe/tests/test_api.py

@@ -38,6 +38,7 @@
 from rest_framework.test import APIClient
 
 from scanpipe.api.serializers import CodebaseResourceSerializer
+from scanpipe.api.serializers import DiscoveredDependencySerializer
 from scanpipe.api.serializers import DiscoveredPackageSerializer
 from scanpipe.api.serializers import get_model_serializer
 from scanpipe.api.serializers import get_serializer_fields
@@ -49,6 +50,7 @@
 from scanpipe.models import Run
 from scanpipe.pipes.input import copy_input
 from scanpipe.pipes.output import JSONResultsGenerator
+from scanpipe.tests import dependency_data1
 from scanpipe.tests import package_data1
 
 
@@ -63,6 +65,10 @@ def setUp(self):
             project=self.project1, path="filename.ext"
         )
         self.discovered_package1 = self.resource1.create_and_add_package(package_data1)
+        self.discovered_dependency1 = DiscoveredDependency.create_from_data(
+            self.project1,
+            dependency_data1
+        )
 
         self.project_list_url = reverse("project-list")
         self.project1_detail_url = reverse("project-detail", args=[self.project1.uuid])
@@ -83,6 +89,7 @@ def test_scanpipe_api_project_list(self):
         self.assertNotContains(response, "error_count")
         self.assertNotContains(response, "resource_count")
         self.assertNotContains(response, "package_count")
+        self.assertNotContains(response, "dependency_count")
 
     def test_scanpipe_api_project_list_filters(self):
         project2 = Project.objects.create(name="pro2ject", is_archived=True)
@@ -154,6 +161,7 @@ def test_scanpipe_api_project_detail(self):
         self.assertEqual(0, response.data["error_count"])
         self.assertEqual(1, response.data["resource_count"])
         self.assertEqual(1, response.data["package_count"])
+        self.assertEqual(1, response.data["dependency_count"])
 
         expected = {"": 1}
         self.assertEqual(expected, response.data["codebase_resources_summary"])
@@ -163,6 +171,13 @@ def test_scanpipe_api_project_detail(self):
             "with_modified_resources": 0,
         }
         self.assertEqual(expected, response.data["discovered_package_summary"])
+        expected = {
+            "total": 1,
+            "is_runtime": 1,
+            "is_optional": 0,
+            "is_resolved": 0,
+        }
+        self.assertEqual(expected, response.data["discovered_dependency_summary"])
 
         self.project1.add_input_source(filename="file1", source="uploaded")
         self.project1.add_input_source(filename="file2", source="https://download.url")
@@ -273,7 +288,7 @@ def test_scanpipe_api_project_results_generator(self):
         expected = ["dependencies", "files", "headers", "packages"]
         self.assertEqual(expected, sorted(results.keys()))
 
-        self.assertEqual(0, len(results["dependencies"]))
+        self.assertEqual(1, len(results["dependencies"]))
         self.assertEqual(1, len(results["headers"]))
         self.assertEqual(1, len(results["files"]))
         self.assertEqual(1, len(results["packages"]))
@@ -287,7 +302,7 @@ def test_scanpipe_api_project_action_results(self):
         expected = ["dependencies", "files", "headers", "packages"]
         self.assertEqual(expected, sorted(results.keys()))
 
-        self.assertEqual(0, len(results["dependencies"]))
+        self.assertEqual(1, len(results["dependencies"]))
         self.assertEqual(1, len(results["headers"]))
         self.assertEqual(1, len(results["files"]))
         self.assertEqual(1, len(results["packages"]))
@@ -623,6 +638,9 @@ def test_scanpipe_api_serializer_get_model_serializer(self):
         self.assertEqual(
             DiscoveredPackageSerializer, get_model_serializer(DiscoveredPackage)
         )
+        self.assertEqual(
+            DiscoveredDependencySerializer, get_model_serializer(DiscoveredDependency)
+        )
         self.assertEqual(
             CodebaseResourceSerializer, get_model_serializer(CodebaseResource)
         )