fix #5028 Actually fix recursion bug when deleting authors

Author: joemull

src/submission/models.py

@@ -3325,7 +3325,7 @@ def remove_author_from_article(sender, instance, **kwargs):
     except ArticleAuthorOrder.DoesNotExist:
         pass
 
-    if instance.article and instance.article.authors.exists():
+    if instance.article and instance.author in instance.article.authors.all():
         instance.article.authors.remove(instance.author)
 
 

src/submission/tests/test_signals.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from django.test import TestCase
 
 from submission.models import FrozenAuthor
@@ -40,3 +42,37 @@ def test_signal_removes_all_frozen_authors_on_clear(self):
         self.article.authors.add(self.account1, self.account2)
         self.article.authors.clear()
         self.assertFalse(FrozenAuthor.objects.filter(article=self.article).exists())
+
+
+class TestRemoveAuthorFromArticleSignal(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.journal, _ = helpers.create_journals()
+        cls.article = helpers.create_article(title="Test Article", journal=cls.journal)
+        cls.account1 = helpers.create_user(
+            "[email protected]", ["author"], cls.journal
+        )
+        cls.author1 = helpers.create_frozen_author(cls.article, author=cls.account1)
+        cls.account2 = helpers.create_user(
+            "[email protected]", ["author"], cls.journal
+        )
+        cls.author2 = helpers.create_frozen_author(cls.article, author=cls.account2)
+        cls.article.authors.add(cls.account1, cls.account2)
+
+    def test_signal_removes_account_from_authors_m2m(self):
+        self.author1.delete()
+        self.assertEqual(
+            [self.account2],
+            [account for account in self.article.authors.all()],
+        )
+
+    @patch("submission.models.backwards_compat_authors")
+    def test_signal_does_not_trigger_backwards_compat_if_no_m2m_authors(
+        self, backwards_compat
+    ):
+        account3 = helpers.create_user(
+            "[email protected]", ["author"], self.journal
+        )
+        author3 = helpers.create_frozen_author(self.article, author=account3)
+        author3.delete()
+        backwards_compat.assert_not_called()