fixup! ⚡️(back) restrict documents to restore using only the queryset

lunika · lunika · commit 98cd049e3f34 · 2025-03-04T13:30:37.000+01:00
diff --git a/src/backend/core/models.py b/src/backend/core/models.py
@@ -802,7 +802,7 @@ def restore(self):
             .first()
         )
         self.ancestors_deleted_at = ancestors_deleted_at
-        self.save()
+        self.save(update_fields=["deleted_at", "ancestors_deleted_at"])
 
         self.get_descendants().exclude(
             models.Q(deleted_at__isnull=False)
diff --git a/src/backend/core/tests/test_models_documents.py b/src/backend/core/tests/test_models_documents.py
@@ -767,21 +767,22 @@ def test_models_documents_nb_accesses_cache_is_invalidated_on_access_removal(
     assert cache.get(key) == 0  # Cache should now contain the new value
 
 
-def test_models_documents_restore():
+def test_models_documents_restore(django_assert_num_queries):
     """The restore method should restore a soft-deleted document."""
     document = factories.DocumentFactory()
     document.soft_delete()
     document.refresh_from_db()
     assert document.deleted_at is not None
     assert document.ancestors_deleted_at == document.deleted_at
 
-    document.restore()
+    with django_assert_num_queries(6):
+        document.restore()
     document.refresh_from_db()
     assert document.deleted_at is None
     assert document.ancestors_deleted_at == document.deleted_at
 
 
-def test_models_documents_restore_complex():
+def test_models_documents_restore_complex(django_assert_num_queries):
     """The restore method should restore a soft-deleted document and its ancestors."""
     grand_parent = factories.DocumentFactory()
     parent = factories.DocumentFactory(parent=grand_parent)
@@ -817,7 +818,8 @@ def test_models_documents_restore_complex():
     assert child2.ancestors_deleted_at == document.deleted_at
 
     # Restore the item
-    document.restore()
+    with django_assert_num_queries(8):
+        document.restore()
     document.refresh_from_db()
     child1.refresh_from_db()
     child2.refresh_from_db()
@@ -829,7 +831,7 @@ def test_models_documents_restore_complex():
     assert child2.ancestors_deleted_at == grand_parent.deleted_at
 
 
-def test_models_documents_restore_complex_bis():
+def test_models_documents_restore_complex_bis(django_assert_num_queries):
     """The restore method should restore a soft-deleted item and its ancestors."""
     grand_parent = factories.DocumentFactory()
     parent = factories.DocumentFactory(parent=grand_parent)
@@ -866,7 +868,9 @@ def test_models_documents_restore_complex_bis():
 
     # Restoring the grand parent should not restore the document
     # as it was deleted before the grand parent
-    grand_parent.restore()
+    with django_assert_num_queries(7):
+        grand_parent.restore()
+
     grand_parent.refresh_from_db()
     parent.refresh_from_db()
     document.refresh_from_db()

Original file line number	Diff line number	Diff line change
`@@ -802,7 +802,7 @@ def restore(self):`
`802`	`802`	`.first()`
`803`	`803`	`)`
`804`	`804`	`self.ancestors_deleted_at = ancestors_deleted_at`
`805`		`- self.save()`
	`805`	`+ self.save(update_fields=["deleted_at", "ancestors_deleted_at"])`
`806`	`806`
`807`	`807`	`self.get_descendants().exclude(`
`808`	`808`	`models.Q(deleted_at__isnull=False)`