From 102c0bb5adb45bbf0b4ddc31535a21d8dc1e87e3 Mon Sep 17 00:00:00 2001 From: Ariel Bello Date: Fri, 12 Nov 2021 11:28:19 -0300 Subject: [PATCH] add return value to MockSet delete --- django_mock_queries/query.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/django_mock_queries/query.py b/django_mock_queries/query.py index 168cb4a..5e37a93 100644 --- a/django_mock_queries/query.py +++ b/django_mock_queries/query.py @@ -1,6 +1,6 @@ import datetime import random -from collections import OrderedDict, namedtuple +from collections import defaultdict, OrderedDict, namedtuple from six import with_metaclass try: from unittest.mock import Mock, MagicMock, PropertyMock @@ -266,16 +266,23 @@ def update(self, **attrs): return count def _delete_recursive(self, *items_to_remove, **attrs): + sum_deleted = 0 + items_deleted = defaultdict(int) + for item in matches(*items_to_remove, **attrs): self.items.remove(item) self.fire(item, self.EVENT_DELETED) + sum_deleted += 1 + items_deleted[item._meta.label] += 1 if self.clone is not None: self.clone._delete_recursive(*items_to_remove, **attrs) + return sum_deleted, items_deleted + def delete(self, **attrs): # Delete normally doesn't take **attrs - they're only needed for remove - self._delete_recursive(*self.items, **attrs) + return self._delete_recursive(*self.items, **attrs) # The following 2 methods were kept for backwards compatibility and # should be removed in the future since they are covered by filter & delete