Multi speaker support

app-dev.Dockerfile

@@ -3,6 +3,7 @@ MAINTAINER Jan Dittberner <[email protected]>
 LABEL vendor="T-Systems Multimedia Solutions GmbH"
 
 ARG http_proxy
+ARG https_proxy
 ARG no_proxy
 
 RUN apk --no-cache add \

app-prod.Dockerfile

@@ -3,6 +3,7 @@ MAINTAINER Jan Dittberner <[email protected]>
 LABEL vendor="T-Systems Multimedia Solutions GmbH"
 
 ARG http_proxy
+ARG https_proxy
 ARG no_proxy
 
 VOLUME /app/media /app/static /app/logs

devday/attendee/views.py

@@ -190,9 +190,7 @@ def get_success_url(self, user=None):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context.update(
-            {"auth_level": self.auth_level, "event": self.event,}
-        )
+        context.update({"auth_level": self.auth_level, "event": self.event})
         return context
 
     def get_form_class(self, request=None):
@@ -503,7 +501,7 @@ def render_to_response(self, context):
             writer.writerow(("Email", "Date joined"))
             writer.writerows(
                 [
-                    (u.email, u.date_joined.strftime("%Y-%m-%d %H:%M:%S"),)
+                    (u.email, u.date_joined.strftime("%Y-%m-%d %H:%M:%S"))
                     for u in context.get("object_list", [])
                 ]
             )
@@ -594,7 +592,7 @@ def get_object(self, queryset=None):
 
     def _get_unpublished_talks(self):
         return Talk.objects.filter(
-            published_speaker__isnull=True, draft_speaker__user=self.request.user
+            published_speakers__isnull=True, draft_speakers__user=self.request.user
         )
 
     def get_context_data(self, **kwargs):

devday/devday/tests/test_views.py

@@ -18,7 +18,7 @@
 from speaker.models import PublishedSpeaker, Speaker
 from speaker.tests import speaker_testutils
 from talk import COMMITTEE_GROUP
-from talk.models import Talk
+from talk.models import Talk, TalkPublishedSpeaker
 
 User = get_user_model()
 
@@ -167,13 +167,17 @@ def setUp(self):
         published_speaker = PublishedSpeaker.objects.copy_from_speaker(
             speaker, Event.objects.current_event()
         )
-        Talk.objects.create(
-            published_speaker=published_speaker,
+        talk = Talk.objects.create(
+            draft_speaker=speaker,
             title="Test",
             abstract="Test abstract",
             remarks="Test remarks",
             event=Event.objects.current_event(),
         )
+        TalkPublishedSpeaker.objects.create(
+            talk=talk, published_speaker=published_speaker, order=1
+        )
+        talk.draft_speakers.clear()
 
     def test_form_choices(self):
         self.assertEqual(

devday/devday/utils/devdata.py

@@ -42,6 +42,7 @@
     TimeSlot,
     Track,
     Vote,
+    TalkDraftSpeaker,
 )
 from twitterfeed.models import Tweet, TwitterProfileImage
 
@@ -486,14 +487,13 @@ def create_speakers(self, events=None):
         return self.get_speakers()
 
     def create_talk(self, speaker, formats, event):
-        talk = Talk(
+        talk = Talk.objects.create(
             draft_speaker=speaker,
             title=Words.sentence(self.rng).title(),
             abstract=lorem.paragraph(),
             remarks=lorem.paragraph(),
             event=event,
         )
-        talk.save()
         talk.talkformat.add(
             *self.rng.sample(formats, self.rng.randint(1, len(formats)))
         )

devday/event/management/commands/export_talks_for_committee.py

@@ -26,9 +26,9 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         talks = (
             Event.objects.current_event()
-                .talk_set.all()
-                .prefetch_related('talkcomment_set')
-                .annotate(num_votes=Count("vote"), avg_votes=Avg("vote__score"))
+            .talk_set.all()
+            .prefetch_related("talkcomment_set")
+            .annotate(num_votes=Count("vote"), avg_votes=Avg("vote__score"))
             .order_by("-avg_votes", "title")
         )
 
@@ -41,10 +41,21 @@ def handle(self, *args, **options):
             outfile = self.stdout
 
         out = csv.writer(outfile, dialect=csv.excel, lineterminator="\n")
-        out.writerow(("Speaker", "Title", "Abstract", "Votes", "Avg. Score", "Comments"))
+        out.writerow(
+            ("Speaker", "Title", "Abstract", "Votes", "Avg. Score", "Comments")
+        )
         for t in talks:
             row = (
-                t.draft_speaker.name, t.title, t.abstract, t.num_votes, t.avg_votes,
-                "\n".join([f"{v.created} {v.commenter.email}: {v.comment}" for v in
-                           t.talkcomment_set.order_by('created').all()]))
+                "\n".join([s.name for s in t.draft_speakers.all()]),
+                t.title,
+                t.abstract,
+                t.num_votes,
+                t.avg_votes,
+                "\n".join(
+                    [
+                        f"{v.created} {v.commenter.email}: {v.comment}"
+                        for v in t.talkcomment_set.order_by("created").all()
+                    ]
+                ),
+            )
             out.writerow(row)