Merge lp:~cjohnston/summit/propose-meeting-not-attendee into lp:summit

[Chris Johnston]

Allows a user to propose a meeting without being an attendee. Creates an attendee record for this user

[lp:~cjohnston/summit/propose-meeting-not-attendee]

509. By Chris Johnston on 2013-03-14

flake8 support

[Michael Hall (mhall119)]

Line 230 does nothing.

Line 243 shouldn't be there.

Line 228, this will set the Attendee's end time to be 00:00:00 the morning of the last day of the summit, which would cause a schedule conflict for any session on the last day. It should either use 23:59:59 for the time portion, or add one day to the summit.date_end

review: Needs Fixing

[lp:~cjohnston/summit/propose-meeting-not-attendee]

510. By Chris Johnston on 2013-03-15

fixes per mhall119

511. By Chris Johnston on 2013-03-19

Fixes null issue with tests

512. By Chris Johnston on 2013-03-19

cleanup

513. By Chris Johnston on 2013-03-19

Update to trunk

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'requirements.txt'
--- requirements.txt	2013-03-19 16:30:35 +0000
+++ requirements.txt	2013-03-19 16:30:35 +0000
@@ -17,7 +17,7 @@
 python-dateutil==1.5
 simplejson==2.0.9
 wsgiref==0.1.2
-model-mommy==0.7
+model-mommy==0.8.1
 Markdown==2.1.1
 pylint
 

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2013-03-09 04:42:44 +0000
+++ summit/schedule/models/meetingmodel.py	2013-03-19 16:30:35 +0000
@@ -401,8 +401,7 @@
         if name:
             self.name = name[:100]
         else:
-            self.name = None
-
+            self.name = ""
         status = elem.get("status")
         if status:
             self.status = status

=== modified file 'summit/schedule/tests/__init__.py'
--- summit/schedule/tests/__init__.py	2013-02-27 03:29:31 +0000
+++ summit/schedule/tests/__init__.py	2013-03-19 16:30:35 +0000
@@ -30,3 +30,4 @@
 from private_scheduling import *
 from schedule import *
 from summit_model import *
+from propose_meeting import *

=== modified file 'summit/schedule/tests/meeting_model.py'
--- summit/schedule/tests/meeting_model.py	2013-02-27 03:29:31 +0000
+++ summit/schedule/tests/meeting_model.py	2013-03-19 16:30:35 +0000
@@ -509,8 +509,11 @@
         meeting.update_from_launchpad(elem)
         self.assertEqual(wiki_url, meeting.wiki_url)
 
