Updated stats returned by bulk_sync to reflect what actually happened given the flags rather than what would have happend if all flags are false.

Author: tempoxylophone

bulk_sync/__init__.py

@@ -61,7 +61,11 @@ def get_key(obj):
 
         assert len(existing_objs) == len(new_models) - len(new_objs)
 
-        stats = {"created": len(new_objs), "updated": len(new_models) - len(new_objs), "deleted": len(obj_dict)}
+        stats = {
+            "created": 0 if skip_creates else len(new_objs), 
+            "updated": 0 if skip_updates else (len(new_models) - len(new_objs)), 
+            "deleted": 0 if skip_deletes else len(obj_dict)
+        }
 
         logger.debug(
             "{}: {} created, {} updated, {} deleted.".format(

tests/tests.py

@@ -118,9 +118,17 @@ def test_skip_deletes(self):
         # but Isaac should remain when the skip_deletes flag is True
         ret = bulk_sync(new_models=new_objs, filters=None, key_fields=("name",), skip_deletes=True)
 
-        self.assertEqual(2, Employee.objects.count())
         self.assertEqual(["Scott", "Isaac"], [x.name for x in Employee.objects.all().order_by('id')])
 
+        new_e1 = Employee.objects.get(id=e1.id)
+        self.assertEqual(41, new_e1.age)
+
+        self.assertEqual(2, Employee.objects.count())
+
+        self.assertEqual(1, ret["stats"]["updated"])
+        self.assertEqual(0, ret["stats"]["created"])
+        self.assertEqual(0, ret["stats"]["deleted"])
+
     def test_skip_creates(self):
         c1 = Company.objects.create(name="My Company LLC")
 
@@ -137,15 +145,20 @@ def test_skip_creates(self):
         self.assertEqual(2, Employee.objects.count())
         self.assertEqual(["Scott", "Isaac"], [x.name for x in Employee.objects.all().order_by('id')])
 
+        self.assertEqual(0, ret["stats"]["updated"])
+        self.assertEqual(0, ret["stats"]["created"])
+        self.assertEqual(0, ret["stats"]["deleted"])
+
     def test_skip_updates(self):
         c1 = Company.objects.create(name="My Company LLC")
 
         e1 = Employee.objects.create(name="Scott", age=40, company=c1)
         e2 = Employee.objects.create(name="Isaac", age=9, company=c1)
 
-        # create a new employee that will be ignored
+        # update employee that will be ignored, create a new one
         new_objs = [
-            Employee(name="Scott", age=100, company=c1)
+            Employee(name="Scott", age=100, company=c1),
+            Employee(name="Alice", age=36, company=c1)
         ]
 
         ret = bulk_sync(new_models=new_objs, filters=None, key_fields=("name",), skip_updates=True)
@@ -154,6 +167,15 @@ def test_skip_updates(self):
         new_e1 = Employee.objects.get(id=e1.id)
         self.assertEqual(40, new_e1.age)
 
+        # Isaac is "stale" object - was deleted, Alice was created
+        self.assertEqual(2, Employee.objects.count())
+        self.assertEqual(["Scott", "Alice"], [x.name for x in Employee.objects.all().order_by('id')])
+
+
+        self.assertEqual(0, ret["stats"]["updated"])
+        self.assertEqual(1, ret["stats"]["created"])
+        self.assertEqual(1, ret["stats"]["deleted"])
+
 
 
 class BulkCompareTests(TestCase):