Include pending acceptance when listing all speakers for an event

F30 · F30 · commit 94f0e8aa7c9c · 2024-12-18T11:24:31.000+01:00
This seems better in line with our principle of always showing the WiP
state.
diff --git a/src/samaware/queries.py b/src/samaware/queries.py
@@ -1,5 +1,6 @@
 from itertools import chain
 
+from django.db.models import Q
 from django.utils import timezone
 from django_scopes import scopes_disabled
 from pretalx.person.models import SpeakerProfile
@@ -13,7 +14,9 @@ def get_all_speakers(event):
     released schedule, whereas this considers the current submission states.
     """
 
-    accepted_submissions = event.submissions.filter(state__in=SubmissionStates.accepted_states)
+    accepted_submissions = event.submissions.filter(
+        Q(state__in=SubmissionStates.accepted_states) | Q(pending_state__in=SubmissionStates.accepted_states)
+    )
     profiles = SpeakerProfile.objects.filter(user__submissions__in=accepted_submissions)
 
     return profiles.distinct()
diff --git a/tests/test_queries.py b/tests/test_queries.py
@@ -23,6 +23,15 @@ def test_all_speakers(self):
         self.assertIn('Richard Khan', speaker_names)
         self.assertNotIn('Donna Bailey', speaker_names)
 
+        with scope(event=self.event):
+            submission = Submission.objects.get(state=SubmissionStates.REJECTED)
+            submission.pending_state = SubmissionStates.ACCEPTED
+            submission.save()
+
+            speakers = queries.get_all_speakers(self.event)
+
+        self.assertEqual(len(speakers), 6)
+
     def test_arrived_speakers(self):
         with scope(event=self.event):
             tammy = SpeakerProfile.objects.get(id=2)
