fix: delete snippet before snippet group

Author: Marius Schulze

src/djangocms_snippet/models.py

@@ -116,10 +116,11 @@ def delete(self, *args, **kwargs):
         # check if this snippet was the only one connected to it
         # and if so, delete the grouper instance as well
 
+        deleted = super().delete(*args, **kwargs)
         if not Snippet.admin_manager.filter(snippet_grouper=self.snippet_grouper).exclude(id=self.id).exists():
             self.snippet_grouper.delete()
 
-        return super().delete(*args, **kwargs)
+        return deleted
 
 
 # Plugin model - just a pointer to Snippet

tests/test_models.py

@@ -1,12 +1,5 @@
 from cms.test_utils.testcases import CMSTestCase
-
-from djangocms_snippet.models import (
-    SEARCH_ENABLED,
-    Snippet,
-    SnippetGrouper,
-    SnippetPtr,
-)
-
+from djangocms_snippet.models import SEARCH_ENABLED, Snippet, SnippetGrouper, SnippetPtr
 from .utils.factories import SnippetPluginFactory, SnippetWithVersionFactory
 
 
@@ -21,6 +14,21 @@ def setUp(self):
         self.snippet_grouper = self.snippet.snippet_grouper
         SnippetPluginFactory(snippet_grouper=self.snippet_grouper, language=["en"])
 
+    def test_snippet_grouper_deleted_with_last_snippet(self):
+        grouper = SnippetGrouper.objects.create()
+        snippet = Snippet.objects.create(
+            name="Test Snippet",
+            snippet_grouper=grouper,
+            html="<p>test</p>",
+            template="",
+            slug="test-snippet-2",
+            site=self.snippet.site,
+        )
+        self.assertTrue(Snippet.objects.filter(pk=snippet.pk).exists())
+        self.assertTrue(SnippetGrouper.objects.filter(pk=grouper.pk).exists())
+        snippet.delete()
+        self.assertFalse(SnippetGrouper.objects.filter(pk=grouper.pk).exists())
+
     def test_settings(self):
         self.assertEqual(SEARCH_ENABLED, False)
 
@@ -46,10 +54,3 @@ def test_snippet_ptr_instance(self):
 
         # test strings
         self.assertEqual(instance.snippet_grouper.name, "test snippet")
-
-    def test_snippet_grouper_deletion(self):
-        grouper = SnippetGrouper.objects.all()
-        self.assertEqual(grouper.count(), 1)
-        self.snippet.delete()
-        grouper = SnippetGrouper.objects.all()
-        self.assertEqual(grouper.count(), 0)