Skip to content

Commit cf2d503

Browse files
tdrueztdruez
committed
Refine the code and fix failing tests #1524
Signed-off-by: tdruez <[email protected]>
1 parent 727bbba commit cf2d503

19 files changed

+2154
-4317
lines changed

‎scanpipe/api/serializers.py

-10
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ def create(self, validated_data):
336336
class CodebaseResourceSerializer(serializers.ModelSerializer):
337337
for_packages = serializers.JSONField()
338338
compliance_alert = serializers.CharField()
339-
project = serializers.CharField(source="project.name")
340339

341340
class Meta:
342341
model = CodebaseResource
@@ -380,14 +379,12 @@ class Meta:
380379
"emails",
381380
"urls",
382381
"extra_data",
383-
"project",
384382
]
385383

386384

387385
class DiscoveredPackageSerializer(serializers.ModelSerializer):
388386
purl = serializers.CharField(source="package_url")
389387
compliance_alert = serializers.CharField()
390-
project = serializers.CharField(source="project.name")
391388

392389
class Meta:
393390
model = DiscoveredPackage
@@ -441,7 +438,6 @@ class Meta:
441438
"missing_resources",
442439
"modified_resources",
443440
"affected_by_vulnerabilities",
444-
"project",
445441
]
446442

447443

@@ -451,7 +447,6 @@ class DiscoveredDependencySerializer(serializers.ModelSerializer):
451447
resolved_to_package_uid = serializers.ReadOnlyField()
452448
datafile_path = serializers.ReadOnlyField()
453449
package_type = serializers.ReadOnlyField(source="type")
454-
project = serializers.CharField(source="project.name")
455450

456451
class Meta:
457452
model = DiscoveredDependency
@@ -470,14 +465,12 @@ class Meta:
470465
"datasource_id",
471466
"package_type",
472467
"affected_by_vulnerabilities",
473-
"project",
474468
]
475469

476470

477471
class CodebaseRelationSerializer(serializers.ModelSerializer):
478472
from_resource = serializers.ReadOnlyField(source="from_resource.path")
479473
to_resource = serializers.ReadOnlyField(source="to_resource.path")
480-
project = serializers.CharField(source="project.name")
481474

482475
class Meta:
483476
model = CodebaseRelation
@@ -487,13 +480,11 @@ class Meta:
487480
"map_type",
488481
"score",
489482
"from_resource",
490-
"project",
491483
]
492484

493485

494486
class ProjectMessageSerializer(serializers.ModelSerializer):
495487
traceback = serializers.SerializerMethodField()
496-
project = serializers.CharField(source="project.name")
497488

498489
class Meta:
499490
model = ProjectMessage
@@ -505,7 +496,6 @@ class Meta:
505496
"details",
506497
"traceback",
507498
"created_date",
508-
"project",
509499
]
510500

511501
def get_traceback(self, project_error):

‎scanpipe/forms.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ def get_queryset(self):
296296
from scanpipe.models import DiscoveredPackage
297297
from scanpipe.models import ProjectMessage
298298
from scanpipe.pipes import flag
299-
from scanpipe.pipes.output import TODO_FIELDS
300299

301300
querysets = {
302301
"discoveredpackage": (
@@ -324,8 +323,7 @@ def get_queryset(self):
324323
),
325324
"projectmessage": ProjectMessage.objects.all(),
326325
"todos": (
327-
CodebaseResource.objects.files()
328-
.status(flag.REQUIRES_REVIEW)
326+
CodebaseResource.objects.files().status(flag.REQUIRES_REVIEW)
329327
# .only(*TODO_FIELDS)
330328
),
331329
}

‎scanpipe/tests/data/asgiref/asgiref-3.3.0_load_inventory_expected.json

