Update dependency JSON ordering #447

JonoYang · JonoYang · commit 40862fe6e018 · 2022-08-26T17:16:25.000-07:00
* Update test expectations

Signed-off-by: Jono Yang &lt;jyang@nexb.com&gt;
diff --git a/scanpipe/pipes/output.py b/scanpipe/pipes/output.py
@@ -189,7 +189,11 @@ def get_dependencies(self, project):
             project.discovereddependencys.all()
             .prefetch_related("for_package", "datafile_resource")
             .order_by(
-                "dependency_uid",
+                "type",
+                "namespace",
+                "name",
+                "version",
+                "datasource_id",
             )
         )
 
diff --git a/scanpipe/tests/data/asgiref-3.3.0_load_inventory_expected.json b/scanpipe/tests/data/asgiref-3.3.0_load_inventory_expected.json
@@ -121,55 +121,55 @@
   ],
   "dependencies": [
     {
-      "purl": "pkg:pypi/pytest-asyncio",
-      "for_package_uid": "pkg:pypi/asgiref@3.3.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
+      "purl": "pkg:pypi/pytest",
       "package_type": "pypi",
-      "dependency_uid": "pkg:pypi/pytest-asyncio?uuid=fixed-uid-done-for-testing-5642512d1758",
       "extracted_requirement": "",
       "scope": "tests",
       "is_runtime": true,
       "is_optional": false,
       "is_resolved": false,
-      "datasource_id": "pypi_wheel_metadata"
-    },
-    {
-      "purl": "pkg:pypi/pytest-asyncio",
+      "dependency_uid": "pkg:pypi/pytest?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/asgiref@3.3.0?uuid=fixed-uid-done-for-testing-5642512d1758",
       "datafile_path": "asgiref-3.3.0-py3-none-any.whl",
+      "datasource_id": "pypi_wheel"
+    },
+    {
+      "purl": "pkg:pypi/pytest",
       "package_type": "pypi",
-      "dependency_uid": "pkg:pypi/pytest-asyncio?uuid=fixed-uid-done-for-testing-5642512d1758",
       "extracted_requirement": "",
       "scope": "tests",
       "is_runtime": true,
       "is_optional": false,
       "is_resolved": false,
-      "datasource_id": "pypi_wheel"
+      "dependency_uid": "pkg:pypi/pytest?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "for_package_uid": "pkg:pypi/asgiref@3.3.0?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "datafile_path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
+      "datasource_id": "pypi_wheel_metadata"
     },
     {
-      "purl": "pkg:pypi/pytest",
-      "for_package_uid": "pkg:pypi/asgiref@3.3.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "asgiref-3.3.0-py3-none-any.whl",
+      "purl": "pkg:pypi/pytest-asyncio",
       "package_type": "pypi",
-      "dependency_uid": "pkg:pypi/pytest?uuid=fixed-uid-done-for-testing-5642512d1758",
       "extracted_requirement": "",
       "scope": "tests",
       "is_runtime": true,
       "is_optional": false,
       "is_resolved": false,
+      "dependency_uid": "pkg:pypi/pytest-asyncio?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "for_package_uid": "pkg:pypi/asgiref@3.3.0?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "datafile_path": "asgiref-3.3.0-py3-none-any.whl",
       "datasource_id": "pypi_wheel"
     },
     {
-      "purl": "pkg:pypi/pytest",
-      "for_package_uid": "pkg:pypi/asgiref@3.3.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
+      "purl": "pkg:pypi/pytest-asyncio",
       "package_type": "pypi",
-      "dependency_uid": "pkg:pypi/pytest?uuid=fixed-uid-done-for-testing-5642512d1758",
       "extracted_requirement": "",
       "scope": "tests",
       "is_runtime": true,
       "is_optional": false,
       "is_resolved": false,
+      "dependency_uid": "pkg:pypi/pytest-asyncio?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "for_package_uid": "pkg:pypi/asgiref@3.3.0?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "datafile_path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/METADATA",
       "datasource_id": "pypi_wheel_metadata"
     }
   ],
diff --git a/scanpipe/tests/data/daglib-0.6.0-py3-none-any.whl_scan_codebase.json b/scanpipe/tests/data/daglib-0.6.0-py3-none-any.whl_scan_codebase.json
@@ -113,8 +113,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/dask?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
-      "datasource_id": "pypi_wheel_metadata"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
+      "datasource_id": "pypi_wheel"
     },
     {
       "purl": "pkg:pypi/dask",
@@ -126,8 +126,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/dask?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
-      "datasource_id": "pypi_wheel"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
+      "datasource_id": "pypi_wheel_metadata"
     },
     {
       "purl": "pkg:pypi/graphviz",
@@ -165,8 +165,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/ipycytoscape?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
-      "datasource_id": "pypi_wheel_metadata"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
+      "datasource_id": "pypi_wheel"
     },
     {
       "purl": "pkg:pypi/ipycytoscape",
@@ -178,8 +178,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/ipycytoscape?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
-      "datasource_id": "pypi_wheel"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
+      "datasource_id": "pypi_wheel_metadata"
     },
     {
       "purl": "pkg:pypi/networkx",
@@ -191,8 +191,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/networkx?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
-      "datasource_id": "pypi_wheel_metadata"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
+      "datasource_id": "pypi_wheel"
     },
     {
       "purl": "pkg:pypi/networkx",
@@ -204,8 +204,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/networkx?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
-      "datasource_id": "pypi_wheel"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
+      "datasource_id": "pypi_wheel_metadata"
     }
   ],
   "files": [
diff --git a/scanpipe/tests/data/is-npm-1.0.0_scan_codebase.json b/scanpipe/tests/data/is-npm-1.0.0_scan_codebase.json
@@ -69,15 +69,15 @@
   "dependencies": [
     {
       "purl": "pkg:npm/ava",
-      "for_package_uid": "pkg:npm/is-npm@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "is-npm-1.0.0.tgz-extract/package/package.json",
       "package_type": "npm",
-      "dependency_uid": "pkg:npm/ava?uuid=fixed-uid-done-for-testing-5642512d1758",
       "extracted_requirement": "0.0.3",
       "scope": "devDependencies",
       "is_runtime": false,
       "is_optional": true,
       "is_resolved": false,
+      "dependency_uid": "pkg:npm/ava?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "for_package_uid": "pkg:npm/is-npm@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "datafile_path": "is-npm-1.0.0.tgz-extract/package/package.json",
       "datasource_id": "npm_package_json"
     }
   ],
diff --git a/scanpipe/tests/test_pipelines.py b/scanpipe/tests/test_pipelines.py
@@ -402,6 +402,7 @@ def test_scanpipe_scan_codebase_can_process_wheel(self):
 
         self.assertEqual(11, project1.codebaseresources.count())
         self.assertEqual(2, project1.discoveredpackages.count())
+        self.assertEqual(8, project1.discovereddependencys.count())
 
         result_file = output.to_json(project1)
         expected_file = (

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,11 @@ def get_dependencies(self, project):`
`189`	`189`	`project.discovereddependencys.all()`
`190`	`190`	`.prefetch_related("for_package", "datafile_resource")`
`191`	`191`	`.order_by(`
`192`		`- "dependency_uid",`
	`192`	`+ "type",`
	`193`	`+ "namespace",`
	`194`	`+ "name",`
	`195`	`+ "version",`
	`196`	`+ "datasource_id",`
`193`	`197`	`)`
`194`	`198`	`)`
`195`	`199`