Merge lp:~mhall119/summit/show-hangout-url-to-all into lp:summit

[Michael Hall]

Show the link to join a hangout to any attendee of the summit, but only show it if during the time the meeting takes place, not before or after

Show the link to join a hangout to any attendee of the summit, but only show it if during the time the meeting takes place, not before or after

[Joe Talbott (joetalbott)]

review: Approve

[Chris Johnston (cjohnston)]

The prerequisite https://code.launchpad.net/~mhall119/summit/fix-edit-meeting-link-1248193 has not yet been merged into https://code.launchpad.net/~summit-hackers/summit/trunk.

[Chris Johnston (cjohnston)]

The `tree_dir` option for the target branch is not a lightweight checkout. Please ask a project administrator to resolve the issue, and try again.

[Chris Johnston (cjohnston)]

The `tree_dir` option for the target branch is not a lightweight checkout. Please ask a project administrator to resolve the issue, and try again.

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2013-05-14 01:08:35 +0000
+++ summit/schedule/models/meetingmodel.py	2013-11-05 20:58:24 +0000
@@ -715,3 +715,10 @@
                         )
 
         return False
+
+    @property
+    def current(self):
+        for agenda in self.agenda_set.all():
+            if agenda.slot.current:
+                return True
+        return False

=== modified file 'summit/schedule/models/slotmodel.py'
--- summit/schedule/models/slotmodel.py	2013-02-26 19:31:21 +0000
+++ summit/schedule/models/slotmodel.py	2013-11-05 20:58:24 +0000
@@ -124,3 +124,11 @@
         except IndexError:
             prev_slot = None
         return prev_slot
+
+    @property
+    def current(self):
+        now = datetime.utcnow()
+        if now >= self.start_utc and now <= self.end_utc:
+            return True
+        else:
+            return False

=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	2013-11-05 20:58:24 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2013-11-05 20:58:24 +0000
@@ -93,7 +93,7 @@
         {% endif %}
         <div id="description">
             {{ meeting.description|markdown:'safe' }}
-            {% if required and meeting.hangout_url %}
+            {% if meeting.current and attendee and meeting.hangout_url %}
                 <h3><a href="{{ meeting.hangout_url }}">Join the Hangout on Air</a></h3>
             {% endif %}
         </div>

=== modified file 'summit/schedule/tests/meeting_model.py'
--- summit/schedule/tests/meeting_model.py	2013-05-14 01:38:55 +0000
+++ summit/schedule/tests/meeting_model.py	2013-11-05 20:58:24 +0000
@@ -824,3 +824,30 @@
                 approved='REMOVED'
             ).count()
         )
+        
+    def test_meetings_current(self):
+        # A meeting without an agenda is never current
+        self.assertFalse(self.meeting.current)
+        
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        # A meeting in a future slot is not current
+        slot = factory.make_one(
+            Slot,
+            start_utc=now + one_hour,
+            end_utc=now + one_hour + one_hour,
+            type='open')
+        agenda = factory.make_one(Agenda, meeting=self.meeting, slot=slot)
+        self.assertFalse(self.meeting.current)
+
+        # A meeting in a past slot is not current
+        slot.start_utc = now - one_hour - one_hour
+        slot.end_utc = now - one_hour
+        slot.save()
+        self.assertFalse(self.meeting.current)
+
+        # A meeting happening now is current
+        slot.start_utc = now
+        slot.end_utc = now + one_hour
+        slot.save()
+        self.assertTrue(self.meeting.current)

=== modified file 'summit/schedule/tests/meeting_page.py'
--- summit/schedule/tests/meeting_page.py	2013-11-05 20:58:24 +0000
+++ summit/schedule/tests/meeting_page.py	2013-11-05 20:58:24 +0000
@@ -33,6 +33,7 @@
     Attendee,
     Track,
     Lead,
+    Participant,
 )
 
 site_root = getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com')
@@ -192,3 +193,88 @@
             'Edit meeting',
             1
         )
+
+    def test_join_hangout_link_visible_if_attending(self):
+        """ Tests that the link to join a hangout is present if the user is attending the summit """
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        summit = factory.make_one(Summit, name='uds-test', virtual_summit=True)
+        summit.save()
+        slot = factory.make_one(
+            Slot,
+            start_utc=now,
+            end_utc=now+one_hour,
+            type='open',
+            summit=summit
+        )
+        slot.save()
+
+        room = factory.make_one(Room, summit=summit)
+
+        meeting = factory.make_one(
+            Meeting,
+            summit=summit,
+            name='test-meeting',
+            private=False,
+            hangout_url='http://test.com/test'
+        )
+        agenda = factory.make_one(
+            Agenda,
+            slot=slot,
+            meeting=meeting,
+            room=room
+        )
+
+        user = factory.make_one(
+            User,
+            username='testuser',
+            first_name='Test',
+            last_name='User',
+            is_active=True,
+            is_staff=False,
+            is_superuser=False,
+        )
+        user.set_password('password')
+        user.save()
+        
+        # get meeting page url
+        rev_args = ['uds-test', meeting.id, 'test-meeting']
+        reverse_url = reverse('summit.schedule.views.meeting', args=rev_args)
+
+        # check before logging in
+        response = self.client.get(reverse_url)
+        self.assertEquals(response.status_code, 200)
+        self.assertContains(
+            response,
+            '<a href="%s">Join the Hangout on Air</a>' % meeting.hangout_url,
+            0
+        )
+
+        logged_in = self.client.login(username='testuser', password='password')
+        self.assertTrue(logged_in)
+
+        # check after logging in, but not attending
+        response = self.client.get(reverse_url)
+        self.assertEquals(response.status_code, 200)
+        self.assertContains(
+            response,
+            '<a href="%s">Join the Hangout on Air</a>' % meeting.hangout_url,
+            0
+        )
+
+        attendee = factory.make_one(
+            Attendee,
+            summit=summit,
+            user=user,
+            start_utc=now,
+            end_utc=now+one_hour
+        )        
+
+        # check after logging in and attending
+        response = self.client.get(reverse_url)
+        self.assertEquals(response.status_code, 200)
+        self.assertContains(
+            response,
+            '<a href="%s">Join the Hangout on Air</a>' % meeting.hangout_url,
+            1
+        )

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-05-10 15:03:51 +0000
+++ summit/schedule/views.py	2013-11-05 20:58:24 +0000
@@ -486,6 +486,7 @@
     context = {
         'summit': summit,
         'meeting': meeting,
+        'attendee': attendee,
         'agenda_items': agendaitems,
         'participants': participants,
         'attendees': attendees,