Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.16.x] Exception handling for BulkDeleteMixin (#8205) #8206

Merged
merged 1 commit into from
Sep 29, 2024
Merged

[0.16.x] Exception handling for BulkDeleteMixin (#8205) #8206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/backend/InvenTree/InvenTree/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,26 @@ def delete(self, request, *args, **kwargs):

# Filter by provided item ID values
if items:
queryset = queryset.filter(id__in=items)
try:
queryset = queryset.filter(id__in=items)
except Exception:
raise ValidationError({
'non_field_errors': _('Invalid items list provided')
})

# Filter by provided filters
if filters:
queryset = queryset.filter(**filters)
try:
queryset = queryset.filter(**filters)
except Exception:
raise ValidationError({
'non_field_errors': _('Invalid filters provided')
})

if queryset.count() == 0:
raise ValidationError({
'non_field_errors': _('No items found to delete')
})

# Run a final validation step (should raise an error if the deletion should not proceed)
self.validate_delete(queryset, request)
Expand Down
2 changes: 1 addition & 1 deletion src/backend/InvenTree/stock/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@ def test_bulk_delete(self):
# Now, let's delete all the newly created items with a single API request
# However, we will provide incorrect filters
response = self.delete(
url, {'items': tests, 'filters': {'stock_item': 10}}, expected_code=204
url, {'items': tests, 'filters': {'stock_item': 10}}, expected_code=400
)

self.assertEqual(StockItemTestResult.objects.count(), n + 50)
Expand Down