cospeakers support

Author: marcoacierno

backend/schedule/models.py

@@ -309,12 +309,13 @@ def speakers(self):
         if self.submission_id:
             speakers.append(self.submission.speaker)
 
-        speakers.extend([speaker.user for speaker in self.additional_speakers.all()])
-
         if self.keynote_id:
-            for speaker_keynote in self.keynote.speakers.all():
+            for speaker_keynote in self.keynote.speakers.order_by("id").all():
                 speakers.append(speaker_keynote.user)
 
+        speakers.extend(
+            [speaker.user for speaker in self.additional_speakers.order_by("id").all()]
+        )
         return speakers
 
     def clean(self):

backend/schedule/tasks.py

@@ -381,24 +381,45 @@ def process_schedule_items_videos_to_upload():
 @app.task
 def create_and_send_voucher_to_speaker(schedule_item_id: int):
     schedule_item = ScheduleItem.objects.get(id=schedule_item_id)
+    speakers = schedule_item.speakers
 
-    if not schedule_item.submission_id:
+    if not speakers:
         return
 
+    speaker = speakers[0]
+    co_speaker = speakers[1] if len(speakers) > 1 else None
+
+    _send_conference_voucher(
+        speaker,
+        schedule_item.conference,
+        ConferenceVoucher.VoucherType.SPEAKER,
+    )
+
+    if co_speaker:
+        _send_conference_voucher(
+            co_speaker,
+            schedule_item.conference,
+            ConferenceVoucher.VoucherType.CO_SPEAKER,
+        )
+
+
+def _send_conference_voucher(user, conference, voucher_type):
     conference_voucher = (
-        ConferenceVoucher.objects.for_conference(schedule_item.conference)
-        .for_user(schedule_item.submission.speaker)
-        .first()
+        ConferenceVoucher.objects.for_conference(conference).for_user(user).first()
     )
 
     if conference_voucher:
-        # Speaker already has a voucher
+        logger.info(
+            "User %s already has a voucher for conference %s, not creating a new one",
+            user.id,
+            conference.id,
+        )
         return
 
     conference_voucher = create_conference_voucher(
-        conference=schedule_item.conference,
-        user=schedule_item.submission.speaker,
-        voucher_type=ConferenceVoucher.VoucherType.SPEAKER,
+        conference=conference,
+        user=user,
+        voucher_type=voucher_type,
     )
 
     send_conference_voucher_email.delay(conference_voucher_id=conference_voucher.id)

backend/schedule/tests/test_tasks.py

@@ -24,6 +24,7 @@
     upload_schedule_item_video,
 )
 from schedule.tests.factories import (
+    ScheduleItemAdditionalSpeakerFactory,
     ScheduleItemFactory,
     ScheduleItemSentForVideoUploadFactory,
 )
@@ -762,6 +763,61 @@ def test_create_and_send_voucher_to_speaker(mocker):
     mock_send_email.delay.assert_called_once()
 
 
+def test_create_and_send_voucher_to_speaker_to_speaker_and_co_speakers(mocker):
+    mock_create = mocker.patch(
+        "conferences.vouchers.create_voucher", return_value={"id": 123}
+    )
+    mock_send_email = mocker.patch("schedule.tasks.send_conference_voucher_email")
+
+    schedule_item = ScheduleItemFactory(
+        type=ScheduleItem.TYPES.talk,
+    )
+    additional_speaker_1 = ScheduleItemAdditionalSpeakerFactory(
+        scheduleitem=schedule_item
+    ).user
+    additional_speaker_2 = ScheduleItemAdditionalSpeakerFactory(
+        scheduleitem=schedule_item
+    ).user
+
+    create_and_send_voucher_to_speaker(schedule_item.id)
+
+    speaker_voucher = (
+        ConferenceVoucher.objects.for_conference(schedule_item.conference)
+        .filter(
+            user=schedule_item.submission.speaker,
+            voucher_type=ConferenceVoucher.VoucherType.SPEAKER,
+        )
+        .get()
+    )
+
+    co_speaker_voucher = (
+        ConferenceVoucher.objects.for_conference(schedule_item.conference)
+        .filter(
+            user=additional_speaker_1,
+            voucher_type=ConferenceVoucher.VoucherType.CO_SPEAKER,
+        )
+        .get()
+    )
+
+    assert not (
+        ConferenceVoucher.objects.for_conference(schedule_item.conference)
+        .filter(
+            user=additional_speaker_2,
+            voucher_type=ConferenceVoucher.VoucherType.CO_SPEAKER,
+        )
+        .exists()
+    )
+
+    assert mock_create.call_count == 2
+    mock_send_email.delay.assert_has_calls(
+        [
+            mock.call(conference_voucher_id=speaker_voucher.id),
+            mock.call(conference_voucher_id=co_speaker_voucher.id),
+        ],
+        any_order=True,
+    )
+
+
 def test_create_and_send_voucher_to_speaker_works_if_existing_voucher_is_for_different_conf(
     mocker,
 ):
@@ -808,7 +864,7 @@ def test_create_and_send_voucher_to_speaker_does_nothing_if_voucher_exists(mocke
     mock_send_email.delay.assert_not_called()
 
 
-def test_create_and_send_voucher_to_speaker_does_nothing_if_schedule_item_does_not_have_submission(
+def test_create_and_send_voucher_to_speaker_does_nothing_if_schedule_item_does_not_hav_speakers(
     mocker,
 ):
     mock_create = mocker.patch("conferences.vouchers.create_voucher")