Merge pull request #24 from tumb1er/fix_excluded_objects_aggregated

closes #23 don't count excluded objects in full aggregate

denormalized/tracker.py

@@ -206,9 +206,9 @@ def _get_full_aggregate(self,
         foreign_object = self._get_foreign_object(instance)
         if foreign_object is None:
             return None
+        filter_q = Q((self.foreign_key, expressions.OuterRef('pk')))
         object_queryset = type(instance).objects.filter(
-            Q((self.foreign_key, expressions.OuterRef('pk')))).values(
-            self.foreign_key)
+            filter_q & self.query).values(self.foreign_key)
         if exclude:
             object_queryset = object_queryset.exclude(pk=instance.pk)
         return expressions.Subquery(

testproject/testapp/tests.py

@@ -301,7 +301,7 @@ def test_track_value_changed_on_increase(self):
 
         self.assertDenormalized()
 
-    def test_track_min_value_changed_on_decrease(self):
+    def test_track_value_changed_on_decrease(self):
         """
         Separate case for decreasing tracked value.
         """
@@ -310,6 +310,18 @@ def test_track_min_value_changed_on_decrease(self):
 
         self.assertDenormalized()
 
+    def test_leaving_skips_not_counted(self):
+        """
+        Denormalized values is updated properly while creating multiple objects
+        """
+        models.Member.objects.create(
+            group=self.group, points=self.member.points + 1,
+            active=False)
+
+        self.member.active = False
+        self.member.save()
+        self.assertDenormalized()
+
 
 class MaxTestCase(MinTestCase):
     field_name = 'points_max'