From 9e3be9d4ea06ce26f315357c7c50865c4f510f45 Mon Sep 17 00:00:00 2001
From: Eric Uriostigue <eric@cndr.io>
Date: Tue, 20 Feb 2024 13:59:04 -0700
Subject: [PATCH] fix(diff_against): support diffing against deleted records

---
 AUTHORS.rst                               |  1 +
 CHANGES.rst                               |  1 +
 simple_history/models.py                  |  4 +--
 simple_history/tests/tests/test_models.py | 32 +++++++++++++++++++----
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index fcf285f7..69ad93e0 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -43,6 +43,7 @@ Authors
 - Dmytro Shyshov (`xahgmah <https://github.com/xahgmah>`_)
 - Edouard Richard (`vied12 <https://github.com/vied12>` _)
 - Eduardo Cuducos
+- Eric Uriostigue (`euriostigue <https://github.com/euriostigue>`_)
 - Erik van Widenfelt (`erikvw <https://github.com/erikvw>`_)
 - Fábio Capuano (`fabiocapsouza <https://github.com/fabiocapsouza`_)
 - Filipe Pina (@fopina)
diff --git a/CHANGES.rst b/CHANGES.rst
index 653c6951..beb41314 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,6 +3,7 @@ Changes
 
 Unreleased
 ----------
+- Fixed `diff_against` to work with deleted objects (gh-1312)
 
 - Support custom History ``Manager`` and ``QuerySet`` classes (gh-1280)
 
diff --git a/simple_history/models.py b/simple_history/models.py
index a4b92271..6d1f6d54 100644
--- a/simple_history/models.py
+++ b/simple_history/models.py
@@ -965,8 +965,8 @@ def diff_against(self, old_history, excluded_fields=None, included_fields=None):
         current_values = model_to_dict(self, fields=fields)
 
         for field in fields:
-            old_value = old_values[field]
-            current_value = current_values[field]
+            old_value = None if old_history.history_type == "-" else old_values[field]
+            current_value = None if self.history_type == "-" else current_values[field]
 
             if old_value != current_value:
                 changes.append(ModelChange(field, old_value, current_value))
diff --git a/simple_history/tests/tests/test_models.py b/simple_history/tests/tests/test_models.py
index d24cb1d2..20e3615c 100644
--- a/simple_history/tests/tests/test_models.py
+++ b/simple_history/tests/tests/test_models.py
@@ -3,7 +3,6 @@
 import warnings
 from datetime import datetime, timedelta
 
-import django
 from django.apps import apps
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -28,7 +27,6 @@
     pre_create_historical_m2m_records,
     pre_create_historical_record,
 )
-from simple_history.tests.custom_user.models import CustomUser
 from simple_history.tests.tests.utils import (
     database_router_override_settings,
     database_router_override_settings_history_in_diff_db,
@@ -72,7 +70,6 @@
     HistoricalCustomFKError,
     HistoricalPoll,
     HistoricalPollWithHistoricalIPAddress,
-    HistoricalPollWithManyToMany_places,
     HistoricalState,
     InheritedRestaurant,
     Library,
@@ -85,8 +82,6 @@
     ModelWithMultipleNoDBIndex,
     ModelWithSingleNoDBIndexUnique,
     MultiOneToOne,
-    MyOverrideModelNameRegisterMethod1,
-    OverrideModelNameAsCallable,
     OverrideModelNameUsingBaseModel1,
     Person,
     Place,
@@ -837,6 +832,33 @@ def test_history_with_custom_queryset(self):
             {"Question 1"},
         )
 
+    def test_history_with_deletion_record(self):
+        question = "what's up?"
+        p = Poll.objects.create(question=question, pub_date=today)
+        poll_pk = p.pk
+        new_record = p.history.first()
+        p.delete()
+
+        deletion_record = HistoricalPoll.objects.get(id=poll_pk, history_type="-")
+
+        with self.assertNumQueries(0):
+            delta = new_record.diff_against(
+                deletion_record, included_fields=["question"]
+            )
+            self.assertEqual(delta.changed_fields, ["question"])
+            self.assertEqual(len(delta.changes), 1)
+            self.assertEqual(delta.changes[0].new, question)
+            self.assertEqual(delta.changes[0].old, None)
+
+        with self.assertNumQueries(0):
+            delta = deletion_record.diff_against(
+                new_record, included_fields=["question"]
+            )
+            self.assertEqual(delta.changed_fields, ["question"])
+            self.assertEqual(len(delta.changes), 1)
+            self.assertEqual(delta.changes[0].new, None)
+            self.assertEqual(delta.changes[0].old, question)
+
 
 class GetPrevRecordAndNextRecordTestCase(TestCase):
     def assertRecordsMatch(self, record_a, record_b):