Refine the code and fix failing tests #1524

Signed-off-by: tdruez <[email protected]>
aboutcode-org · Jan 10, 2025 · cf2d503 · cf2d503
1 parent 727bbba
commit cf2d503
Show file tree

Hide file tree

Showing 19 changed files with 2,154 additions and 4,317 deletions.
diff --git a/scanpipe/api/serializers.py b/scanpipe/api/serializers.py
@@ -336,7 +336,6 @@ def create(self, validated_data):
 class CodebaseResourceSerializer(serializers.ModelSerializer):
     for_packages = serializers.JSONField()
     compliance_alert = serializers.CharField()
-    project = serializers.CharField(source="project.name")
 
     class Meta:
         model = CodebaseResource
@@ -380,14 +379,12 @@ class Meta:
             "emails",
             "urls",
             "extra_data",
-            "project",
         ]
 
 
 class DiscoveredPackageSerializer(serializers.ModelSerializer):
     purl = serializers.CharField(source="package_url")
     compliance_alert = serializers.CharField()
-    project = serializers.CharField(source="project.name")
 
     class Meta:
         model = DiscoveredPackage
@@ -441,7 +438,6 @@ class Meta:
             "missing_resources",
             "modified_resources",
             "affected_by_vulnerabilities",
-            "project",
         ]
 
 
@@ -451,7 +447,6 @@ class DiscoveredDependencySerializer(serializers.ModelSerializer):
     resolved_to_package_uid = serializers.ReadOnlyField()
     datafile_path = serializers.ReadOnlyField()
     package_type = serializers.ReadOnlyField(source="type")
-    project = serializers.CharField(source="project.name")
 
     class Meta:
         model = DiscoveredDependency
@@ -470,14 +465,12 @@ class Meta:
             "datasource_id",
             "package_type",
             "affected_by_vulnerabilities",
-            "project",
         ]
 
 
 class CodebaseRelationSerializer(serializers.ModelSerializer):
     from_resource = serializers.ReadOnlyField(source="from_resource.path")
     to_resource = serializers.ReadOnlyField(source="to_resource.path")
-    project = serializers.CharField(source="project.name")
 
     class Meta:
         model = CodebaseRelation
@@ -487,13 +480,11 @@ class Meta:
             "map_type",
             "score",
             "from_resource",
-            "project",
         ]
 
 
 class ProjectMessageSerializer(serializers.ModelSerializer):
     traceback = serializers.SerializerMethodField()
-    project = serializers.CharField(source="project.name")
 
     class Meta:
         model = ProjectMessage
@@ -505,7 +496,6 @@ class Meta:
             "details",
             "traceback",
             "created_date",
-            "project",
         ]
 
     def get_traceback(self, project_error):

diff --git a/scanpipe/forms.py b/scanpipe/forms.py
@@ -296,7 +296,6 @@ def get_queryset(self):
         from scanpipe.models import DiscoveredPackage
         from scanpipe.models import ProjectMessage
         from scanpipe.pipes import flag
-        from scanpipe.pipes.output import TODO_FIELDS
 
         querysets = {
             "discoveredpackage": (
@@ -324,8 +323,7 @@ def get_queryset(self):
             ),
             "projectmessage": ProjectMessage.objects.all(),
             "todos": (
-                CodebaseResource.objects.files()
-                .status(flag.REQUIRES_REVIEW)
+                CodebaseResource.objects.files().status(flag.REQUIRES_REVIEW)
                 # .only(*TODO_FIELDS)
             ),
         }

diff --git a/scanpipe/tests/data/asgiref/asgiref-3.3.0_load_inventory_expected.json b/scanpipe/tests/data/asgiref/asgiref-3.3.0_load_inventory_expected.json
@@ -149,8 +149,7 @@
       "file_references": [],
       "missing_resources": [],
       "modified_resources": [],
-      "affected_by_vulnerabilities": [],
-      "project": "Tool: scancode-toolkit"
+      "affected_by_vulnerabilities": []
     },
     {
       "purl": "pkg:pypi/[email protected]",
@@ -271,8 +270,7 @@
       "file_references": [],
       "missing_resources": [],
       "modified_resources": [],
-      "affected_by_vulnerabilities": [],
-      "project": "Tool: scancode-toolkit"
+      "affected_by_vulnerabilities": []
     }
   ],
   "dependencies": [
@@ -290,8 +288,7 @@
       "datafile_path": "asgiref-3.3.0-py3-none-any.whl",
       "datasource_id": "pypi_wheel",
       "package_type": "pypi",
-      "affected_by_vulnerabilities": [],
-      "project": "Tool: scancode-toolkit"
+      "affected_by_vulnerabilities": []
     },
     {
       "purl": "pkg:pypi/pytest",
@@ -307,8 +304,7 @@
       "datafile_path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
       "datasource_id": "pypi_wheel_metadata",
       "package_type": "pypi",
-      "affected_by_vulnerabilities": [],
-      "project": "Tool: scancode-toolkit"
+      "affected_by_vulnerabilities": []
     },
     {
       "purl": "pkg:pypi/pytest-asyncio",
@@ -324,8 +320,7 @@
       "datafile_path": "asgiref-3.3.0-py3-none-any.whl",
       "datasource_id": "pypi_wheel",
       "package_type": "pypi",
-      "affected_by_vulnerabilities": [],
-      "project": "Tool: scancode-toolkit"
+      "affected_by_vulnerabilities": []
     },
     {
       "purl": "pkg:pypi/pytest-asyncio",
@@ -341,8 +336,7 @@
       "datafile_path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
       "datasource_id": "pypi_wheel_metadata",
       "package_type": "pypi",
-      "affected_by_vulnerabilities": [],
-      "project": "Tool: scancode-toolkit"
+      "affected_by_vulnerabilities": []
     }
   ],
   "files": [
@@ -630,8 +624,7 @@
       ],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract",
@@ -666,8 +659,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref",
@@ -702,8 +694,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info",
@@ -738,8 +729,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/LICENSE",
@@ -810,8 +800,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
@@ -1146,8 +1135,7 @@
       ],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/RECORD",
@@ -1184,8 +1172,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/WHEEL",
@@ -1222,8 +1209,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/top_level.txt",
@@ -1260,8 +1246,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
@@ -1298,8 +1283,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/compatibility.py",
@@ -1336,8 +1320,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/current_thread_executor.py",
@@ -1374,8 +1357,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/local.py",
@@ -1412,8 +1394,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/server.py",
@@ -1450,8 +1431,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/sync.py",
@@ -1488,8 +1468,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/testing.py",
@@ -1526,8 +1505,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/timeout.py",
@@ -1586,8 +1564,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     },
     {
       "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/wsgi.py",
@@ -1624,8 +1601,7 @@
       "package_data": [],
       "emails": [],
       "urls": [],
-      "extra_data": {},
-      "project": "Tool: scancode-toolkit"
+      "extra_data": {}
     }
   ],
   "relations": []