+24-48
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@
149149
"file_references": [],
150150
"missing_resources": [],
151151
"modified_resources": [],
152-
"affected_by_vulnerabilities": [],
153-
"project": "Tool: scancode-toolkit"
152+
"affected_by_vulnerabilities": []
154153
},
155154
{
156155
"purl": "pkg:pypi/[email protected]",
@@ -271,8 +270,7 @@
271270
"file_references": [],
272271
"missing_resources": [],
273272
"modified_resources": [],
274-
"affected_by_vulnerabilities": [],
275-
"project": "Tool: scancode-toolkit"
273+
"affected_by_vulnerabilities": []
276274
}
277275
],
278276
"dependencies": [
@@ -290,8 +288,7 @@
290288
"datafile_path": "asgiref-3.3.0-py3-none-any.whl",
291289
"datasource_id": "pypi_wheel",
292290
"package_type": "pypi",
293-
"affected_by_vulnerabilities": [],
294-
"project": "Tool: scancode-toolkit"
291+
"affected_by_vulnerabilities": []
295292
},
296293
{
297294
"purl": "pkg:pypi/pytest",
@@ -307,8 +304,7 @@
307304
"datafile_path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
308305
"datasource_id": "pypi_wheel_metadata",
309306
"package_type": "pypi",
310-
"affected_by_vulnerabilities": [],
311-
"project": "Tool: scancode-toolkit"
307+
"affected_by_vulnerabilities": []
312308
},
313309
{
314310
"purl": "pkg:pypi/pytest-asyncio",
@@ -324,8 +320,7 @@
324320
"datafile_path": "asgiref-3.3.0-py3-none-any.whl",
325321
"datasource_id": "pypi_wheel",
326322
"package_type": "pypi",
327-
"affected_by_vulnerabilities": [],
328-
"project": "Tool: scancode-toolkit"
323+
"affected_by_vulnerabilities": []
329324
},
330325
{
331326
"purl": "pkg:pypi/pytest-asyncio",
@@ -341,8 +336,7 @@
341336
"datafile_path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
342337
"datasource_id": "pypi_wheel_metadata",
343338
"package_type": "pypi",
344-
"affected_by_vulnerabilities": [],
345-
"project": "Tool: scancode-toolkit"
339+
"affected_by_vulnerabilities": []
346340
}
347341
],
348342
"files": [
@@ -630,8 +624,7 @@
630624
],
631625
"emails": [],
632626
"urls": [],
633-
"extra_data": {},
634-
"project": "Tool: scancode-toolkit"
627+
"extra_data": {}
635628
},
636629
{
637630
"path": "asgiref-3.3.0-py3-none-any.whl-extract",
@@ -666,8 +659,7 @@
666659
"package_data": [],
667660
"emails": [],
668661
"urls": [],
669-
"extra_data": {},
670-
"project": "Tool: scancode-toolkit"
662+
"extra_data": {}
671663
},
672664
{
673665
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref",
@@ -702,8 +694,7 @@
702694
"package_data": [],
703695
"emails": [],
704696
"urls": [],
705-
"extra_data": {},
706-
"project": "Tool: scancode-toolkit"
697+
"extra_data": {}
707698
},
708699
{
709700
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info",
@@ -738,8 +729,7 @@
738729
"package_data": [],
739730
"emails": [],
740731
"urls": [],
741-
"extra_data": {},
742-
"project": "Tool: scancode-toolkit"
732+
"extra_data": {}
743733
},
744734
{
745735
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/LICENSE",
@@ -810,8 +800,7 @@
810800
"package_data": [],
811801
"emails": [],
812802
"urls": [],
813-
"extra_data": {},
814-
"project": "Tool: scancode-toolkit"
803+
"extra_data": {}
815804
},
816805
{
817806
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
@@ -1146,8 +1135,7 @@
11461135
],
11471136
"emails": [],
11481137
"urls": [],
1149-
"extra_data": {},
1150-
"project": "Tool: scancode-toolkit"
1138+
"extra_data": {}
11511139
},
11521140
{
11531141
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/RECORD",
@@ -1184,8 +1172,7 @@
11841172
"package_data": [],
11851173
"emails": [],
11861174
"urls": [],
1187-
"extra_data": {},
1188-
"project": "Tool: scancode-toolkit"
1175+
"extra_data": {}
11891176
},
11901177
{
11911178
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/WHEEL",
@@ -1222,8 +1209,7 @@
12221209
"package_data": [],
12231210
"emails": [],
12241211
"urls": [],
1225-
"extra_data": {},
1226-
"project": "Tool: scancode-toolkit"
1212+
"extra_data": {}
12271213
},
12281214
{
12291215
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/top_level.txt",
@@ -1260,8 +1246,7 @@
12601246
"package_data": [],
12611247
"emails": [],
12621248
"urls": [],
1263-
"extra_data": {},
1264-
"project": "Tool: scancode-toolkit"
1249+
"extra_data": {}
12651250
},
12661251
{
12671252
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
@@ -1298,8 +1283,7 @@
12981283
"package_data": [],
12991284
"emails": [],
13001285
"urls": [],
1301-
"extra_data": {},
1302-
"project": "Tool: scancode-toolkit"
1286+
"extra_data": {}
13031287
},
13041288
{
13051289
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/compatibility.py",
@@ -1336,8 +1320,7 @@
13361320
"package_data": [],
13371321
"emails": [],
13381322
"urls": [],
1339-
"extra_data": {},
1340-
"project": "Tool: scancode-toolkit"
1323+
"extra_data": {}
13411324
},
13421325
{
13431326
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/current_thread_executor.py",
@@ -1374,8 +1357,7 @@
13741357
"package_data": [],
13751358
"emails": [],
13761359
"urls": [],
1377-
"extra_data": {},
1378-
"project": "Tool: scancode-toolkit"
1360+
"extra_data": {}
13791361
},
13801362
{
13811363
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/local.py",
@@ -1412,8 +1394,7 @@
14121394
"package_data": [],
14131395
"emails": [],
14141396
"urls": [],
1415-
"extra_data": {},
1416-
"project": "Tool: scancode-toolkit"
1397+
"extra_data": {}
14171398
},
14181399
{
14191400
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/server.py",
@@ -1450,8 +1431,7 @@
14501431
"package_data": [],
14511432
"emails": [],
14521433
"urls": [],
1453-
"extra_data": {},
1454-
"project": "Tool: scancode-toolkit"
1434+
"extra_data": {}
14551435
},
14561436
{
14571437
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/sync.py",
@@ -1488,8 +1468,7 @@
14881468
"package_data": [],
14891469
"emails": [],
14901470
"urls": [],
1491-
"extra_data": {},
1492-
"project": "Tool: scancode-toolkit"
1471+
"extra_data": {}
14931472
},
14941473
{
14951474
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/testing.py",
@@ -1526,8 +1505,7 @@
15261505
"package_data": [],
15271506
"emails": [],
15281507
"urls": [],
1529-
"extra_data": {},
1530-
"project": "Tool: scancode-toolkit"
1508+
"extra_data": {}
15311509
},
15321510
{
15331511
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/timeout.py",
@@ -1586,8 +1564,7 @@
15861564
"package_data": [],
15871565
"emails": [],
15881566
"urls": [],
1589-
"extra_data": {},
1590-
"project": "Tool: scancode-toolkit"
1567+
"extra_data": {}
15911568
},
15921569
{
15931570
"path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/wsgi.py",
@@ -1624,8 +1601,7 @@
16241601
"package_data": [],
16251602
"emails": [],
16261603
"urls": [],
1627-
"extra_data": {},
1628-
"project": "Tool: scancode-toolkit"
1604+
"extra_data": {}
16291605
}
16301606
],
16311607
"relations": []

0 commit comments

Comments
 (0)