Merge lp:~cjohnston/summit/attendee-from-launchpad into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 517
Merged at revision: 516
Proposed branch: lp:~cjohnston/summit/attendee-from-launchpad
Merge into: lp:summit
Diff against target: 398 lines (+332/-9)
4 files modified
summit/schedule/migrations/0028_add_attendee_from_lp.py (+213/-0)
summit/schedule/models/attendeemodel.py (+21/-8)
summit/schedule/models/summitmodel.py (+2/-1)
summit/schedule/tests/summit_model.py (+96/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/attendee-from-launchpad
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+156531@code.launchpad.net

Commit message

Adds from_launchpad field to attendee, and does not override start and end if from_launchpad is false.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

seems straightforward enough to me.

Revision history for this message
Michael Hall (mhall119) wrote :

Looks good

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

The attempt to merge lp:~chrisjohnston/summit/attendee-from-launchpad into lp:summit failed. Below is the output from the failed tests.

python: can't open file 'manage.py': [Errno 2] No such file or directory

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'summit/schedule/migrations/0028_add_attendee_from_lp.py'
2--- summit/schedule/migrations/0028_add_attendee_from_lp.py 1970-01-01 00:00:00 +0000
3+++ summit/schedule/migrations/0028_add_attendee_from_lp.py 2013-04-02 19:07:23 +0000
4@@ -0,0 +1,213 @@
5+# -*- coding: utf-8 -*-
6+import datetime
7+from south.db import db
8+from south.v2 import SchemaMigration
9+from django.db import models
10+
11+
12+class Migration(SchemaMigration):
13+
14+ def forwards(self, orm):
15+ # Adding field 'Attendee.from_launchpad'
16+ db.add_column('schedule_attendee', 'from_launchpad',
17+ self.gf('django.db.models.fields.BooleanField')(default=False),
18+ keep_default=False)
19+
20+
21+ def backwards(self, orm):
22+ # Deleting field 'Attendee.from_launchpad'
23+ db.delete_column('schedule_attendee', 'from_launchpad')
24+
25+
26+ models = {
27+ 'auth.group': {
28+ 'Meta': {'object_name': 'Group'},
29+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
30+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
31+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
32+ },
33+ 'auth.permission': {
34+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
35+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
36+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
37+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
38+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
39+ },
40+ 'auth.user': {
41+ 'Meta': {'ordering': "['username']", 'object_name': 'User'},
42+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
43+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
44+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
45+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
46+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
47+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
48+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
49+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
50+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
51+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
52+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
53+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
54+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
55+ },
56+ 'contenttypes.contenttype': {
57+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
58+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
59+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
60+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
61+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
62+ },
63+ 'schedule.agenda': {
64+ 'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
65+ 'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
66+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
67+ 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
68+ 'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
69+ 'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
70+ },
71+ 'schedule.attendee': {
72+ 'Meta': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'},
73+ 'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
74+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
75+ 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
76+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
77+ 'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
78+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
79+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
80+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
81+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
82+ },
83+ 'schedule.attendeebusy': {
84+ 'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
85+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
86+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
87+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
88+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
89+ },
90+ 'schedule.crew': {
91+ 'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
92+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
93+ 'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
94+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
95+ },
96+ 'schedule.lead': {
97+ 'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
98+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
99+ 'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
100+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
101+ 'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
102+ },
103+ 'schedule.meeting': {
104+ 'Meta': {'object_name': 'Meeting'},
105+ 'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}),
106+ 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
107+ 'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
108+ 'broadcast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
109+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
110+ 'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
111+ 'hangout_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
112+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
113+ 'launchpad_blueprint_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
114+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}),
115+ 'override_break': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
116+ 'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
117+ 'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}),
118+ 'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
119+ 'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
120+ 'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
121+ 'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
122+ 'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
123+ 'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
124+ 'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
125+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
126+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
127+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
128+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
129+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'discussion'", 'max_length': '15'}),
130+ 'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
131+ 'virtual_meeting': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
132+ 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
133+ },
134+ 'schedule.participant': {
135+ 'Meta': {'ordering': "('meeting', 'attendee', 'participation')", 'object_name': 'Participant'},
136+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
137+ 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
138+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
139+ 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
140+ 'participation': ('django.db.models.fields.CharField', [], {'default': "'ATTENDING'", 'max_length': '32', 'null': 'True'})
141+ },
142+ 'schedule.room': {
143+ 'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
144+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
145+ 'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
146+ 'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
147+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
148+ 'irc_channel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
149+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
150+ 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
151+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
152+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
153+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
154+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
155+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
156+ },
157+ 'schedule.roombusy': {
158+ 'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
159+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
160+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
161+ 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
162+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
163+ },
164+ 'schedule.slot': {
165+ 'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
166+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
167+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
168+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
169+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
170+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
171+ },
172+ 'schedule.summit': {
173+ 'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
174+ 'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
175+ 'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
176+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
177+ 'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}),
178+ 'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
179+ 'help_text': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
180+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
181+ 'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
182+ 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
183+ 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}),
184+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
185+ 'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
186+ 'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}),
187+ 'sites': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['sites.Site']", 'symmetrical': 'False'}),
188+ 'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
189+ 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
190+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
191+ 'virtual_summit': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
192+ },
193+ 'schedule.summitsprint': {
194+ 'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
195+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
196+ 'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
197+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
198+ },
199+ 'schedule.track': {
200+ 'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
201+ 'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
202+ 'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
203+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
204+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
205+ 'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
206+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
207+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
208+ },
209+ 'sites.site': {
210+ 'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
211+ 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
212+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
213+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
214+ }
215+ }
216+
217+ complete_apps = ['schedule']
218\ No newline at end of file
219
220=== modified file 'summit/schedule/models/attendeemodel.py'
221--- summit/schedule/models/attendeemodel.py 2013-03-09 05:05:25 +0000
222+++ summit/schedule/models/attendeemodel.py 2013-04-02 19:07:23 +0000
223@@ -31,6 +31,14 @@
224 'AttendeeBusy',
225 )
226
227+HELP_TEXT = {
228+ "from_launchpad": (
229+ "Set to indicate the attendee comes from registering in Launchpad."
230+ "Don't set this if you are adding the attendee, as they may end up "
231+ "getting deleted or changed if you do."
232+ ),
233+}
234+
235
236 class Attendee(models.Model):
237 summit = models.ForeignKey(Summit)
238@@ -46,6 +54,10 @@
239 verbose_name='Willing to be Crew',
240 default=False)
241 secret_key_id = models.CharField(max_length=32, blank=True, null=True)
242+ from_launchpad = models.BooleanField(
243+ default=False,
244+ help_text=HELP_TEXT["from_launchpad"]
245+ )
246
247 class Meta:
248 app_label = 'schedule'
249@@ -100,14 +112,15 @@
250 """Update from Launchpad data."""
251 # Update attendance start and end times from LP, we always stash
252 # naive UTC datetimes into the db since that's what we get out
253- start = elem.get("start")
254- if start:
255- self.start = datetime.strptime(start, "%Y-%m-%dT%H:%M:%SZ")
256- end = elem.get("end")
257- if end:
258- self.end = datetime.strptime(end, "%Y-%m-%dT%H:%M:%SZ")
259-
260- self.save()
261+ if self.from_launchpad is True:
262+ start = elem.get("start")
263+ if start:
264+ self.start = datetime.strptime(start, "%Y-%m-%dT%H:%M:%SZ")
265+ end = elem.get("end")
266+ if end:
267+ self.end = datetime.strptime(end, "%Y-%m-%dT%H:%M:%SZ")
268+ self.from_launchpad = True
269+ self.save()
270
271 # Update user information from LP, we generally do this when they
272 # login; but maybe they never will (logic copied from openid auth)
273
274=== modified file 'summit/schedule/models/summitmodel.py'
275--- summit/schedule/models/summitmodel.py 2013-03-14 02:21:19 +0000
276+++ summit/schedule/models/summitmodel.py 2013-04-02 19:07:23 +0000
277@@ -380,7 +380,8 @@
278 attendee = self.attendee_set.create(
279 user=user,
280 start=datetime.utcnow(),
281- end=datetime.utcnow()
282+ end=datetime.utcnow(),
283+ from_launchpad=True,
284 )
285
286 attendee.update_from_launchpad(elem)
287
288=== modified file 'summit/schedule/tests/summit_model.py'
289--- summit/schedule/tests/summit_model.py 2013-02-27 03:39:43 +0000
290+++ summit/schedule/tests/summit_model.py 2013-04-02 19:07:23 +0000
291@@ -20,6 +20,7 @@
292
293 from model_mommy import mommy as factory
294 from summit.schedule.fields import NameField
295+from django.contrib.auth.models import User
296
297 from summit.schedule.models import (
298 Summit,
299@@ -498,4 +499,99 @@
300 user__username__exact="testuser"
301 ).count()
302 )
303+ self.assertEqual(
304+ 1,
305+ summit.attendee_set.filter(from_launchpad="True").count()
306+ )
307 self.assertTrue(mock_set_openid.called)
308+
309+ def test_non_launchpad_summit_attendee_update_from_launchpad(self):
310+ """
311+ Tests that a user who has registered in Summit does not have thier
312+ data overridden
313+ """
314+ now = datetime.datetime.utcnow()
315+ delta = datetime.timedelta(days=1)
316+ end_summit = now + 3*delta
317+ start_summit_string = now.strftime("%Y-%m-%dT%H:%M:%SZ")
318+ end_summit_string = end_summit.strftime("%Y-%m-%dT%H:%M:%SZ")
319+ end_user = now + 2*delta
320+ user = factory.make_one(User, username="testuser")
321+ summit = factory.make_one(
322+ Summit,
323+ timezone="UTC",
324+ date_start=now,
325+ date_end=end_summit,
326+ )
327+
328+ attendee = factory.make_one(
329+ Attendee,
330+ user=user,
331+ summit=summit,
332+ start_utc=summit.date_start,
333+ end_utc=end_user,
334+ from_launchpad=False,
335+ )
336+ attendee_node = LaunchpadExportNode(
337+ name=user.username,
338+ start=start_summit_string,
339+ end=end_summit_string,
340+ )
341+ summit.update_attendee_from_launchpad(attendee_node)
342+
343+ attendee = Attendee.objects.get(user=user)
344+
345+ self.assertEqual(
346+ attendee.start_utc.replace(second=0, microsecond=0),
347+ now.replace(second=0, microsecond=0),
348+ )
349+ self.assertEqual(
350+ attendee.end_utc.replace(second=0, microsecond=0),
351+ end_user.replace(second=0, microsecond=0),
352+ )
353+
354+ def test_summit_attendee_update_from_launchpad(self):
355+ """
356+ Tests that a user from launchpad is updated with their registration
357+ time from launchpad
358+ """
359+ now = datetime.datetime.utcnow()
360+ delta = datetime.timedelta(days=1)
361+ end_summit = now + 3*delta
362+ start_summit_string = now.strftime("%Y-%m-%dT%H:%M:%SZ")
363+ end_summit_string = end_summit.strftime("%Y-%m-%dT%H:%M:%SZ")
364+ end_user = now + 2*delta
365+ user = factory.make_one(User, username="testuser")
366+ summit = factory.make_one(
367+ Summit,
368+ timezone="UTC",
369+ date_start=now,
370+ date_end=end_summit,
371+ )
372+
373+ attendee = factory.make_one(
374+ Attendee,
375+ user=user,
376+ summit=summit,
377+ start_utc=summit.date_start,
378+ end_utc=end_user,
379+ from_launchpad=True,
380+ )
381+ attendee_node = LaunchpadExportNode(
382+ name=user.username,
383+ start=start_summit_string,
384+ end=end_summit_string,
385+ )
386+
387+ summit.update_attendee_from_launchpad(attendee_node)
388+
389+ attendee = Attendee.objects.get(user=user)
390+
391+ self.assertEqual(
392+ attendee.start_utc.replace(second=0),
393+ now.replace(second=0, microsecond=0),
394+ )
395+ self.assertEqual(
396+ attendee.end_utc.replace(second=0, microsecond=0),
397+ end_summit.replace(second=0, microsecond=0),
398+ )

Subscribers

People subscribed via source and target branches