-    def get_person_node(self, username, required=False):
-        elem = LaunchpadExportNode()
+    def get_person_node(self, username, name=None, required=False):
+        if name:
+            elem = LaunchpadExportNode(name=name)
+        else:
+            elem = LaunchpadExportNode()
         required_map = {True: "True", False: "False"}
         elem.add_child(
             "person",
@@ -526,20 +529,29 @@
             summit = factory.make_one(Summit)
         now = datetime.datetime.utcnow()
         one_hour = datetime.timedelta(hours=1)
-        return factory.make_one(
+        slot = factory.make_one(
             Slot,
             summit=summit,
             start=now+one_hour,
             end=now+one_hour+one_hour,
             type='open'
         )
+        return slot
 
     def make_summit_and_attendee(self):
-        username = "username"
-        user = factory.make_one(User, username=username)
         summit = factory.make_one(Summit)
         slot = self.make_one_future_slot(summit=summit)
-        attendee = summit.attendee_set.create(
+        user = factory.make_one(
+            User,
+            username='testuser',
+            first_name='Test',
+            last_name='User',
+            is_active=True,
+            is_superuser=False,
+        )
+        attendee = factory.make_one(
+            Attendee,
+            summit=summit,
             user=user,
             start_utc=slot.start_utc,
             end_utc=slot.end_utc
@@ -555,9 +567,10 @@
             summit=summit,
             private=False
         )
-        name = meeting.name
+        meeting_name = meeting.name
         elem = self.get_person_node(
             attendee.user.username,
+            meeting_name,
             required=False,
         )
         meeting.update_from_launchpad(elem)
@@ -574,10 +587,14 @@
             summit=summit,
             private=False
         )
-        name = meeting.name
+        meeting_name = meeting.name
+        username = attendee.user.username
+        required = True
+
         elem = self.get_person_node(
-            attendee.user.username,
-            required=True,
+            username,
+            meeting_name,
+            required,
         )
         meeting.update_from_launchpad(elem)
         participant = meeting.participant_set.get()
@@ -586,7 +603,7 @@
     def test_update_from_launchpad_sets_from_launchpad(self):
         summit, attendee = self.make_summit_and_attendee()
         meeting = summit.meeting_set.create()
-        elem = self.get_person_node(attendee.user.username)
+        elem = self.get_person_node(attendee.user.username, meeting.name)
         meeting.update_from_launchpad(elem)
         participant = meeting.participant_set.get()
         self.assertEqual(True, participant.from_launchpad)
@@ -594,15 +611,20 @@
     def test_update_from_launchpad_removes_from_launchpad_unsubscribed(self):
         summit, attendee = self.make_summit_and_attendee()
         meeting = summit.meeting_set.create()
-        elem = self.get_person_node(attendee.user.username)
+        elem = self.get_person_node(attendee.user.username, meeting.name)
+        slot = self.make_one_future_slot(summit=summit)
         otheruser = factory.make_one(User, username="otheruser")
-        otherattendee = summit.attendee_set.create(user=otheruser)
+        otherattendee = summit.attendee_set.create(
+            user=otheruser,
+            start_utc=slot.start_utc,
+            end_utc=slot.end_utc
+        )
         meeting.participant_set.create(
             attendee=otherattendee,
-            from_launchpad=True
+            from_launchpad=True,
         )
         meeting.update_from_launchpad(elem)
         usernames = [
             p.attendee.user.username for p in meeting.participant_set.all()
         ]
-        self.assertEqual(["username"], usernames)
+        self.assertEqual(["testuser"], usernames)

=== added file 'summit/schedule/tests/propose_meeting.py'
--- summit/schedule/tests/propose_meeting.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/tests/propose_meeting.py	2013-03-19 16:30:35 +0000
@@ -0,0 +1,187 @@
+# The Summit Scheduler web application
+# Copyright (C) 2008 - 2013 Ubuntu Community, Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import datetime
+
+from django import test as djangotest
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+from django.test.client import Client
+
+from model_mommy import mommy as factory
+
+from summit.schedule.models import (
+    Summit,
+    Slot,
+    Attendee,
+    Meeting,
+    Track,
+    Room,
+)
+
+
+class ProposeMeetingSummitTestCase(djangotest.TestCase):
+    """
+    Tests for the propose meeting functions
+    """
+
+    c = Client()
+
+    def setUp(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        week = datetime.timedelta(days=5)
+        self.summit = factory.make_one(
+            Summit,
+            name='uds-virt',
+            virtual_summit=True,
+            date_start=now,
+            date_end=now + week,
+        )
+
+        self.slot = factory.make_one(
+            Slot,
+            start_utc=now+one_hour,
+            end_utc=now+(2*one_hour),
+            type='open',
+            summit=self.summit
+        )
+        self.track = factory.make_one(Track, summit=self.summit, title='test')
+        self.room = factory.make_one(
+            Room,
+            summit=self.summit,
+            type='open',
+            irc_channel='test-channel',
+        )
+
+        self.user1 = factory.make_one(
+            User,
+            username='testuser',
+            first_name='Test',
+            last_name='User',
+            is_active=True,
+            is_superuser=False,
+        )
+        self.user1.set_password('password')
+        self.user1.save()
+
+    def tearDown(self):
+        self.client.logout()
+
+    def login(self):
+        logged_in = self.c.login(
+            username='testuser',
+            password='password')
+        self.assertTrue(logged_in)
+
+    def view_and_save_propose_meeting_form(self):
+        """
+        Tests that a user, attendee or not, can propose a meeting
+        """
+        # View the edit meeting hangout form
+        rev_args = [self.summit.name, ]
+        response = self.c.get(
+            reverse(
+                'summit.schedule.views.propose_meeting',
+                args=rev_args
+            )
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'schedule/propose_meeting.html')
+
+        # Define data to fill our the form
+        title = 'Test Meeting'
+        description = "This is a test meeting."
+        tracks = [self.track.pk]
+        spec_url = "http://www.example.com/spec"
+        wiki_url = "http://www.example.com/wiki"
+        pad_url = "http://www.example.com/pad"
+        csrf_token = '%s' % response.context['csrf_token']
+
+        # Post the form
+        post = self.c.post(
+            reverse(
+                'summit.schedule.views.propose_meeting',
+                args=rev_args
+            ),
+            data={
+                'csrfmiddlewaretoken': csrf_token,
+                'title': title,
+                'description': description,
+                'tracks': tracks,
+                'spec_url': spec_url,
+                'wiki_url': wiki_url,
+                'pad_url': pad_url,
+            }
+        )
+
+        # A successful post should redirect to the meeting page
+        response = self.view_meeting_page()
+        meeting = Meeting.objects.get(title='Test Meeting')
+        redirect_args = [self.summit.name, meeting.id, meeting.name]
+        redirect_url = reverse(
+            'summit.schedule.views.meeting',
+            args=redirect_args
+        )
+        self.assertEqual(post.status_code, 302)
+        self.assertRedirects(
+            post,
+            redirect_url,
+        )
+        redirect_response = self.c.get(redirect_url)
+
+        # Verify that the new data appears on the meeting page
+        self.assertEqual(redirect_response.status_code, 200)
+        self.assertIn("Test Meeting", redirect_response.content)
+
+    def view_meeting_page(self):
+        meeting = Meeting.objects.get(title='Test Meeting')
+        rev_args = [self.summit.name, meeting.id, meeting.name]
+        response = self.c.get(
+            reverse(
+                'summit.schedule.views.meeting',
+                args=rev_args
+            )
+        )
+        self.assertEqual(response.status_code, 200)
+
+        return response
+
+    def test_propose_meeting_no_attendee(self):
+        """
+        Tests that a user who is not an attendee can propose a meeting
+        and that an attendee record is created when the user does.
+        """
+
+        self.login()
+
+        self.view_and_save_propose_meeting_form()
+
+    def test_propose_meeting_with_attendee(self):
+        """
+        Tests that a user who is not an attendee can propose a meeting
+        and that an attendee record is created when the user does.
+        """
+
+        self.attendee1 = factory.make_one(
+            Attendee,
+            summit=self.summit,
+            user=self.user1,
+            start_utc=self.summit.date_start,
+            end_utc=self.summit.date_end
+        )
+
+        self.login()

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-03-07 22:33:12 +0000
+++ summit/schedule/views.py	2013-03-19 16:30:35 +0000
@@ -24,7 +24,7 @@
 from django.core.urlresolvers import reverse
 from django.utils.datastructures import SortedDict
 from django.views.decorators.csrf import csrf_exempt
-from django.views.decorators.csrf import csrf_protect
+from django.contrib.auth.decorators import login_required
 
 from summit.schedule.decorators import (
     summit_required,
@@ -716,8 +716,18 @@
     )
 
 
-@summit_attendee_required
+@login_required
+@summit_required
 def propose_meeting(request, summit, attendee):
+    eod=datetime.time(23, 59, 59)
+    eos=summit.date_end
+    if attendee is None:
+        attendee = Attendee.objects.create(
+            summit=summit,
+            user=request.user,
+            start_utc=summit.date_start,
+            end_utc=datetime.datetime.combine(eos, eod)
+        )
 
     meeting = Meeting(
         summit=summit,

=== modified file 'summit/ubuntu_settings.py'
--- summit/ubuntu_settings.py	2013-02-26 22:28:51 +0000
+++ summit/ubuntu_settings.py	2013-03-19 16:30:35 +0000
@@ -14,7 +14,7 @@
     import ubuntu_website
 
     INSTALLED_APPS.append('ubuntu_website')
-    
+
     TEMPLATE_CONTEXT_PROCESSORS += (
         "ubuntu_website.media_processor",
         "ubuntu_website.popup_check",