Merge lp:~mhall119/summit/create-attendee-for-bp-usernames into lp:summit

[Michael Hall]

Creates Attendee records if no matching record exists when importing data from Launchpad

Creates Attendee records if no matching record exists when importing data from Launchpad

[lp:~mhall119/summit/create-attendee-for-bp-usernames]

551. By Michael Hall on 2013-05-14

Don't attempt to lookup or create an Attendee if no username is provided

[Adnane Belmadiaf (daker)]

+1, i suppose the tests are OK

review: Approve

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2013-05-06 15:51:05 +0000
+++ summit/schedule/models/meetingmodel.py	2013-05-14 01:45:32 +0000
@@ -463,31 +463,17 @@
         self.drafter = None
         drafter = elem.get("drafter")
         if drafter:
-            try:
-                self.drafter = self.summit.attendee_set.get(
-                    user__username__exact=drafter)
-            except ObjectDoesNotExist:
-                pass
+            self.drafter = self.summit.get_attendee_record(drafter)
 
         self.assignee = None
         assignee = elem.get("assignee")
         if assignee:
-            try:
-                self.assignee = self.summit.attendee_set.get(
-                    user__username__exact=assignee
-                )
-            except ObjectDoesNotExist:
-                pass
+            self.assignee = self.summit.get_attendee_record(assignee)
 
         self.approver = None
         approver = elem.get("approver")
         if approver:
-            try:
-                self.approver = self.summit.attendee_set.get(
-                    user__username__exact=approver
-                )
-            except ObjectDoesNotExist:
-                pass
+            self.approver = self.summit.get_attendee_record(approver)
 
         # Lookup other participants, again ignoring any not attending.
         from_lp = set()
@@ -499,11 +485,8 @@
 
             required = p_elem.get("required", "False") != "False"
 
-            try:
-                attendee = self.summit.attendee_set.get(
-                    user__username__exact=username
-                )
-
+            attendee = self.summit.get_attendee_record(username)
+            if attendee is not None:
                 try:
                     participant = self.participant_set.get(
                         attendee=attendee
@@ -524,8 +507,6 @@
                     else:
                         participant.participation = 'ATTENDING'
                 participant.save()
-            except ObjectDoesNotExist:
-                pass
 
         self.participant_set.filter(
             from_launchpad=True

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2013-05-06 19:14:43 +0000
+++ summit/schedule/models/summitmodel.py	2013-05-14 01:45:32 +0000
@@ -19,7 +19,7 @@
 import time
 import urllib2
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time
 
 try:
     from xml.etree import ElementTree
@@ -514,6 +514,26 @@
             return self.lead_set.filter(lead=attendee).exists()
         return False
 
+    def get_attendee_record(self, username):
+        if username is None or username == '':
+            return None
+            
+        try:
+            user = User.objects.get(username__exact=username)
+            eod = time(23, 59, 59)
+            eos = self.date_end
+            attendee, created = self.attendee_set.get_or_create(
+                summit=self,
+                user=user,
+                defaults={
+                    'start_utc': self.date_start,
+                    'end_utc': datetime.combine(eos, eod)
+                }
+            )
+            return attendee
+        except:
+            return None
+        
 
 class SummitSprint(models.Model):
 

=== modified file 'summit/schedule/tests/meeting_model.py'
--- summit/schedule/tests/meeting_model.py	2013-05-06 16:17:11 +0000
+++ summit/schedule/tests/meeting_model.py	2013-05-14 01:45:32 +0000
@@ -546,8 +546,25 @@
         )
         return slot
 
+    def make_summit_only(self):
+        today = datetime.datetime.utcnow()
+        one_week = datetime.timedelta(days=5)
+        summit = factory.make_one(Summit, date_start=today, date_end=today+one_week)
+        slot = self.make_one_future_slot(summit=summit)
+        user = factory.make_one(
+            User,
+            username='testuser',
+            first_name='Test',
+            last_name='User',
+            is_active=True,
+            is_superuser=False,
+        )
+        return summit
+
     def make_summit_and_attendee(self):
-        summit = factory.make_one(Summit)
+        today = datetime.datetime.utcnow()
+        one_week = datetime.timedelta(days=5)
+        summit = factory.make_one(Summit, date_start=today, date_end=today+one_week)
         slot = self.make_one_future_slot(summit=summit)
         user = factory.make_one(
             User,
@@ -566,6 +583,44 @@
         )
         return summit, attendee
 
+    def test_update_from_launchpad_creates_attendee(self):
+        summit = self.make_summit_only()
+        self.assertEquals(summit.attendee_set.filter(user__username='testuser').count(), 0)
+        meeting = factory.make_one(
+            Meeting,
+            pad_url=None,
+            name='test-meeting',
+            summit=summit,
+            private=False
+        )
+        meeting_name = meeting.name
+        elem = self.get_person_node(
+            'testuser',
+            meeting_name,
+            required=False,
+        )
+        meeting.update_from_launchpad(elem)
+        self.assertEquals(summit.attendee_set.filter(user__username='testuser').count(), 1)
+
+    def test_update_from_launchpad_creates_drafter(self):
+        summit = self.make_summit_only()
+        self.assertEquals(summit.attendee_set.filter(user__username='testuser').count(), 0)
+        meeting = factory.make_one(
+            Meeting,
+            pad_url=None,
+            name='test-meeting',
+            summit=summit,
+            private=False
+        )
+        meeting_name = meeting.name
+        elem = LaunchpadExportNode(
+            name=meeting_name,
+            drafter='testuser',
+        )
+        meeting.update_from_launchpad(elem)
+        self.assertEquals(summit.attendee_set.filter(user__username='testuser').count(), 1)
+        self.assertEquals(meeting.drafter.user.username, 'testuser')
+
     def test_update_from_launchpad_adds_participant(self):
         summit, attendee = self.make_summit_and_attendee()
         meeting = factory.make_one(