Double check for deleted items since history_date can match

Author: macro1

simple_history/manager.py

@@ -87,7 +87,8 @@ def _as_of_set(self, date):
         queryset = self.filter(history_date__lte=date)
         for original_pk in set(
                 queryset.order_by().values_list(pk_attr, flat=True)):
-            last_change = queryset.filter(
-                **{pk_attr: original_pk}).latest('history_date')
-            if last_change.history_type != '-':
-                yield last_change.instance
+            changes = queryset.filter(**{pk_attr: original_pk})
+            last_change = changes.latest('history_date')
+            if changes.filter(history_date=last_change.history_date, history_type='-').exists():
+                continue
+            yield last_change.instance

simple_history/tests/tests/test_manager.py

@@ -66,3 +66,16 @@ def test_modified(self):
         as_of_list = list(
             self.model.history.as_of(self.now - timedelta(days=1)))
         self.assertEqual(as_of_list[0].changed_by, self.obj.changed_by)
+
+
+class AsOfAdditionalTestCase(TestCase):
+
+    def test_create_and_delete(self):
+        now = datetime.now()
+        document = models.Document.objects.create()
+        document.delete()
+        for doc_change in models.Document.history.all():
+            doc_change.history_date = now
+            doc_change.save()
+        docs_as_of_tmw = models.Document.history.as_of(now + timedelta(days=1))
+        self.assertFalse(list(docs_as_of_tmw))