Fix see in schedule button (#1439)

* Fix URL used in "See in schedule" button.

Fixes #1438

* Add schedule string to "Show in schedule" button.

See #1438

* Handle case where event is None

* Add APIs to query UTC event datetimes.

Fix broken tests.

Author: malemburg

conference/models.py

@@ -2,6 +2,7 @@
 import os
 import os.path
 import uuid
+import pytz
 from collections import defaultdict
 from urllib.parse import urlencode
 
@@ -753,7 +754,7 @@ def get_schedule_url(self):
 
         url = event.schedule.get_absolute_url()
         slug = urlencode({'selected': self.slug})
-        time = event.start_time.strftime('%H:%M-UTC')
+        time = event.get_utc_start_datetime().strftime('%H:%M-UTC')
         return f"{url}?{slug}#{time}"
 
     def get_slides_url(self):
@@ -1182,11 +1183,45 @@ def get_duration(self):
             return 0
 
     def get_time_range(self):
+    
+        """ Return time range of the event in local time.
+        
+        """
         n = datetime.datetime.combine(self.schedule.date, self.start_time)
         return (
             n, (n + datetime.timedelta(seconds=self.get_duration() * 60))
         )
 
+    def get_utc_start_datetime(self):
+
+        """ Return start time as datetime in UTC.
+        
+        """
+        dt = datetime.datetime.combine(self.schedule.date, self.start_time)
+        return dt.astimezone(datetime.timezone.utc)
+
+    def get_utc_end_datetime(self):
+    
+        """ Return end time as datetime in UTC.
+        
+        """
+        return self.get_utc_start_datetime() + datetime.timedelta(
+            seconds=self.get_duration() * 60)
+
+    def get_schedule_string(self):
+    
+        """ Return a text representation of the scheduled slot.
+        
+        """
+        (start, end) = self.get_time_range()
+        duration = self.get_duration()
+        tz = pytz.timezone(settings.TIME_ZONE)
+        end = tz.localize(end)
+        return (
+            f'{start.strftime("%a, %b %d, %H:%M")}-'
+            f'{end.strftime("%H:%M %Z")} ({duration} min)'
+            )
+
     def get_description(self):
         if self.talk:
             return self.talk.title

conference/talks.py

@@ -145,7 +145,11 @@ def dump_relevant_talk_information_to_dict(talk: Talk, speaker_tickets=None):
         availability = talk.availability.split('|')
     event = talk.get_event()
     if event is not None:
-        event = event.json_dump()
+        event_json = event.json_dump()
+        event_schedule = event.get_schedule_string()
+    else:
+        event_json = None
+        event_schedule = ""
     output = {
         "title": talk.title,
         "uuid": talk.uuid,
@@ -164,8 +168,9 @@ def dump_relevant_talk_information_to_dict(talk: Talk, speaker_tickets=None):
         "status": talk.status,
         "tags": [t.name for t in talk.tags.all()],
         "speakers": [],
-        "event": event,
+        "event": event_json,
         "schedule_url": talk.get_schedule_url(),
+        "schedule_string": event_schedule,
         "slides_url": talk.get_slides_url(),
         "availability": availability,
     }

pycon/settings.py

@@ -95,6 +95,7 @@ def _(x):
 USE_TZ = True
 
 TIME_ZONE = 'Europe/Amsterdam'
+
 LANGUAGE_CODE = 'en'
 
 LANGUAGES = (

templates/conference/talks/talk.html

@@ -41,7 +41,7 @@ <h5>{% for speaker in talk_as_dict.speakers %}
                     {% endfor %}
                 </p>
                 {% if talk_as_dict.schedule_url %}
-                    <a class="btn btn-primary" href="{{ talk_as_dict.schedule_url }}">See in schedule</a>
+                    <a class="btn btn-primary" href="{{ talk_as_dict.schedule_url }}">See in schedule: {{ talk_as_dict.schedule_string }}</a>
                 {% endif %}
                 {% if talk_as_dict.slides_url %}
                     <a class="btn btn-primary" href="{{ talk_as_dict.slides_url }}">Download/View Slides</a>

tests/factories.py

@@ -427,8 +427,7 @@ class Meta:
 
     schedule = factory.SubFactory(ScheduleFactory)
     talk = factory.SubFactory(TalkFactory)
-    start_time = factory.LazyFunction(timezone.now)
-
+    start_time = factory.LazyAttribute(lambda _: timezone.now().time())
 
 class EventTrackFactory(factory.django.DjangoModelFactory):
     class Meta:

tests/test_talks.py

@@ -337,6 +337,13 @@ def test_show_talk_link_in_schedule(client):
     url = talk.get_absolute_url()
 
     response = client.get(url)
+    html = response.content.decode()
 
-    start_time = event.start_time.strftime('%H:%M-UTC')
-    assert f"{talk.slug}#{start_time}" in response.content.decode()
+    time_range = event.get_time_range()
+
+    utc_start = event.get_utc_start_datetime()
+    schedule_hash = utc_start.strftime('%H:%M-UTC')
+    assert f"{talk.slug}#{schedule_hash}" in html
+
+    schedule_string = event.get_schedule_string()
+    assert schedule_string in html