Skip to content

Commit

Permalink
Add relations in XLSX output #659
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Druez <[email protected]>
  • Loading branch information
tdruez committed Apr 17, 2023
1 parent c4f1b0d commit 74a1b76
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions scanpipe/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ def get_model_serializer(model_class):
CodebaseResource: CodebaseResourceSerializer,
DiscoveredPackage: DiscoveredPackageSerializer,
DiscoveredDependency: DiscoveredDependencySerializer,
CodebaseRelation: CodebaseRelationSerializer,
ProjectError: ProjectErrorSerializer,
}.get(model_class, None)

Expand Down
2 changes: 2 additions & 0 deletions scanpipe/pipes/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ def to_json(project):
"discoveredpackage": "PACKAGES",
"discovereddependency": "DEPENDENCIES",
"codebaseresource": "RESOURCES",
"codebaserelation": "RELATIONS",
"projecterror": "ERRORS",
}

Expand Down Expand Up @@ -447,6 +448,7 @@ def to_xlsx(project):
"discoveredpackage",
"discovereddependency",
"codebaseresource",
"codebaserelation",
"projecterror",
]

Expand Down
2 changes: 1 addition & 1 deletion scanpipe/tests/pipes/test_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def test_scanpipe_pipes_outputs_to_xlsx(self):

# Make sure the output can be generated even if the work_directory was wiped
shutil.rmtree(project.work_directory)
with self.assertNumQueries(7):
with self.assertNumQueries(8):
output_file = output.to_xlsx(project=project)
self.assertIn(output_file.name, project.output_root)

Expand Down

0 comments on commit 74a1b76

Please sign in to comment.