Address review comments

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
aboutcode-org · Aug 9, 2023 · 4815a74 · 4815a74
1 parent d510cd7
commit 4815a74
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/packagedb/api.py b/packagedb/api.py
@@ -503,7 +503,7 @@ def filter_by_checksums(self, request, *args, **kwargs):
         data = dict(request.data)
         unsupported_fields = []
         for field, value in data.items():
-            if field not in ('md5', 'sha1', 'sha256', 'sha512'):
+            if field not in ('md5', 'sha1', 'sha256', 'sha512', 'enhance_package_data'):
                 unsupported_fields.append(field)
 
         if unsupported_fields:
@@ -517,12 +517,14 @@ def filter_by_checksums(self, request, *args, **kwargs):
         for field, value in data.items():
             # We create this intermediate dictionary so we can modify the field
             # name to have __in at the end
+            if field in ["enhance_package_data"]:
+                continue
             d = {f'{field}__in': value}
             q |= Q(**d)
 
         qs = Package.objects.filter(q)
         paginated_qs = self.paginate_queryset(qs)
-        enhance_package_data = request.query_params.get('enhance_package_data', False)
+        enhance_package_data = data.get("enhance_package_data", False)
         if enhance_package_data:
             package_data = []
             for package in qs:

diff --git a/packagedb/models.py b/packagedb/models.py
@@ -1061,11 +1061,5 @@ def add_to_package_set(self, package):
     def get_package_set_members(self):
         """Return related Packages"""
         return self.packages.order_by(
-            'type',
-            'namespace',
-            'name',
-            'version',
-            'qualifiers',
-            'subpath',
             'package_content',
         )
diff --git a/packagedb/tests/test_api.py b/packagedb/tests/test_api.py
@@ -530,16 +530,17 @@ def test_package_api_filter_by_checksums(self):
             'testsha1-6',
         ]
         data = {
-            'sha1': sha1s
+            'sha1': sha1s,
         }
-        enhanced_response = self.client.post('/api/packages/filter_by_checksums/?enhance_package_data=true', data=data)
-        self.assertEqual(5, len(enhanced_response.data['results']))
-        expected = self.get_test_loc('api/package-filter_by_checksums-enhanced-package-data-expected.json')
-        self.check_expected_results(enhanced_response.data['results'], expected, fields_to_remove=["url", "uuid", "resources", "package_sets",], regen=True)
         response = self.client.post('/api/packages/filter_by_checksums/', data=data)
         self.assertEqual(5, response.data['count'])
         expected = self.get_test_loc('api/package-filter_by_checksums-expected.json')
-        self.check_expected_results(response.data['results'], expected, fields_to_remove=["url", "uuid", "resources", "package_sets",], regen=True)
+        self.check_expected_results(response.data['results'], expected, fields_to_remove=["url", "uuid", "resources", "package_sets",], regen=False)
+        data["enhance_package_data"] = True
+        enhanced_response = self.client.post('/api/packages/filter_by_checksums/', data=data)
+        self.assertEqual(5, len(enhanced_response.data['results']))
+        expected = self.get_test_loc('api/package-filter_by_checksums-enhanced-package-data-expected.json')
+        self.check_expected_results(enhanced_response.data['results'], expected, fields_to_remove=["url", "uuid", "resources", "package_sets",], regen=False)
 
 
 class PackageApiReindexingTestCase(JsonBasedTesting, TestCase):